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

Timestamp:

Jul 23, 2024, 3:29:36 PM (6 months ago)

Author:

abarral

Message:

Handle CPP_INLANDSIS in lmdz_cppkeys_wrapper.F90
Remove obsolete key wrgrads_thermcell, _ADV_HALO, _ADV_HALLO, isminmax
Remove redundant uses of CPPKEY_INCA (thanks acozic)
Remove obsolete misc/write_field.F90
Remove unused ioipsl_* wrappers
Remove calls to WriteField_u with wrong signature
Convert .F -> .[fF]90
(lint) uppercase fortran operators
[note: 1d and iso still broken - working on it]

Location:

LMDZ6/branches/Amaury_dev/libf/phylmd/Ocean_skin

Files:

• bulk_flux_m.F90 (modified) (2 diffs)
• config_ocean_skin_m.F90 (modified) (3 diffs)
• const.F90 (modified) (2 diffs)
• microlayer_m.F90 (modified) (2 diffs)
• near_surface_m.F90 (modified) (2 diffs)

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

@@ -5 +5 @@
 contains
 
-  subroutine bulk_flux(tkt, tks, taur, dter, dser, t_int, s_int, ds_ns, dt_ns, &
+  SUBROUTINE bulk_flux(tkt, tks, taur, dter, dser, t_int, s_int, ds_ns, dt_ns, &
        u, t_ocean_1, s1, rain, hf, hlb, rnl, tau, rhoa, xlv, rf, dtime, rns)
 
@@ -151 +151 @@
     s_int = s_subskin + dser
 
-  end subroutine bulk_flux
+  END SUBROUTINE  bulk_flux
 
 end module bulk_flux_m

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

@@ -27 +27 @@
 contains
 
-  subroutine config_ocean_skin
+  SUBROUTINE config_ocean_skin
 
 #ifdef IN_LMDZ
@@ -58 +58 @@
     select case (flag_ocean_skin)
     case (0)
-       jwarm = .false.
-       jcool = .false.
-       rain_effect = .false.
+       jwarm = .FALSE.
+       jcool = .FALSE.
+       rain_effect = .FALSE.
     case (1)
-       jwarm = .false.
-       jcool = .true.
-       rain_effect = .false.
+       jwarm = .FALSE.
+       jcool = .TRUE.
+       rain_effect = .FALSE.
     case (2)
-       jwarm = .true.
-       jcool = .true.
-       rain_effect = .false.
+       jwarm = .TRUE.
+       jcool = .TRUE.
+       rain_effect = .FALSE.
     case (3)
-       jwarm = .true.
-       jcool = .true.
-       rain_effect = .true.
+       jwarm = .TRUE.
+       jcool = .TRUE.
+       rain_effect = .TRUE.
     case default
        print *, "config_ocean_skin: bad value for flag_ocean_skin."
@@ -78 +78 @@
     end select
 
-  end subroutine config_ocean_skin
+  END SUBROUTINE  config_ocean_skin
 
 end module config_ocean_skin_m

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

@@ -3 +3 @@
   implicit none
 
-  real, parameter:: beta = 0.756 / 1023.343
+  real, parameter :: beta = 0.756 / 1023.343
   ! Salinity expansion coefficient. Derivative with respect to
   ! practical salinity, not mass fraction of salt. Value at 25 Celsius
@@ -9 +9 @@
   ! k0829, table A.3.1).
 
-  real, parameter:: cpa = 1004.67
+  real, parameter :: cpa = 1004.67
   ! specific heat of dry air, in J / kg / K (Businger 1982)
 
-  real, parameter:: cpw = 4000. ! specific heat of liquid water, in J / kg / K
-  real, parameter:: grav  = 9.780326772 ! constante de gravitation, m s-2
-  real, parameter::  rhow = 1022. ! density of liquid water, in kg / m3
+  real, parameter :: cpw = 4000. ! specific heat of liquid water, in J / kg / K
+  real, parameter :: grav = 9.780326772 ! constante de gravitation, m s-2
+  real, parameter :: rhow = 1022. ! density of liquid water, in kg / m3
 
-  real, parameter:: rgas = 287.1
+  real, parameter :: rgas = 287.1
   ! specific ideal gas constant for dry air, in J / kg / K
 
-  real, parameter:: von = 0.4 ! von Karman's "constant"
+  real, parameter :: von = 0.4 ! von Karman's "constant"
 
-  real, parameter:: eps_w = 0.62197
+  real, parameter :: eps_w = 0.62197
   ! molecular mass of water over molecular mass of dry air (Gill 1982
   ! k0829, equation 3.1.13)

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

@@ -5 +5 @@
 contains
 
-  subroutine Microlayer(dter, dser, tkt, tks, hlb, tau, s_subskin, al, &
+  SUBROUTINE Microlayer(dter, dser, tkt, tks, hlb, tau, s_subskin, al, &
        xlv, taur, rf, rain, qcol)
 
@@ -102 +102 @@
          / (rhow * mu) ! eq. fresh skin
 
-  end subroutine Microlayer
+  END SUBROUTINE  Microlayer
 
 end module Microlayer_m

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

@@ -8 +8 @@
 contains
 
-  subroutine near_surface(al, t_subskin, s_subskin, ds_ns, dt_ns, tau, taur, &
+  SUBROUTINE near_surface(al, t_subskin, s_subskin, ds_ns, dt_ns, tau, taur, &
        hlb, rhoa, xlv, dtime, t_ocean_1, s1, rain, q_pwp)
 
@@ -152 +152 @@
     s_subskin = s_fnd + ds_ns
 
-  end subroutine Near_Surface
+  END SUBROUTINE  Near_Surface
 
 end module Near_Surface_m