Merge branch 'develop' into 'master'

Develop See merge request gnome/pygnome!66
NOAA-ORR-ERD · Jul 29, 2020 · 4fee86b · 4fee86b
2 parents ed9c85a + 5d83769
commit 4fee86b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/py_gnome/gnome/outputters/shape.py b/py_gnome/gnome/outputters/shape.py
@@ -121,7 +121,7 @@ def prepare_for_model_run(self,
             w.field('Depth', 'N')
             w.field('Mass', 'N')
             w.field('Age', 'N')
-            w.field('Surf_Conc', 'F')
+            w.field('Surf_Conc', 'F', decimal=5)
             w.field('Status_Code', 'N')
 
             if sc.uncertain:

diff --git a/py_gnome/gnome/utilities/file_tools/haz_files.py b/py_gnome/gnome/utilities/file_tools/haz_files.py
@@ -242,8 +242,8 @@ def GetNextBNAPolygon(f, dtype=np.float64):
         num_points = int(fields[4].strip()[1:])
         #header = header.replace('", "', '","') # some bnas have an extra space
         #name, rest = header.strip().split('","')
-    #except ValueError, IndexError:
-    except:
+    except (ValueError, IndexError):
+    #except:
         raise ValueError('File has incorrect header for BNA format: {0}'
                          .format(header))
 

diff --git a/py_gnome/gnome/utilities/surface_concentration.py b/py_gnome/gnome/utilities/surface_concentration.py
@@ -52,7 +52,7 @@ def surface_conc_kde(sc):
         lon = positions[:, 0]
         lat = positions[:, 1]
 
-        bin_length = 6*3600 #kde will be calculated on particles 0-6hrs, 6-12hrs,...
+        bin_length = 1*3600 #kde will be calculated on particles 0-6hrs, 6-12hrs,...
         t = age.min()
         max_age = age.max()