Changeset 195 for codes/icosagcm/trunk

Timestamp:

07/04/14 12:17:42 (10 years ago)

Author:

dubos

Message:

Switched default caldyn_conserv to energy ; fixed make_rundefs.sh

Location:

codes/icosagcm/trunk

Files:

• param_sets/make_rundefs.sh (modified) (5 diffs)
• src/caldyn_gcm.f90 (modified) (1 diff)

codes/icosagcm/trunk/param_sets/make_rundefs.sh

@@ -38 +38 @@
 function llm   { print 'Number of vertical layers' integer 19 llm $1 
 }
-function disvert { print 'Vertical grid' '[std|ncar|ncar30l]' std disvert $1 
+function disvert { print 'Vertical grid' '[std|ncar|ncarl30]' std disvert $1 
 }
 function ncar_dz { print 'Model layer thickness in m, used if disvert=ncar' real 300 ncar_dz $1
@@ -59 +59 @@
 function caldyn { print 'Equations solved' '[gcm|adv]' gcm caldyn $1 
 }
-function caldyn_conserv { print 'Discretization of Coriolis term' '[energy|enstophy]' enstrophy caldyn_conserv $1 
+function caldyn_conserv { print 'Discretization of Coriolis term' '[energy|enstophy]' energy caldyn_conserv $1 
 }
 function caldyn_eta { print 'Vertical coordinate' '[eta_mass|eta_lag]' mass caldyn_eta $1 
@@ -91 +91 @@
     print 'Exponent of grad(div) disspation' integer 1 nitergdiv $2
     print 'Dissipation time for curl(curl)' real 5000 tau_gradrot $3
-    print 'Exponent of curl(curl) disspation' integer 1 nitergrot $2
-    print 'Dissipation time for div(grad)' real 5000 tau_divgrad $3
-    print 'Exponent of div(grad) disspation' integer 1 niterdivgrad $2
+    print 'Exponent of curl(curl) disspation' integer 1 nitergrot $4
+    print 'Dissipation time for div(grad)' real 5000 tau_divgrad $5
+    print 'Exponent of div(grad) disspation' integer 1 niterdivgrad $6
 }
 function guided_type { print 'Type of guiding terms' '[none|dcmip1]' none guided_type $1 
@@ -198 +198 @@
 {
     echo 'INCLUDEDEF = const.def'
-    group 'Mesh' nbp 80 llm 30 disvert ncar30l optim_it 100 ; split 2 2
+    group 'Mesh' nbp 80 llm 30 disvert ncarl30 optim_it 100 ; split 2 2
     group 'Numerics' caldyn gcm scheme runge_kutta time_step 240
     dissip 1800 1 1800 2 1800 2
@@ -208 +208 @@
 {
     echo 'INCLUDEDEF = const.def'
-    group 'Mesh' nbp 64 llm 30 disvert ncar30l optim_it 1000 ; split 2 2
+    group 'Mesh' nbp 64 llm 30 disvert ncarl30 optim_it 1000 ; split 2 2
     group 'Numerics' caldyn gcm scheme runge_kutta time_step 300
     dissip 10800 1 10800 2 10800 2

codes/icosagcm/trunk/src/caldyn_gcm.f90

@@ -38 +38 @@
     REAL(rstd),POINTER :: planetvel(:)
   
-    def='enstrophy'
+    def='energy'
     CALL getin('caldyn_conserv',def)
     SELECT CASE(TRIM(def))