Changeset 955 for codes/icosagcm/devel/src/dynamics/compute_geopot.F90

Timestamp:

07/15/19 23:21:31 (5 years ago)

Author:

dubos

Message:

devel : fixed diagnosis of hydrostatic pressure for Lagrangian vertical coordinate

File:

• codes/icosagcm/devel/src/dynamics/compute_geopot.F90 (modified) (2 diffs)

codes/icosagcm/devel/src/dynamics/compute_geopot.F90

@@ -17 +17 @@
 
 #ifdef BEGIN_DYSL
-
-#define THECELL {{ thecell }}
 
 {# ---------------- macro to generate code computing pressure top-down ---------------
@@ -59 +57 @@
 
 #define END_GEOPOT {% endcall %}
+
+#define THECELL {{ thecell }}
+
+KERNEL(compute_hydrostatic_pressure)
+  SELECT CASE(caldyn_thermo)
+  CASE(thermo_boussinesq)
+    ! use hydrostatic balance with theta*rhodz to find pk (=Lagrange multiplier=pressure)
+    BALANCE( theta_rhodz(THECELL,1) )
+  CASE(thermo_theta, thermo_entropy, thermo_variable_Cp)
+    BALANCE( rhodz(THECELL) )
+  CASE(thermo_moist)
+    BALANCE( (rhodz(THECELL)+theta_rhodz(THECELL,2)) )
+  END SELECT
+END_BLOCK
 
 KERNEL(compute_geopot)