Changeset 406 for codes/icosagcm/trunk/src

Timestamp:

06/08/16 23:24:41 (8 years ago)

Author:

dubos

Message:

Introduced fake_moist mode

Location:

codes/icosagcm/trunk/src

Files:

• caldyn_gcm.f90 (modified) (1 diff)
• earth_const.f90 (modified) (1 diff)

codes/icosagcm/trunk/src/caldyn_gcm.f90

@@ -40 +40 @@
     CASE('theta')
        caldyn_thermo=thermo_theta
+       physics_thermo=thermo_dry
     CASE('entropy')
        caldyn_thermo=thermo_entropy
+       physics_thermo=thermo_dry
+    CASE('theta_fake_moist')
+       caldyn_thermo=thermo_theta
+       physics_thermo=thermo_fake_moist
+    CASE('entropy_fake_moist')
+       caldyn_thermo=thermo_entropy
+       physics_thermo=thermo_fake_moist
+    CASE('moist')
+       caldyn_thermo=thermo_moist
+       physics_thermo=thermo_moist
     CASE DEFAULT
        IF (is_mpi_root) PRINT *,'Bad selector for variable caldyn_thermo : <', &

codes/icosagcm/trunk/src/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
-  INTEGER, PUBLIC :: caldyn_thermo
+  INTEGER, PARAMETER,PUBLIC :: thermo_theta=1, thermo_entropy=2, &
+       thermo_moist=3, thermo_dry=4, thermo_fake_moist=5 
+  INTEGER, PUBLIC :: caldyn_thermo, physics_thermo
   !$OMP THREADPRIVATE(caldyn_thermo) 
+  !$OMP THREADPRIVATE(physics_thermo) 
 
   LOGICAL, SAVE :: boussinesq, hydrostatic