Changeset 3628 for LMDZ6/branches/Ocean_skin/libf/phylmd/pbl_surface_mod.F90

Timestamp:

Feb 4, 2020, 10:36:32 PM (4 years ago)

Author:

lguez

Message:

If the ocean skin parameterization is working actively
(activate_ocean_skin == 2) and we are coupled to the ocean then send
ocean-air interface salinity to the ocean. New dummy argument s_int
of procedures ocean_cpl_noice and cpl_send_ocean_fields. We can
only send interface salinity from the previous time-step since
communication with the ocean is before the call to bulk_flux. So make
s_int a state variable: move s_int from phys_output_var_mod to
phys_state_var_mod. Still, we only read s_int from startphy,
define it before the call to surf_ocean and write it to restartphy
if activate_ocean_skin == 2 and type_ocean == 'couple'. In
procedure pbl_surface, for clarity, move the definition of output
variables t_int, dter, dser, tkt, tks, rf, taur to missing_val to
after the call to surf_ocean, with the definition of s_int,
ds_ns, dt_ns to missing_val. This does not change anything for
t_int, dter, dser, tkt, tks, rf, taur. In pbl_surface_newfrac, we
choose to set s_int to 35 for an appearing ocean point, this is
questionable. In surf_ocean, change the intent of s_int from out
to inout.

File:

• LMDZ6/branches/Ocean_skin/libf/phylmd/pbl_surface_mod.F90 (modified) (6 diffs)

LMDZ6/branches/Ocean_skin/libf/phylmd/pbl_surface_mod.F90

@@ -292 +292 @@
     USE print_control_mod,  ONLY : prt_level,lunout
     USE ioipsl_getin_p_mod, ONLY : getin_p
-    use phys_state_var_mod, only: ds_ns, dt_ns
-    use phys_output_var_mod, only: t_int, s_int, dter, dser, tkt, tks, rf, taur
+    use phys_state_var_mod, only: s_int, ds_ns, dt_ns
+    use phys_output_var_mod, only: t_int, dter, dser, tkt, tks, rf, taur
 #ifdef CPP_XIOS
     USE wxios, ONLY: missing_val
@@ -969 +969 @@
     rh2m_x(:) = 0. ; qsat2m_x(:) = 0. ; rh2m_w(:) = 0. ; qsat2m_w(:) = 0.
 
-    if (activate_ocean_skin >= 1) then
-       t_int = missing_val
-       s_int = missing_val
-       dter = missing_val
-       dser = missing_val
-       tkt = missing_val
-       tks = missing_val
-       rf = missing_val
-       taur = missing_val
-    end if
-
 ! 2b) Initialization of all local variables that will be compressed later
 !****************************************************************************************
@@ -1440 +1429 @@
 
        if (nsrf == is_oce .and. activate_ocean_skin >= 1) then
+          if (activate_ocean_skin == 2 .and. type_ocean == "couple") &
+               ys_int(:knon) = s_int(ni(:knon))
           yds_ns(:knon) = ds_ns(ni(:knon))
           ydt_ns(:knon) = dt_ns(ni(:knon))
@@ -2570 +2561 @@
 
        if (nsrf == is_oce .and. activate_ocean_skin >= 1) then
+          s_int = missing_val
+          ds_ns = missing_val
           dt_ns = missing_val
-          ds_ns = missing_val
+          t_int = missing_val
+          dter = missing_val
+          dser = missing_val
+          tkt = missing_val
+          tks = missing_val
+          rf = missing_val
+          taur = missing_val
+          
+          s_int(ni(:knon)) = ys_int(:knon)
           ds_ns(ni(:knon)) = yds_ns(:knon)
           dt_ns(ni(:knon)) = ydt_ns(:knon)
-
           t_int(ni(:knon)) = yt_int(:knon)
-          s_int(ni(:knon)) = ys_int(:knon)
           dter(ni(:knon)) = ydter(:knon)
           dser(ni(:knon)) = ydser(:knon)
@@ -3195 +3194 @@
 
     USE indice_sol_mod
-    use phys_state_var_mod, only: ds_ns, dt_ns
+    use phys_state_var_mod, only: s_int, ds_ns, dt_ns
     use config_ocean_skin_m, only: activate_ocean_skin
 
@@ -3284 +3283 @@
                    ENDDO
                    if (activate_ocean_skin >= 1) then
+                      if (activate_ocean_skin == 2 &
+                           .and. type_ocean == "couple") s_int(i) = 35.
                       ds_ns(i) = 0.
                       dt_ns(i) = 0.