Changeset 732 for codes/icosagcm/devel/src/dynamics/caldyn_vars.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/dynamics/caldyn_vars.f90 (modified) (2 diffs)

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

@@ -6 +6 @@
   SAVE
 
-  INTEGER, PARAMETER :: energy=1, enstrophy=2
+  INTEGER, PARAMETER :: energy=1, enstrophy=2, caldyn_vert_noncons=1, caldyn_vert_cons=2, &
+       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 :: caldyn_conserv, caldyn_thermo, caldyn_vert_variant, physics_thermo
+  !$OMP THREADPRIVATE(caldyn_conserv, caldyn_thermo, caldyn_vert_variant, physics_thermo)
+
+  LOGICAL :: boussinesq, hydrostatic
+  !$OMP THREADPRIVATE(boussinesq, 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)
 
   ! temporary shared variables for caldyn
@@ -12 +23 @@
                            f_Fel(:), f_gradPhi2(:), f_wil(:), f_Wetadot(:)
 
-  INTEGER :: caldyn_conserv
-  !$OMP THREADPRIVATE(caldyn_conserv) 
 
   TYPE(t_message) :: req_ps, req_mass, req_theta_rhodz, req_u, req_qu, req_geopot, req_w