Changeset 4176 for LMDZ6/trunk

Timestamp:

Jun 17, 2022, 7:49:28 PM (3 years ago)

Author:

lguez

Message:

Polish

Location:

LMDZ6/trunk/libf/phylmd

Files:

• Ocean_skin/config_ocean_skin_m.F90 (modified) (1 diff)
• Ocean_skin/sens_heat_rain_m.F90 (modified) (1 diff)
• aero_mod.F90 (modified) (1 diff)

LMDZ6/trunk/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/trunk/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

LMDZ6/trunk/libf/phylmd/aero_mod.F90

@@ -55 +55 @@
        "ASBCM  ", & ! Accumulation-mode Soluble Black Carbon Mass 
        "ASPOMM ", & ! Accumulation-mode Soluble Particle Organic Matter Mass
-       "SO4    ", & ! Sulfate
+       "SO4    ", & ! Accumulation-mode Soluble Sulfate
        "CSSO4M ", & ! Coarse-mode Soluble Sulfate Mass
        "SSSSM  ", & ! Super-coarse mode Soluble Sea-Salt Mass