small modifications

global-hydrodynamics · Jan 25, 2023 · 719043d · 719043d
1 parent 972d94b
commit 719043d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/etc/reservoir_operation/dam_params/s01-calc_damloc.sh b/etc/reservoir_operation/dam_params/s01-calc_damloc.sh
@@ -31,22 +31,22 @@ echo "============================"
 echo ""
 echo "#####  Part 1: allocate GRanD on CaMa map"
 
-# ./t01-calc_damloc.sh   $TAG $MINUPAREA
+./t01-calc_damloc.sh   $TAG $MINUPAREA
 
 # output dam allocation file : $TAG/damloc_modified.csv
 
 ##==========================
 echo ""
 echo "#####  Part 2: add dam paramerters"
 
-# ./t02-calc_damparam.sh $TAG $MINUPAREA $SYEAR $EYEAR $DT
+./t02-calc_damparam.sh $TAG $MINUPAREA $SYEAR $EYEAR $DT
 
 ##==========================
 echo ""
 echo "#####  Part 3: merge dam location and parameter files"
 
 echo "@@@ ./src/complete_damcsv.py"
-#python ./src/complete_damcsv.py $TAG $MINUPAREA
+python ./src/complete_damcsv.py $TAG $MINUPAREA
 
 # output $TAG/dam_params_comp.csv 
 

diff --git a/etc/reservoir_operation/run_dam.sh b/etc/reservoir_operation/run_dam.sh
@@ -28,8 +28,8 @@
 #*** 0a. Set CaMa-Flood base directory
 PWDD=`pwd`
 BASE=`pwd`/../..
-#PWDD="/home/yamadai/work/CaMa_v401/cmf_v401_pkg/etc/reservoir_operation"
-#BASE="/home/yamadai/work/CaMa_v401/cmf_v401_pkg"  # setting for PBS in cluster
+#PWDD="/home/yamadai/work/CaMa_v401/cmf_v410_pkg/etc/reservoir_operation"
+#BASE="/home/yamadai/work/CaMa_v401/cmf_v410_pkg"  # setting for PBS in cluster
 
 echo $BASE
 

diff --git a/etc/reservoir_operation/run_nat.sh b/etc/reservoir_operation/run_nat.sh
@@ -28,8 +28,8 @@
 #*** 0a. Set CaMa-Flood base directory
 PWDD=`pwd`
 BASE=`pwd`/../..
-#PWDD="/home/yamadai/work/CaMa_v402/cmf_v402_pkg/etc/reservoir_operation"
-#BASE="/home/yamadai/work/CaMa_v402/cmf_v402_pkg"  # setting for PBS in cluster
+#PWDD="/home/yamadai/work/CaMa_v402/cmf_v410_pkg/etc/reservoir_operation"
+#BASE="/home/yamadai/work/CaMa_v402/cmf_v410_pkg"  # setting for PBS in cluster
 
 echo $BASE