Changeset 5116 for LMDZ6/branches/Amaury_dev/libf/phylmd/Ocean_skin

Timestamp:

Jul 24, 2024, 2:54:37 PM (4 months ago)

Author:

abarral

Message:

rename modules properly lmdz_*
move ismin, ismax, minmax into new lmdz_libmath.f90
(lint) uppercase fortran keywords

Location:

LMDZ6/branches/Amaury_dev/libf/phylmd/Ocean_skin

Files:

• bulk_flux_m.F90 (modified) (5 diffs)
• config_ocean_skin_m.F90 (modified) (2 diffs)
• esat_m.F90 (modified) (1 diff)
• fv_m.F90 (modified) (2 diffs)
• microlayer_m.F90 (modified) (1 diff)
• mom_flux_rain_m.F90 (modified) (1 diff)
• near_surface_m.F90 (modified) (2 diffs)
• phiw_m.F90 (modified) (2 diffs)
• sens_heat_rain_m.F90 (modified) (2 diffs)
• therm_expans_m.F90 (modified) (1 diff)

LMDZ6/branches/Amaury_dev/libf/phylmd/Ocean_skin/bulk_flux_m.F90

@@ -8 +8 @@
        u, t_ocean_1, s1, rain, hf, hlb, rnl, tau, rhoa, xlv, rf, dtime, rns)
 
-    use config_ocean_skin_m, only: jwarm, jcool, rain_effect
-    use Microlayer_m, only: Microlayer
-    use mom_flux_rain_m, only: mom_flux_rain
-    use Near_Surface_m, only: Near_Surface, depth
-    use therm_expans_m, only: therm_expans
+    use config_ocean_skin_m, ONLY: jwarm, jcool, rain_effect
+    use Microlayer_m, ONLY: Microlayer
+    use mom_flux_rain_m, ONLY: mom_flux_rain
+    use Near_Surface_m, ONLY: Near_Surface, depth
+    use therm_expans_m, ONLY: therm_expans
 
     real, intent(out):: tkt(:)
@@ -97 +97 @@
     !-------------------------------------------------------------------
 
-    if (rain_effect) then
+    if (rain_effect) THEN
        taur = mom_flux_rain(u, rain)
     else
@@ -106 +106 @@
     if (jwarm .or. jcool) tau_with_min = tau + tau_0 * (1. - exp(- tau_0 / tau))
 
