Merge branch 'master' of https://github.com/global-hydrodynamics/CaMa…

…-Flood_v4

gosh/test5_mpi.sh

@@ -37,6 +37,7 @@ export HDF5LIB="/opt/local/hdf5-1.10.5/lib"
 export DYLD_LIBRARY_PATH="${HDF5LIB}:${IFORTLIB}:${DYLD_LIBRARY_PATH}"
 
 #*** 0c. OpenMP thread number
+MPINP=8                                     # MPI process number
 export OMP_NUM_THREADS=2                    # OpenMP cpu num
 
 #================================================
@@ -45,13 +46,12 @@ export OMP_NUM_THREADS=2                    # OpenMP cpu num
 
 #============================
 #*** 1a. Experiment directory setting
-EXP="mpi8omp2"                       # experiment name (output directory name)
+EXP="mpi${MPINP}omp${OMP_NUM_THREADS}"      # experiment name (output directory name)
 RDIR=${BASE}/out/${EXP}                     # directory to run CaMa-Flood
 EXE="MAIN_cmf"                              # Execute file name
 PROG=${BASE}/src/${EXE}                     # location of Fortran main program
 NMLIST="./input_cmf.nam"                    # standard namelist
 LOGOUT="./log_CaMa.txt"                     # standard log output
-MPINP=8                                     # MPI process number
 
 #============================
 #*** 1b. Model physics option

map/src/src_dam/s00-link.sh

@@ -24,17 +24,17 @@ NATDIR=${BASE}/out/test1-glb_15min
 ## Data can be downloaded below. Please specify the directory where "*_intp" files are located.
 ## https://dataverse.tdl.org/dataset.xhtml?persistentId=doi:10.18738/T8/DF80WG
 
-#GRSAD="${BASE}/map/data/GRSAD_sample/"  # sample data
+GRSAD="${BASE}/map/data/GRSAD_sample/"  # sample data
 #GRSADdir="/home/yamadai/work/data/Dam+Lake/GRSAD/GRSAD_timeseries/"
-GRSAD="/Users/yamadai/work/data/Dam+Lake/GRSAD/GRSAD_timeseries/"
+#GRSAD="/Users/yamadai/work/data/Dam+Lake/GRSAD/GRSAD_timeseries/"
 
 # ReGeom data (Global Reservoir Geometry Database)
 ## Data can be downloaded below. Please specify the directory where "*.csv" data are located.
 ## https://zenodo.org/record/1322884#.YF1owUj7QW_
 
-#ReGeom="${BASE}/map/data/ReGeom_sample/" # sample data
+ReGeom="${BASE}/map/data/ReGeom_sample/" # sample data
 #ReGeomdir="/home/yamadai/work/data/Dam+Lake/ReGeom/Area_Strg_Dp/Area_Strg_Dp/"
-ReGeom="/Users/yamadai/work/data/Dam+Lake/ReGeom/Area_Strg_Dp/"
+#ReGeom="/Users/yamadai/work/data/Dam+Lake/ReGeom/Area_Strg_Dp/"
 
 #===========================================================