Changeset 284

Timestamp:

10/20/14 16:39:09 (10 years ago)

Author:

dubos

Message:

Updated make_rundefs.sh and new DCMIP parameter files

Location:

codes/icosagcm/trunk/param_sets

Files:

• climate/Held_Suarez/run.def (modified) (4 diffs)
• dcmip2012/const.def (added)
• dcmip2012/run11.def (added)
• dcmip2012/run20.def (added)
• dcmip2012/run21.def (added)
• dcmip2012/run3.def (added)
• dcmip2012/run41.def (added)
• dcmip2012/run42.def (added)
• dcmip2012/run51.def (added)
• make_rundefs.sh (modified) (8 diffs)
• shallow_water/williamson91/run6.def (added)
• shallow_water/williamson91/test6 (deleted)

codes/icosagcm/trunk/param_sets/climate/Held_Suarez/run.def

@@ -67 +67 @@
 
 # Initial state : 
-#   [jablonowsky06|academic|dcmip[1-4]|heldsz|dcmip2_schaer_noshear|dcmip3] (default=jablonowsky06)
+#   [jablonowsky06|academic|dcmip[1-4]|heldsz|dcmip2_schaer_noshear] (default=jablonowsky06)
 etat0 = held_suarez
 
@@ -74 +74 @@
 
 # Dissipation time for grad(div) : real (default=5000)
-tau_graddiv = 50000
+tau_graddiv = 18000
 
 # Exponent of grad(div) disspation : integer (default=1)
@@ -80 +80 @@
 
 # Dissipation time for curl(curl) : real (default=5000)
-tau_gradrot = 50000
+tau_gradrot = 18000
 
 # Exponent of curl(curl) disspation : integer (default=1)
@@ -86 +86 @@
 
 # Dissipation time for div(grad) : real (default=5000)
-tau_divgrad = 50000
+tau_divgrad = 18000
 
 # Exponent of div(grad) disspation : integer (default=1)

codes/icosagcm/trunk/param_sets/make_rundefs.sh

@@ -79 +79 @@
 
 function etat0 { 
-    OPTS=$(printf '\n#   [jablonowsky06|academic|dcmip[1-4]|heldsz|dcmip2_schaer_noshear|dcmip3]')
+    OPTS=$(printf '\n#   [jablonowsky06|academic|dcmip[1-4]|heldsz|dcmip2_schaer_noshear]')
     print 'Initial state' "$OPTS" jablonowsky06 etat0 $1
 }
@@ -91 +91 @@
     print 'Exponent of div(grad) disspation' integer 1 niterdivgrad $6
 }
+# Standard dissipation values for a few nbp
+function dissip32() { dissip 21600 2 50000 2 50000 2
+}
+function dissip40() { dissip 18000 2 18000 2 18000 2
+}
+function dissip64() { dissip 10800 2 10800 2 10800 2
+}
+function dissip80() { dissip 9000 2 9000 2 9000 2
+}
+
+
+function guided_type { print 'Type of guiding terms' '[none|dcmip1]' none guided_type $1 
+}
+
+function rayleigh_friction_type { print 'Type of Rayleigh friction' '[none|dcmip21]' none rayleigh_friction_type $1 
+}
+
+function rayleigh_friction_tau { print 'Relaxation time for Rayleigh friction' '0' none rayleigh_friction_tau $1 
+}
+
 function guided_type { print 'Type of guiding terms' '[none|dcmip1]' none guided_type $1 
 }
@@ -158 +178 @@
     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 physics held_suarez
-    dissip 50000 2 50000 2 50000 2
+    dissip40
 }
 
@@ -169 +189 @@
 function dcmip11
 {
-    echo 'INCLUDEDEF = const.def'
+    const_dcmip 0
     group 'Mesh' nbp 80 llm 60 disvert ncar ncar_dz 200 optim_it 100 ; split 2 2
     group 'Numerics' caldyn adv time_step 180
@@ -176 +196 @@
 }
 
+function dcmip20
+{
+    const_dcmip 0 # non-rotating
+    group 'Mesh' nbp 64 llm 15 disvert ncar ncar_dz 800 optim_it 100 ; split 2 2
+    group 'Numerics' time_step 300
+    dissip64
+    group 'Time' run_length 518400 write_period 21600
+    group 'Physical parameters' scale_factor 1 etat0 dcmip2_mountain
+}
+
 function dcmip21
 {
-    echo 'INCLUDEDEF = const.def'
+# small planet : we define the unscaled time as T and the scaled time is T/X
+# time.f90 divides times and lengths scales by scale factor X
+# the DCMIP document uses the words "scaled" and "unscaled" ambiguously
+# at p.3 the "rescaled radius" is a/X
+# in the description of experiment 2.1 (p. 32) "T in unscaled time units" means T/X 
+# and "T in scaled times units" means T
+# I understand the document as tau_rayleigh/X=25s
+    const_dcmip 0 # non-rotating
     group 'Mesh' nbp 64 llm 60 disvert ncar ncar_dz 500 optim_it 100 ; split 2 2
     group 'Numerics' time_step 300
-    dissip 1800 1 1800 2 1800 2
+    dissip64
     group 'Time' run_length 3.6e6 write_period 50000
-    group 'Physical parameters' scale_factor 500 guided_type dcmip1 etat0 dcmip2_schaer_noshear
+    group 'Physical parameters' scale_factor 500  etat0 dcmip2_schaer_noshear rayleigh_friction_tau 12500 rayleigh_friction_type dcmip2_schaer_noshear
 }
 
 function dcmip3
 {
-    const_dcmip 0
+    const_dcmip 0 # non-rotating
     group 'Mesh' nbp 80 llm 10 disvert ncar ncar_dz 1000 optim_it 100 ; split 2 2
     group 'Numerics' time_step 240
-    dissip 1800 1 1800 2 1800 2
+    dissip80
     group 'Time' run_length 4.5e5 write_period 12500
-    group 'Physical parameters' omega 0 scale_factor 125 etat0 dcmip3
-}
+    group 'Physical parameters' scale_factor 125 etat0 dcmip3
+}
+
+# Next DCMIP test cases have rotation
 
 function dcmip4x
@@ -201 +240 @@
     group 'Mesh' nbp 80 llm 30 disvert ncarl30 optim_it 100 ; split 2 2
     group 'Numerics' time_step 240
-    dissip 1800 1 1800 2 1800 2
+    dissip80
     group 'Time' run_length 3.6e6 write_period 21600
     group 'Physical parameters' nqtot 2 etat0 dcmip4 dcmip4_testcase $1
@@ -217 +256 @@
     group 'Mesh' nbp 64 llm 30 disvert ncarl30 optim_it 1000 ; split 2 2
     group 'Numerics' time_step 300
-    dissip 10800 1 10800 2 10800 2
+    dissip64
     group 'Time' run_length 864000 write_period 7200
     group 'Physical parameters' nqtot 1 etat0 dcmip5 dcmip_physics 0 itau_physics 6
@@ -239 +278 @@
 const_dcmip 7.292e-5 > const.def
 dcmip11 > run11.def
+dcmip20 > run20.def
 dcmip21 > run21.def
-dcmip3 > run3.def
+dcmip3  > run3.def
 dcmip4x 1 > run41.def
 dcmip42 > run42.def