-    if (Jwarm) then
-       if (rain_effect) then
+    if (Jwarm) THEN
+       if (rain_effect) THEN
           CALL Near_Surface(al, t_subskin, s_subskin, ds_ns, dt_ns, &
                tau_with_min, taur, hlb, rhoa, xlv, dtime, t_ocean_1, s1, rain, &
@@ -122 +122 @@
     end if
 
-    if (Jcool) then
+    if (Jcool) THEN
        ! First guess:
        tkt = 0.001
@@ -131 +131 @@
           dels = rns * (0.065 + 11. * tkt - 6.6e-5 / tkt &
                * (1. - exp(- tkt / 8e-4))) ! equation 16 Ohlmann
-          if (rain_effect) then
+          if (rain_effect) THEN
              CALL Microlayer(dter, dser, tkt, tks, hlb, tau_with_min, &
                   s_subskin, al, xlv, taur, rf, rain, &

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

@@ -30 +30 @@
 
 #ifdef IN_LMDZ
-    use lmdz_ioipsl_getin_p, only: getin_p
-    use lmdz_assert, only: assert
+    use lmdz_ioipsl_getin_p, ONLY: getin_p
+    use lmdz_assert, ONLY: assert
 #endif
 
@@ -45 +45 @@
     CALL assert(activate_ocean_skin >= 0 .and. activate_ocean_skin <= 2, &
          "config_ocean_skin bad value of activate_ocean_skin")
-    if (activate_ocean_skin >= 1) then
+    if (activate_ocean_skin >= 1) THEN
        CALL getin_p("flag_ocean_skin", flag_ocean_skin)
        CALL getin_p("depth_1", depth_1)
     end if
 #else
-    write(unit = *, nml = config_ocean_skin_nml)
+    WRITE(unit = *, nml = config_ocean_skin_nml)
     print *, "Enter namelist config_ocean_skin_nml."
     read(unit = *, nml = config_ocean_skin_nml)
-    write(unit = *, nml = config_ocean_skin_nml)
+    WRITE(unit = *, nml = config_ocean_skin_nml)
 #endif
 

LMDZ6/branches/Amaury_dev/libf/phylmd/Ocean_skin/esat_m.F90

@@ -18 +18 @@
          * exp(17.502 * (T - 273.15) / (T - 32.18))
 
-  end function esat
+  END FUNCTION esat
 
 end module esat_m

LMDZ6/branches/Amaury_dev/libf/phylmd/Ocean_skin/fv_m.F90

@@ -30 +30 @@
     !---------------------------------------------------------------------
 
-    if (rain > 0.) then
+    if (rain > 0.) THEN
        rc = 0.4 ! mm
        z_mm = z * 1000. ! mm and <0
@@ -42 +42 @@
     endif
 
-  end function fV
+  END FUNCTION fV
 
 end module fv_m

LMDZ6/branches/Amaury_dev/libf/phylmd/Ocean_skin/microlayer_m.F90

@@ -10 +10 @@
     ! H. Bellenger 2016
 
-    use const, only: beta, cpw, grav, rhow
-    use fv_m, only: fv
+    use const, ONLY: beta, cpw, grav, rhow
+    use fv_m, ONLY: fv
 
     real, intent(out):: dter(:)

LMDZ6/branches/Amaury_dev/libf/phylmd/Ocean_skin/mom_flux_rain_m.F90

@@ -20 +20 @@
     ! as in paragraph 3.a, maybe adequate if u is the wind at 10 m)
 
-  end function mom_flux_rain
+  END FUNCTION mom_flux_rain
   
 end module mom_flux_rain_m

LMDZ6/branches/Amaury_dev/libf/phylmd/Ocean_skin/near_surface_m.F90

@@ -13 +13 @@
     ! Hugo Bellenger, 2016
 
-    use config_ocean_skin_m, only: depth_1
-    use const, only: beta, cpw, grav, rhow, von
-    use Phiw_m, only: Phiw
-    use therm_expans_m, only: therm_expans
+    use config_ocean_skin_m, ONLY: depth_1
+    use const, ONLY: beta, cpw, grav, rhow, von
+    use Phiw_m, ONLY: Phiw
+    use therm_expans_m, ONLY: therm_expans
 
     real, intent(out):: al(:) ! water thermal expansion coefficient (in K-1)
@@ -93 +93 @@
     end where
 
-    if (depth_1 < depth) then
+    if (depth_1 < depth) THEN
        correction = 1. - (depth_1 / depth)**eta
        ! (neglecting microlayer thickness compared to depth_1 and depth)

LMDZ6/branches/Amaury_dev/libf/phylmd/Ocean_skin/phiw_m.F90

@@ -13 +13 @@
     !----------------------------------------------
 
-    if (zL < 0.) then
+    if (zL < 0.) THEN
        Phiw = (1. - 16. * zL)**(- 0.5)
     else
@@ -20 +20 @@
     end if
 
-  end function Phiw
+  END FUNCTION Phiw
 
 end module Phiw_m

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

@@ -18 +18 @@
     ! OpenMP 5.0.
 
-    use const, only: cpa, cpw, rgas
+    use const, ONLY: cpa, cpw, rgas
 #ifndef IN_LMDZ
-    use const, only: eps_w
+    use const, ONLY: eps_w
 #endif
-    use esat_m, only: esat
+    use esat_m, ONLY: esat
 
 #ifdef IN_LMDZ
@@ -66 +66 @@
     sens_heat_rain =  rain * alfac * cpw * (t_int - t + (q_int - q) * xlv / cpa)
 
-  end function sens_heat_rain
+  END FUNCTION sens_heat_rain
   
 end module sens_heat_rain_m

LMDZ6/branches/Amaury_dev/libf/phylmd/Ocean_skin/therm_expans_m.F90

@@ -15 +15 @@
     therm_expans = 2.1e-5 * (t - 269.95)**0.79
 
-  end function therm_expans
+  END FUNCTION therm_expans
 
 end module therm_expans_m