Changeset 510 for configs/testing/bash/create_runs.sh

Timestamp:

12/12/16 13:41:51 (8 years ago)

Author:

dubos

Message:

updates to testing

File:

• configs/testing/bash/create_runs.sh (modified) (6 diffs)

configs/testing/bash/create_runs.sh

@@ -81 +81 @@
 }
 
-#------------------------------------- DCMIP3.1 ----------------------------------
+#------------------------------------- DCMIP 2012 ---------------------------------
 
 function rundef_DCMIP(){
@@ -88 +88 @@
     setvar radius 6.37122e6 g 9.80616 kappa 0.2857143 cpp 1004.5 preff 1e5
     setvar nitergdiv 2 nitergrot 2 niterdivgrad 2 tau_graddiv
+}
+
+function rundef_DCMIP21() { # NBP TAU
+    NBP=$1 ; TAU=$2
+    rundef_DCMIP $NBP
+    setvar omega 0. llm 60 disvert ncar ncar_T0 300 ncar_p0 1e5 ncar_disvert_c 1 ncar_dz 500 
+    setvar tau_graddiv $TAU tau_gradrot $TAU tau_divgrad $TAU 
+    setvar scale_factor 500 write_period 50000 run_length 3.6e6 etat0 dcmip2_schaer_noshear
+    setvar rayleigh_friction_type dcmip2_schaer_noshear rayleigh_friction_tau 12500
 }
 
@@ -98 +107 @@
     setvar scale_factor 125 write_period 7500 run_length 4.5e5 etat0 dcmip3
 }
+
 function rundef_DCMIP41() { # NBP TAU
     NBP=$1 ; TAU=$2
@@ -107 +117 @@
 }
 
+function rundef_DCMIP51() { # NBP TAU
+    NBP=$1 ; TAU=$2
+    rundef_DCMIP $NBP
+    setvar omega 7.292e-5 llm 30 disvert ncarl30 nqtot 1 itau_adv 3
+    setvar tau_graddiv $TAU tau_gradrot $TAU tau_divgrad $TAU
+    setvar write_period 7200 run_length 864000 etat0 dcmip5
+    setvar physics dcmip dcmip_physics 0 itau_physics 6
+}
+
+function job_DCMIP21() { # EXEC NBP
+    job_$1_$2 DCMIP21_$1 # e.g. job_mpi_80 DCMIP31_mpi
+}
 function job_DCMIP31() { # EXEC NBP
     job_$1_$2 DCMIP31_$1 # e.g. job_mpi_80 DCMIP31_mpi
@@ -113 +135 @@
     job_$1_$2 DCMIP41_$1
 }
+function job_DCMIP51() { # EXEC NBP
+    job_$1_$2 DCMIP51_$1
+}
 
 #----------------------------- END ----------------------------
 
-function main()
+function basic()
 {
     rm -rf RUNS
     mkdir RUNS
     cd RUNS
+# Williamson 1991
+#    create_exp serial W91 two_degree 24h 40 5000 # nbp tau
+#    create_exp mpi W91 two_degree 24h 40 5000 # nbp tau
+# DCMIP 2012
+    create_exp mpi DCMIP21 two_degree 100s 40 90000 # nbp tau 
+    create_exp mpi DCMIP31 two_degree 60s 40 90000 # nbp tau 
+    create_exp mpi DCMIP41 two_degree 24h 40 10000 # nbp tau 
+#    create_exp mpi DCMIP51 one_degree 2h  80 10000 # nbp tau 
+}
+
+function main()
+{
 # the number associated to each run.def parameter is used to sort the lines and order them in a logical way
     declare -A idx
@@ -127 +164 @@
     order 300 nbp optim_it nsplit_i nsplit_j llm disvert ncar_disvert_c ncar_dz ncar_T0 ncar_p0
     order 400 caldyn_eta time_scheme caldyn_conserv dt nqtot itau_adv
-    order 500 nitergdiv tau_graddiv nitergrot tau_gradrot niterdivgrad tau_divgrad
+    order 500 nitergdiv tau_graddiv nitergrot tau_gradrot niterdivgrad tau_divgrad rayleigh_friction_type rayleigh_friction_tau
+    order 600 physics dcmip_physics itau_physics 
     order 700 run_length write_period etat0 dcmip4_testcase
-# Williamson 1991
-#    create_exp serial W91 40 5000 # nbp tau
-#    create_exp mpi W91 40 5000 # nbp tau
-# DCMIP 2012 
-    create_exp mpi DCMIP31 two_degree 60s 40 90000 # nbp tau 
-    create_exp mpi DCMIP41 two_degree 24h 40 10000 # nbp tau 
+
+    basic
 }