Changeset 4203 for LMDZ6/branches/LMDZ_ECRad/libf/phylmd/Ocean_skin

Timestamp:

Jul 19, 2022, 1:33:28 PM (2 years ago)

Author:

lguez

Message:

Sync latest trunk changes to branch LMDZ_ECRad.

Location:

LMDZ6/branches/LMDZ_ECRad

Files:

• . (modified) (1 prop)
• libf/phylmd/Ocean_skin/config_ocean_skin_m.F90 (modified) (1 diff)
• libf/phylmd/Ocean_skin/sens_heat_rain_m.F90 (modified) (1 diff)

LMDZ6/branches/LMDZ_ECRad/libf/phylmd/Ocean_skin/config_ocean_skin_m.F90

@@ -11 +11 @@
   ! the depth of a sensor, or the depth at the middle of the first
   ! layer of an ocean model (half the depth of the first layer). In
-  ! m. Setting depth_1 to any value >= depth has the same effect as
-  ! setting depth_1 to depth.
+  ! m. Setting depth_1 to any value >= depth (named constant defined
+  ! in module `near_Surface_m`) has the same effect as setting depth_1
+  ! to depth.
 
   !$omp threadprivate(jcool, jwarm, rain_effect, depth_1)

LMDZ6/branches/LMDZ_ECRad/libf/phylmd/Ocean_skin/sens_heat_rain_m.F90

@@ -5 +5 @@
 contains
 
+#ifdef IN_LMDZ
   real function sens_heat_rain(rain, t, q, rhoa, xlv, t_int, p)
+#else
+  elemental real function sens_heat_rain(rain, t, q, rhoa, xlv, t_int, p)
+#endif
 
     ! Computes heat flux due to rainfall, in W m-2, positive
     ! upward.
 
-    ! Do not declare this function as elemental because it may include
-    ! YOMCST.h, which contains an OpenMP directive, and that only
-    ! works in OpenMP 5.0.
+    ! If in LMDZ, do not declare this function as elemental because
+    ! YOMCST.h contains an OpenMP directive, and that only works in
+    ! OpenMP 5.0.
 
     use const, only: cpa, cpw, rgas