From 719043dfc0ac28000b27c35ec394e1a6762f65ee Mon Sep 17 00:00:00 2001
From: Dai Yamazaki <yamadai@rainbow.iis.u-tokyo.ac.jp>
Date: Wed, 25 Jan 2023 18:12:27 +0900
Subject: [PATCH] small modifications

---
 etc/reservoir_operation/dam_params/s01-calc_damloc.sh | 6 +++---
 etc/reservoir_operation/run_dam.sh                    | 4 ++--
 etc/reservoir_operation/run_nat.sh                    | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/etc/reservoir_operation/dam_params/s01-calc_damloc.sh b/etc/reservoir_operation/dam_params/s01-calc_damloc.sh
index d16650e..07a9628 100755
--- a/etc/reservoir_operation/dam_params/s01-calc_damloc.sh
+++ b/etc/reservoir_operation/dam_params/s01-calc_damloc.sh
@@ -31,7 +31,7 @@ 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
 
@@ -39,14 +39,14 @@ echo "#####  Part 1: allocate GRanD on CaMa map"
 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
index a8a50bf..49f1d2f 100755
--- 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
index cfa8906..6e23012 100755
--- 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