Changeset 629

Timestamp:

12/11/17 17:06:29 (6 years ago)

Author:

dubos

Message:

testing : added idealized Venus test case

Location:

configs/testing/bash

Files:

• X64_CURIE.sh (modified) (2 diffs)
• create_runs.sh (modified) (6 diffs)

configs/testing/bash/X64_CURIE.sh

@@ -10 +10 @@
 #----------------------------- split_XXX ----------------------------
 
+function split_mpi_32() {
+    setvar nbp 33 nsplit_i 2 nsplit_j 4
+}
 function split_serial_40() {
     setvar nbp 41 nsplit_i 2 nsplit_j 2
@@ -47 +50 @@
 function job_mpi() { #EXP_NAME NB_MPI
     job_X64_CURIE $1 $2 1 "ccc_mprun ./gcm.exe"
+}
+function job_mpi_32() { # EXP_NAME
+    job_mpi $1 80
 }
 function job_mpi_40() { # EXP_NAME

configs/testing/bash/create_runs.sh

@@ -36 +36 @@
 600   #-------------- Physics -------------
 700   #---------------- Run ---------------
+800   #------------ Diagnostics -----------
 EOF
 }
@@ -111 +112 @@
     NBP=$1 ; TAU=$2
     rundef_DCMIP $NBP
+    setvar dysl_caldyn_vert .TRUE. caldyn_vert conservative
     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 
@@ -183 +185 @@
 function job_held_suarez() { # EXEC NBP
     job_$1_$2 HS94_$1
+}
+
+function rundef_venus() {
+    rundef_all
+    split_mpi_32
+    setvar nqtot 0 optim_it 1000 dt 480
+    setvar radius 6.0518e6 g 8.874575 kappa 0.2857248 cpp 669.73533 preff 9.2e6 omega 6.229e-7
+    setvar llm 49 disvert ncar ncar_dz 3500 ncar_T0 700 ncar_p0 9.2e6
+    setvar tau_graddiv 21600 nitergdiv 1 tau_gradrot 21600 nitergrot 2 tau_divgrad 21600 niterdivgrad 2
+    setvar dysl_caldyn_vert .TRUE. caldyn_vert conservative
+    setvar itau_check_conserv 45 check_conservation detailed
+    setvar etat0 venus physics Lebonnois2012 itau_physics 15 friction_time $((3*EARTH_DAY))
+    setvar write_period $((VENUS_DAY/4))
+    setvar run_length $((3*VENUS_DAY))
+#    setvar run_length $((50*VENUS_DAY)) 
+}
+
+function job_venus() { # EXEC NBP
+    job_$1_32 venus_$1
 }
 
@@ -204 +225 @@
 # Other
     create_exp mpi_omp held_suarez two_degree 24h 40 10000 # nbp tau 
+    create_exp mpi venus two_degree "$((VENUS_DAY/4))s" 32
 }
 
@@ -211 +233 @@
     declare -A idx
     order 100 radius omega g cpp kappa preff scale_factor
-    order 200 boussinesq hydrostatic dysl
+    order 200 boussinesq hydrostatic
     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 400 caldyn_eta time_scheme caldyn_conserv dt nqtot itau_adv dysl dysl_caldyn_vert caldyn_vert
     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 600 physics dcmip_physics itau_physics friction_time
     order 700 run_length write_period etat0 dcmip4_testcase diagflux
-
+    order 800 itau_check_conserv check_conservation
     basic
 }
@@ -225 +247 @@
 source bash/xml.sh
 ROOT=$PWD
+VENUS_DAY=10087200
+EARTH_DAY=86400
 main