fix workflow for GIUH

Author: lcunha0118

params/src/generate_giuh_per_basin_params.py

@@ -310,7 +310,7 @@ def generate_giuh_per_basin(namestr,catchments, time_to_stream_raster, soil_para
                     f.write("%s" %("soil_params.slop="+str(soil_params.loc[cat]['slope_Time=1'])+"\n"))
                     f.write("%s" %("soil_params.smcmax="+str(soil_params.loc[cat]['smcmax_soil_layers_stag=1_Time=1'])+"\n"))
                     f.write("%s" %("soil_params.wltsmc="+str(soil_params.loc[cat]['smcwlt_soil_layers_stag=1_Time=1'])+"\n"))
-                    f.write("%s" %("refkdt"+str(soil_params.loc[cat]['refkdt_Time=1'])+"\n"))
+                    f.write("%s" %("refkdt="+str(soil_params.loc[cat]['refkdt_Time=1'])+"\n"))
                     f.write("%s" %("max_gw_storage="+str(GW_params.loc[cat]['Zmax'])+"\n"))
 
                     f.write("%s" %("Cgw="+str(GW_params.loc[cat]['Coeff'])+"\n"))
@@ -319,6 +319,7 @@ def generate_giuh_per_basin(namestr,catchments, time_to_stream_raster, soil_para
                     f.write("%s" %("alpha_fc=0.33\n"))
                     f.write("%s" %("soil_storage=66.7%\n"))
                     f.write("%s" %("K_nash=0.03\n"))
+                    f.write("%s" %("K_lf=0.01\n"))
                     f.write("%s" %("nash_storage=0.0,0.0\n"))
                     giuh="giuh_ordinates="+"{0:.2f}".format((round(CDF['Freq'].iloc[0],4)))
                     for icdf in range(1,len(CDF)):

params/src/workflow_hand_twi_giuh.sh

@@ -141,7 +141,16 @@ for val in  ${HUC[@]}; do
 	else
 		mpiexec -np $nproc  areadinf -ang ${Outdir}${file_name}ang.tif -sca ${Outdir}${file_name}sca.tif 
 	fi
-	
+
+	if test -f ${Outdir}${file_name}hf.tif; then
+		echo "catchments_wgs84.geojson exists"
+	else
+	 	echo "rasterize flow line"
+		
+		gdal_translate -scale 0 40000000000000 0 0 ${Outdir}${file_name}fel.tif ${Outdir}${file_name}hf.tif	
+		gdal_rasterize -b 1 -burn 1  ${Dir}${hydrofabrics_directory}flowpaths_wgs84.json ${Outdir}${file_name}hf.tif			
+	fi
+		
 	if [[ $Variable == *"TWI"* ]]; then
 
 		#-----------------------------------------------
@@ -173,14 +182,7 @@ for val in  ${HUC[@]}; do
 
 		fi
 
-		if test -f ${Outdir}${file_name}hf.tif; then
-			echo "catchments_wgs84.geojson exists"
-		else
-		 	echo "rasterize flow line"
-			
-			gdal_translate -scale 0 40000000000000 0 0 ${Outdir}${file_name}fel.tif ${Outdir}${file_name}hf.tif	
-			gdal_rasterize -b 1 -burn 1  ${Dir}${hydrofabrics_directory}flowpaths_wgs84.json ${Outdir}${file_name}hf.tif			
-		fi
+
 
 	fi