Hawaii non-zero exit codes

* Four HUC8's in Hawaii with non-zero exit codes * "Clipping Model Streams" to HUC produced unsupported fiona geoms * Now forcing "LINESTRING" geom in ogr2ogr call * Also over-riding inherited layer name to match output filename * Changes inundation.py to use list object in mask call Github Issue #8
NOAA-OWP · Sep 21, 2020 · 891993b · 891993b
1 parent 740cb33
commit 891993b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/run_by_unit.sh b/lib/run_by_unit.sh
@@ -256,7 +256,7 @@ echo -e $startDiv"Clipping Model Streams to HUC $hucNumber"$stopDiv
 date -u
 Tstart
 [ ! -f $outputHucDataDir/demDerived_reaches_split_clipped.gpkg ] && \
-ogr2ogr -progress -f GPKG -clipsrc $outputHucDataDir/wbd.gpkg $outputHucDataDir/demDerived_reaches_split_clipped.gpkg $outputHucDataDir/demDerived_reaches_split.gpkg
+ogr2ogr -progress -nlt "LINESTRING" -nln "demDerived_reaches_split_clipped" -f GPKG -clipsrc $outputHucDataDir/wbd.gpkg $outputHucDataDir/demDerived_reaches_split_clipped.gpkg $outputHucDataDir/demDerived_reaches_split.gpkg
 Tcount
 
 ## PROCESS CATCHMENTS AND MODEL STREAMS STEP 1 ##

diff --git a/tests/inundation.py b/tests/inundation.py
@@ -395,8 +395,8 @@ def __return_huc_in_hucSet(hucCode,hucSet):
 
             try:
                 #window = geometry_window(rem,shape(huc['geometry']))
-                rem_array,window_transform = mask(rem,shape(huc['geometry']),crop=True,indexes=1)
-                catchments_array,_ = mask(catchments,shape(huc['geometry']),crop=True,indexes=1)
+                rem_array,window_transform = mask(rem,[shape(huc['geometry'])],crop=True,indexes=1)
+                catchments_array,_ = mask(catchments,[shape(huc['geometry'])],crop=True,indexes=1)
             except ValueError: # shape doesn't overlap raster
                 continue # skip to next HUC