Browse Source

Adding feature: restart from another job

Pierre-Yves Barriat 7 years ago
parent
commit
8919f3c072

+ 10 - 0
templates/elic_gnu/experiment.cfg

@@ -12,6 +12,11 @@ rst_freq="1 month"
 # Number of restart legs to be run in one go
 run_num_legs=6
 
+# Special restart
+special_restart=false
+special_restart_from=EXP0
+special_restart_date="1959-01-01"
+
 # Parameters
 nem_time_step_sec=3600
 lim_time_step_sec=21600
@@ -20,3 +25,8 @@ nem_config_name=ORCA1_LIM3_REF
 
 # This file is used to store information about restarts
 info_file="nemo.info"
+
+# Paths
+start_dir=${PBS_O_WORKDIR-$PWD}
+run_dir="/SCRATCH/acad/limhr/$USER/nemo/run/${exp_name}"
+archive_dir="/SCRATCH/acad/limhr/$USER/nemo/archive/${exp_name}"

+ 0 - 3
templates/elic_gnu/job.cfg

@@ -1,7 +1,4 @@
 #
-start_dir=${PWD}
-run_dir="/ofast/$USER/nemo/run/${exp_name}"
-archive_dir="/ofast/$USER/nemo/archive/${exp_name}"
 
 # Cancel job on error
 set -ueo pipefail

+ 10 - 0
templates/lemaitre2/experiment.cfg

@@ -12,6 +12,11 @@ rst_freq="1 year"
 # Number of restart legs to be run in one go
 run_num_legs=1
 
+# Special restart
+special_restart=false
+special_restart_from=EXP0
+special_restart_date="1959-01-01"
+
 # Parameters
 nem_time_step_sec=3600
 lim_time_step_sec=21600
@@ -20,3 +25,8 @@ nem_config_name=ORCA1_LIM3_REF
 
 # This file is used to store information about restarts
 info_file="nemo.info"
+
+# Paths
+start_dir=${PBS_O_WORKDIR-$PWD}
+run_dir="/SCRATCH/acad/limhr/$USER/nemo/run/${exp_name}"
+archive_dir="/SCRATCH/acad/limhr/$USER/nemo/archive/${exp_name}"

+ 0 - 4
templates/lemaitre2/job.cfg

@@ -11,9 +11,5 @@ SBATCH --partition=Def
 SBATCH --mail-type=ALL
 SBATCH --open-mode=append
 
-start_dir=${SLURM_SUBMIT_DIR-$PWD}
-run_dir="$GLOBALSCRATCH/nemo/run/${exp_name}"
-archive_dir="$GLOBALSCRATCH/nemo/archive/${exp_name}"
-
 # Cancel job on error
 set -ueo pipefail

+ 10 - 0
templates/lemaitre2_regional/experiment.cfg

@@ -12,6 +12,11 @@ rst_freq="1 month"
 # Number of restart legs to be run in one go
 run_num_legs=1
 
+# Special restart
+special_restart=false
+special_restart_from=EXP0
+special_restart_date="1959-01-01"
+
 # Parameters
 nem_time_step_sec=600
 lim_time_step_sec=3600
@@ -20,3 +25,8 @@ nem_config_name=REG_TEST
 
 # This file is used to store information about restarts
 info_file="nemo.info"
+
+# Paths
+start_dir=${PBS_O_WORKDIR-$PWD}
+run_dir="/SCRATCH/acad/limhr/$USER/nemo/run/${exp_name}"
+archive_dir="/SCRATCH/acad/limhr/$USER/nemo/archive/${exp_name}"

+ 0 - 4
templates/lemaitre2_regional/job.cfg

@@ -11,9 +11,5 @@ SBATCH --partition=Def
 SBATCH --mail-type=ALL
 SBATCH --open-mode=append
 
-start_dir=${SLURM_SUBMIT_DIR-$PWD}
-run_dir="$GLOBALSCRATCH/nemo/run/${exp_name}"
-archive_dir="$GLOBALSCRATCH/nemo/archive/${exp_name}"
-
 # Cancel job on error
 set -ueo pipefail

+ 10 - 0
templates/lemaitre2_xios-2.0/experiment.cfg

@@ -12,6 +12,11 @@ rst_freq="1 year"
 # Number of restart legs to be run in one go
 run_num_legs=2
 
+# Special restart
+special_restart=false
+special_restart_from=EXP0
+special_restart_date="1959-01-01"
+
 # Parameters
 nem_time_step_sec=3600
 lim_time_step_sec=21600
@@ -20,3 +25,8 @@ nem_config_name=ORCA1_LIM3_REF
 
 # This file is used to store information about restarts
 info_file="nemo.info"
+
+# Paths
+start_dir=${PBS_O_WORKDIR-$PWD}
+run_dir="/SCRATCH/acad/limhr/$USER/nemo/run/${exp_name}"
+archive_dir="/SCRATCH/acad/limhr/$USER/nemo/archive/${exp_name}"

