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

Timestamp:

01/15/17 01:03:04 (7 years ago)

Author:

dubos

Message:

Update to testing

File:

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

configs/testing/bash/create_runs.sh

@@ -12 +12 @@
     cd $EXPDIR
     ln -sf $ROOT/bin/icosa_${EXEC}.exe gcm.exe
-    ln -sf $ROOT/python/post_${EXP}.py post.py
+    cp $ROOT/python/common.py post.py
+    echo "post_${EXP}()" >> post.py
+#    ln -sf $ROOT/python/post_${EXP}.py post.py
     rundef_$EXP $* > tmp.def
     sort tmp.def | cut -c 7- > run.def
@@ -103 +105 @@
     rundef_DCMIP $NBP
     setvar hydrostatic .FALSE.
-    setvar omega 0. llm 10 disvert ncar ncar_T0 300 ncar_p0 1e5 ncar_disvert_c 1 ncar_dz 1118 
+    setvar omega 0. llm 10 disvert ncar ncar_T0 300 ncar_p0 1e5 ncar_disvert_c 1 ncar_dz 1118
     setvar tau_graddiv $TAU tau_gradrot $TAU tau_divgrad $TAU 
     setvar scale_factor 125 write_period 7500 run_length 4.5e5 etat0 dcmip3
@@ -139 +141 @@
 }
 
-#----------------------------- END ----------------------------
+#------------------------------------- OTHER ---------------------------------
+
+function rundef_bubble() { # NBP TAU
+    NBP=$1 ; TAU=$2
+    rundef_all
+    set_nbp_$NBP
+    setvar llm 50 disvert ncar ncar_dz 20 ncar_T0 300 ncar_p0 1e5
+#    setvar time_scheme ARK2.3
+    setvar nitergdiv 2 nitergrot 2 niterdivgrad 2 tau_graddiv $TAU tau_gradrot $TAU tau_divgrad $TAU
+    setvar radius 5e6 scale_factor 10000  g 9.80616 kappa 0.2857143 cpp 1004.5 preff 1e5 omega 0.
+}
+function job_bubble() { # EXEC NBP
+    job_$1_$2 Bubble_$1
+}
+
+function rundef_held_suarez() { # NBP TAU
+    NBP=$1 ; TAU=$2
+    rundef_DCMIP $NBP
+    setvar llm 19 disvert std write_period 86400 run_length 2592000 etat0 held_suarez # physics held_suarez
+    setvar time_scheme RK2.5
+    setvar nitergdiv 2 nitergrot 2 niterdivgrad 2 tau_graddiv $TAU tau_gradrot $TAU tau_divgrad $TAU
+}
+function job_held_suarez() { # EXEC NBP
+    job_$1_$2 HS94_$1
+}
+
+
+#-------------------------------- END TEST CASES -----------------------------
 
 function basic()
@@ -154 +183 @@
     create_exp mpi DCMIP41 two_degree 24h 40 10000 # nbp tau 
 #    create_exp mpi DCMIP51 one_degree 2h  80 10000 # nbp tau 
+# Other
+    create_exp mpi_omp held_suarez two_degree 24h 40 10000 # nbp tau 
 }
 
@@ -162 +193 @@
     order 100 radius omega g cpp kappa preff scale_factor
     order 200 boussinesq hydrostatic
-    order 300 nbp optim_it nsplit_i nsplit_j llm disvert ncar_disvert_c ncar_dz ncar_T0 ncar_p0
+    order 300 nbp optim_it nsplit_i nsplit_j llm omp_level_size 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 rayleigh_friction_type rayleigh_friction_tau