Changeset 553

Timestamp:

09/18/17 15:10:09 (7 years ago)

Author:

dubos

Message:

trunk : backported commit 534 from devel

File:

• codes/icosagcm/trunk/src/base/earth_const.f90 (modified) (3 diffs)

codes/icosagcm/trunk/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) 
@@ -26 +26 @@
 
   LOGICAL, SAVE :: boussinesq, hydrostatic
+  !$OMP THREADPRIVATE(boussinesq)
+  !$OMP THREADPRIVATE(hydrostatic) 
 
 CONTAINS
@@ -48 +50 @@
     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)