Changeset 732 for codes/icosagcm/devel/src/base/earth_const.f90

Timestamp:

08/24/18 13:56:09 (6 years ago)

Author:

dubos

Message:

devel : more cleanup and reorganization in dynamics/

File:

• codes/icosagcm/devel/src/base/earth_const.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_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, &
-       caldyn_vert_noncons=1, caldyn_vert_cons=2
-  INTEGER, PUBLIC :: caldyn_thermo, caldyn_vert_variant, physics_thermo
-  !$OMP THREADPRIVATE(caldyn_thermo) 
-  !$OMP THREADPRIVATE(physics_thermo) 
-
-  LOGICAL, SAVE :: boussinesq, hydrostatic
-  !$OMP THREADPRIVATE(boussinesq)
-  !$OMP THREADPRIVATE(hydrostatic) 
-  LOGICAL :: dysl, dysl_geopot, dysl_pvort_only, dysl_caldyn_fast, dysl_caldyn_coriolis, dysl_slow_hydro, dysl_caldyn_vert
-  !$OMP THREADPRIVATE(dysl, dysl_geopot, dysl_pvort_only, dysl_caldyn_fast, dysl_caldyn_coriolis, dysl_slow_hydro, dysl_caldyn_vert)
-
 CONTAINS
   
@@ -51 +38 @@
     CALL getin("scale_height",scale_height)
     
-    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)  
-    IF(boussinesq .AND. .NOT. hydrostatic) THEN
-       PRINT *, 'boussinesq=.TRUE. and hydrostatic=.FALSE. : Non-hydrostatic boussinesq equations are not supported'
-       STOP
-    END IF
-    
     mu=kappa/cpp
     radius=radius/scale_factor