Changeset 197 for codes/icosagcm/trunk/param_sets

Timestamp:

07/07/14 12:24:45 (10 years ago)

Author:

dubos

Message:

Updated make_rundefs.sh

File:

• codes/icosagcm/trunk/param_sets/make_rundefs.sh (modified) (8 diffs)

codes/icosagcm/trunk/param_sets/make_rundefs.sh

@@ -102 +102 @@
 
 #################################### DCMIP #################################
+
 function dcmip1_def()
 {
@@ -144 +145 @@
 {
     group 'Mesh' nbp 40 llm 1 optim_it 100 ; split 2 2
-    group 'Numerics' caldyn gcm scheme runge_kutta time_step 480 caldyn_conserv energy
+    group 'Numerics' time_step 480 caldyn_conserv enstrophy
     group 'Time and output' out_pressure_level 85000 write_period 21600 run_length 864000
     group 'Physical parameters' radius 6.37122e6 g 9.80616 caldyn_eta eta_lag boussinesq .TRUE. etat0 williamson91.6
@@ -153 +154 @@
 {
     group 'Mesh' nbp 40 llm 19 disvert std optim_it 1000 ; split 2 2
-    group 'Numerics' scheme runge_kutta itau_adv 1 day_step 180 caldyn_conserv energy
+    group 'Numerics' itau_adv 1 day_step 180
     group 'Time' time_style lmd ndays 1200 write_period 86400
-    group 'Planet' scale_factor 1 radius 6.371e6 g 9.8 omega 7.292e-5 kappa 0.2857143 cpp 1004 preff 1e5
+    group 'Planet' radius 6.371e6 g 9.8 omega 7.292e-5 kappa 0.2857143 cpp 1004 preff 1e5
     group 'Physical parameters' etat0 held_suarez nqtot 1
     dissip 50000 2 50000 2 50000 2
@@ -170 +171 @@
     echo 'INCLUDEDEF = const.def'
     group 'Mesh' nbp 80 llm 60 disvert ncar ncar_dz 200 optim_it 100 ; split 2 2
-    group 'Numerics' caldyn adv time_step 180 caldyn_conserv energy
+    group 'Numerics' caldyn adv time_step 180
     group 'Time' run_length 1036800 write_period 86400
     group 'Physical parameters' guided_type dcmip1 ; dcmip1_def dcmip11 deform
@@ -179 +180 @@
     echo 'INCLUDEDEF = const.def'
     group 'Mesh' nbp 64 llm 60 disvert ncar ncar_dz 500 optim_it 100 ; split 2 2
-    group 'Numerics' time_step 300 caldyn_conserv energy
+    group 'Numerics' time_step 300
     dissip 1800 1 1800 2 1800 2
     group 'Time' run_length 3.6e6 write_period 50000
@@ -189 +190 @@
     const_dcmip 0
     group 'Mesh' nbp 80 llm 10 disvert ncar ncar_dz 1000 optim_it 100 ; split 2 2
-    group 'Numerics' caldyn gcm scheme runge_kutta time_step 240
+    group 'Numerics' time_step 240
     dissip 1800 1 1800 2 1800 2
     group 'Time' run_length 4.5e5 write_period 12500
@@ -195 +196 @@
 }
 
-function dcmip42
+function dcmip4x
 {
     echo 'INCLUDEDEF = const.def'
     group 'Mesh' nbp 80 llm 30 disvert ncarl30 optim_it 100 ; split 2 2
-    group 'Numerics' caldyn gcm scheme runge_kutta time_step 240
+    group 'Numerics' time_step 240
     dissip 1800 1 1800 2 1800 2
     group 'Time' run_length 3.6e6 write_period 21600
-    group 'Physical parameters' scale_factor 1 nqtot 2 etat0 dcmip4 dcmip4_testcase 2 dcmip_physics 1
-}
-
-function dcmip5
+    group 'Physical parameters' nqtot 2 etat0 dcmip4 dcmip4_testcase $1
+}
+
+function dcmip42
+{
+    dcmip4x 2
+    dcmip_physics 1
+}
+
+function dcmip51
 {
     echo 'INCLUDEDEF = const.def'
     group 'Mesh' nbp 64 llm 30 disvert ncarl30 optim_it 1000 ; split 2 2
-    group 'Numerics' caldyn gcm scheme runge_kutta time_step 300
+    group 'Numerics' time_step 300
     dissip 10800 1 10800 2 10800 2
     group 'Time' run_length 864000 write_period 7200
-    group 'Physical parameters' scale_factor 1 nqtot 1 etat0 dcmip5 dcmip_physics 0
+    group 'Physical parameters' nqtot 1 etat0 dcmip5 dcmip_physics 0
 }
     
@@ -234 +241 @@
 dcmip21 > run21.def
 dcmip3 > run3.def
+dcmip4x 1 > run41.def
 dcmip42 > run42.def
-dcmip5 > run5.def
+dcmip51 > run51.def