Changeset 4040

Timestamp:

Aug 10, 2017, 4:01:15 PM (7 years ago)

Author:

dubos

Message:

Aquaplanet : updated scripts

Location:

dynamico_lmdz/aquaplanet/OLD_PHYSIC/RUN_AQUAPLANET_DYNAMICO_LMDZ5

Files:

• example.sh (modified) (6 diffs)
• prepare.sh (modified) (4 diffs)

dynamico_lmdz/aquaplanet/OLD_PHYSIC/RUN_AQUAPLANET_DYNAMICO_LMDZ5/example.sh

@@ -3 +3 @@
 # 1    Create a directory EXP for your experiment ; ALL commands below must be run from EXP
 # 2    Create a directory STORE to store the outputs of your experiment ; run "ln -s STORE storedir"
-# 3    run "BASE/example.sh copy" where BASE is the directory containing this script
-# 4a   (optional) Edit EXP/run_icosa.def to change nbp, dt, itau_physics
-# 4b   (optional) Edit EXP/prepare.sh to change NB_MPI_DYNAMICO
-# 4c   (optional) Edit EXP/example.sh to change ARCH, NB_YEARS
-# 5    run "./example.sh create"
-# 6    EXP run "./example.sh submit"
+# 3    run "BASE/example.sh init" where BASE is the directory containing this script
+# 4    (optional) Edit EXP/config.sh, EXP/run_icosa.def, EXP/*.xml
+# 5    run "./example.sh create" (NB : ./example.sh, NOT ../example.sh)
+# 6    run "./example.sh submit"
 
 function fullpath() 
@@ -17 +15 @@
 function years()
 {
-    for ((i=$1;i<=$2;i++)) ; do
+    for ((i="$1";i<="$2";i++)) ; do
         echo $(printf 'year%02d' $i)
     done
@@ -24 +22 @@
 function cmd_create()
 {
-    export ESM_ROOT=$(fullpath ESM_ROOT)
+    source ./config.sh
+    env | grep YEARS
     STORE_ROOT=$( fullpath $PWD/storedir )
     YEARS=$(years 1 $NB_YEARS)
@@ -52 +51 @@
 function cmd_submit()
 {
+    source ./config.sh
     DEP=""
     submit_$ARCH ce0l
@@ -59 +59 @@
 }
 
-function cmd_copy()
+function cmd_init()
 {
-    export ESM_ROOT=$( fullpath $BASEDIR/../../ )
-    ln -sf $ESM_ROOT ESM_ROOT
     cp -fp $BASEDIR/*.sh $BASEDIR/*.xml $BASEDIR/*.def .
+    cat > config.sh <<EOF
+ARCH=X64_CURIE
+BASEDIR=$BASEDIR
+ESM_ROOT=$ESM_ROOT
+NB_YEARS=10
+NB_MPI_DYNAMICO=160
+NB_MPI_XIOS=16
+NB_MPI_CE0L=16
+JOB_WALLTIME=7200
+EOF
     ls -lrh
+    cat config.sh
 }
 
@@ -72 +81 @@
 }
 
-NB_YEARS=10
 BASEDIR=$(dirname ${BASH_SOURCE[0]})
 BASEDIR=$( fullpath $BASEDIR )
+ESM_ROOT=$( fullpath $BASEDIR/../../ )
 echo "Your command : $0 $*"
 echo "Script base dir : $BASEDIR"
 echo "Run from : $(fullpath $PWD)"
-echo "Usage : $0 [copy|create|submit]"
-export ARCH=X64_CURIE
+echo "Usage : $0 [init|create|submit]"
 cmd_$1

dynamico_lmdz/aquaplanet/OLD_PHYSIC/RUN_AQUAPLANET_DYNAMICO_LMDZ5/prepare.sh

@@ -170 +170 @@
 #MSUB -x
 ## Number of tasks (=MPI processes) to use
-#MSUB -n 16
+#MSUB -n $NB_MPI_CE0L
 ## Elapsed time limit in seconds
 #MSUB -T 600
@@ -206 +206 @@
 #MSUB -n $NB_MPI_TOTAL
 ## Elapsed time limit in seconds
-#MSUB -T 10800
+#MSUB -T $JOB_WALLTIME
 ## Quality of Service required (long [3 days], normal [1 day], test [30 min])
 #MSUB -Q normal
@@ -241 +241 @@
 echo "Working directory : $PWD"
 
+source ./config.sh
+
 check_env || exit 1
 
@@ -248 +250 @@
 NB_MPI_DYNAMICO=160
 NB_MPI_XIOS=16
+NB_MPI_CE0L=16
 
 TYPE=$1