Changeset 534 for codes/icosagcm/devel

Timestamp:

05/30/17 15:52:00 (7 years ago)

Author:

dubos

Message:

devel : caldyn_thermo = thermo_boussinesq replaces boussinesq=.TRUE. (shallow-water)

Location:

codes/icosagcm/devel/src

Files:

• base/earth_const.f90 (modified) (2 diffs)
• dynamics/caldyn_gcm.f90 (modified) (2 diffs)

codes/icosagcm/devel/src/base/earth_const.f90

@@ -19 +19 @@
   REAL(rstd),SAVE :: mu                 ! molar mass of the atmosphere
 
-  INTEGER, PARAMETER,PUBLIC :: thermo_theta=1, thermo_entropy=2, &
-       thermo_moist=3, thermo_moist_debug=10, thermo_dry=4, thermo_fake_moist=5 
+  INTEGER, PARAMETER,PUBLIC :: thermo_none=-99, thermo_theta=1, thermo_entropy=2, &
+       thermo_moist=3, thermo_boussinesq=4, thermo_dry=10, thermo_fake_moist=11, thermo_moist_debug=100
   INTEGER, PUBLIC :: caldyn_thermo, physics_thermo
   !$OMP THREADPRIVATE(caldyn_thermo) 
@@ -48 +48 @@
     boussinesq=.FALSE.
     CALL getin("boussinesq",boussinesq)  
+    PRINT *, "Note : key boussinesq is deprecated, use thermo=boussinesq instead"
+    IF(boussinesq) STOP
     hydrostatic=.TRUE.
     CALL getin("hydrostatic",hydrostatic)  

codes/icosagcm/devel/src/dynamics/caldyn_gcm.f90

@@ -21 +21 @@
     INTEGER            :: ind
     REAL(rstd),POINTER :: planetvel(:)
+
+    hydrostatic=.TRUE.
+    CALL getin("hydrostatic",hydrostatic)
   
     def='energy'
@@ -37 +40 @@
 
     nqdyn=1 ! default value
+    physics_thermo = thermo_none
 
     def='theta'
     CALL getin('thermo',def)
     SELECT CASE(TRIM(def))
+    CASE('boussinesq')
+       boussinesq=.TRUE.
+       caldyn_thermo=thermo_boussinesq
+       IF(.NOT. hydrostatic) THEN
+          PRINT *, 'thermo=boussinesq and hydrostatic=.FALSE. : Non-hydrostatic boussinesq equations are not supported'
+          STOP
+       END IF
     CASE('theta')
        caldyn_thermo=thermo_theta