+ 1 - 5
templates/lemaitre2_xios-2.0/job.cfg

@@ -6,15 +6,11 @@ SBATCH --time=23:55:00
 SBATCH --ntasks=${total_nb_cpu}
 SBATCH --mem-per-cpu=3072
 SBATCH --partition=Def
-i#SBATCH --partition=PostP
+#SBATCH --partition=PostP
 
 #SBATCH --mail-user=${email}
 SBATCH --mail-type=ALL
 SBATCH --open-mode=append
 
-start_dir=${SLURM_SUBMIT_DIR-$PWD}
-run_dir="$GLOBALSCRATCH/nemo/run/${exp_name}"
-archive_dir="$GLOBALSCRATCH/nemo/archive/${exp_name}"
-
 # Cancel job on error
 set -ueo pipefail

+ 10 - 0
templates/pingo/experiment.cfg

@@ -12,6 +12,11 @@ rst_freq="5 days"
 # Number of restart legs to be run in one go
 run_num_legs=2
 
+# Special restart
+special_restart=false
+special_restart_from=EXP0
+special_restart_date="1959-01-01"
+
 # Parameters
 nem_time_step_sec=3600
 lim_time_step_sec=21600
@@ -20,3 +25,8 @@ nem_config_name=ORCA1_LIM3_REF
 
 # This file is used to store information about restarts
 info_file="nemo.info"
+
+# Paths
+start_dir=${PBS_O_WORKDIR-$PWD}
+run_dir="/SCRATCH/acad/limhr/$USER/nemo/run/${exp_name}"
+archive_dir="/SCRATCH/acad/limhr/$USER/nemo/archive/${exp_name}"

+ 0 - 3
templates/pingo/job.cfg

@@ -1,7 +1,4 @@
 #
-start_dir=${PWD}
-run_dir="/pfast/$USER/nemo/run/${exp_name}"
-archive_dir="/pfast/$USER/nemo/archive/${exp_name}"
 
 # Cancel job on error
 set -ueo pipefail

+ 10 - 0
templates/storm/experiment.cfg

@@ -12,6 +12,11 @@ rst_freq="1 month"
 # Number of restart legs to be run in one go
 run_num_legs=1
 
+# Special restart
+special_restart=false
+special_restart_from=EXP0
+special_restart_date="1959-01-01"
+
 # Parameters
 nem_time_step_sec=3600
 lim_time_step_sec=21600
@@ -20,3 +25,8 @@ nem_config_name=ORCA1_LIM3_REF
 
 # This file is used to store information about restarts
 info_file="nemo.info"
+
+# Paths
+start_dir=${PBS_O_WORKDIR-$PWD}
+run_dir="/SCRATCH/acad/limhr/$USER/nemo/run/${exp_name}"
+archive_dir="/SCRATCH/acad/limhr/$USER/nemo/archive/${exp_name}"

+ 0 - 3
templates/storm/job.cfg

@@ -1,7 +1,4 @@
 #
-start_dir=${PWD}
-run_dir="/pfast/$USER/nemo/run/${exp_name}"
-archive_dir="/pfast/$USER/nemo/archive/${exp_name}"
 
 # Cancel job on error
 set -ueo pipefail

+ 10 - 0
templates/zenobe_xios-2.0/experiment.cfg

@@ -12,6 +12,11 @@ rst_freq="1 year"
 # Number of restart legs to be run in one go
 run_num_legs=29
 
+# Special restart
+special_restart=false
+special_restart_from=EXP0
+special_restart_date="1959-01-01"
+
 # Parameters
 nem_time_step_sec=3600
 lim_time_step_sec=21600
@@ -20,3 +25,8 @@ nem_config_name=ORCA1_LIM3_REF
 
 # This file is used to store information about restarts
 info_file="nemo.info"
+
+# Paths
+start_dir=${PBS_O_WORKDIR-$PWD}
+run_dir="/SCRATCH/acad/limhr/$USER/nemo/run/${exp_name}"
+archive_dir="/SCRATCH/acad/limhr/$USER/nemo/archive/${exp_name}"

+ 2 - 5
templates/zenobe_xios-2.0/job.cfg

@@ -19,12 +19,9 @@ echo "queue : $PBS_O_QUEUE"
 echo "user : $PBS_O_LOGNAME"
 echo "threads : $OMP_NUM_THREADS"
 
-start_dir=${PBS_O_WORKDIR-$PWD}
-run_dir="/SCRATCH/acad/limhr/$USER/nemo/run/${exp_name}"
-archive_dir="/SCRATCH/acad/limhr/$USER/nemo/archive/${exp_name}"
-
 # Cancel job on error
 set -ueo pipefail
 
 # RESET script arguments
-set -- $PBS_OPTIONS 
+NOTHING=""
+set -- ${PBS_OPTIONS-$NOTHING}