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

Timestamp:

Feb 4, 2020, 10:36:32 PM (5 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/cpl_mod.F90 (modified) (11 diffs)

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

@@ -49 +49 @@
   !$OMP THREADPRIVATE(cpl_snow,cpl_evap,cpl_tsol)
 
-  REAL, ALLOCATABLE, SAVE:: cpl_t_int(:)
-  !$OMP THREADPRIVATE(cpl_t_int)
+  REAL, ALLOCATABLE, SAVE:: cpl_t_int(:), cpl_s_int(:)
+  !$OMP THREADPRIVATE(cpl_t_int, cpl_s_int)
   
   REAL, ALLOCATABLE, DIMENSION(:,:), SAVE   :: cpl_fder, cpl_albe, cpl_taux, cpl_tauy
@@ -94 +94 @@
   !$OMP THREADPRIVATE(cpl_snow2D, cpl_evap2D, cpl_tsol2D)
 
-  REAL, ALLOCATABLE, SAVE:: cpl_t_int_2D(:,:)
-  !$OMP THREADPRIVATE(cpl_t_int_2D)
+  REAL, ALLOCATABLE, SAVE:: cpl_t_int_2D(:,:), cpl_s_int_2D(:,:)
+  !$OMP THREADPRIVATE(cpl_t_int_2D, cpl_s_int_2D)
 
   REAL, ALLOCATABLE, DIMENSION(:,:,:), SAVE :: cpl_fder2D, cpl_albe2D
@@ -237 +237 @@
     
        if (activate_ocean_skin == 2) then
-          ALLOCATE(cpl_t_int(klon), stat = error)
+          ALLOCATE(cpl_t_int(klon), cpl_s_int(klon), stat = error)
           sum_error = sum_error + error
        end if
@@ -645 +645 @@
        swdown, lwdown, fluxlat, fluxsens, &
        precip_rain, precip_snow, evap, tsurf, fder, albsol, taux, tauy, windsp,&
-       sens_prec_liq, sens_prec_sol, lat_prec_liq, lat_prec_sol, t_int)
+       sens_prec_liq, sens_prec_sol, lat_prec_liq, lat_prec_sol, t_int, s_int)
 
     ! This subroutine cumulates some fields for each time-step during
@@ -672 +672 @@
     REAL, DIMENSION(klon), INTENT(IN)       :: lat_prec_liq, lat_prec_sol
     real, intent(in):: t_int(:) ! (klon) ocean-air interface temperature, in K
+    real, intent(in):: s_int(:) ! (knon) ocean-air interface salinity, in ppt
 
 ! Local variables
@@ -707 +708 @@
        cpl_taumod(1:knon,cpl_index) = 0.0
        IF (carbon_cycle_cpl) cpl_atm_co2(1:knon,cpl_index) = 0.0
-       if (activate_ocean_skin == 2) cpl_t_int(:knon) = 0.
+
+       if (activate_ocean_skin == 2) then
+          cpl_t_int(:knon) = 0.
+          cpl_s_int = 0.
+       end if
     ENDIF
        
@@ -750 +755 @@
        ENDIF
 
-       if (activate_ocean_skin == 2) &
-            cpl_t_int(ig) = cpl_t_int(ig) + t_int(ig) / REAL(nexca)
+       if (activate_ocean_skin == 2) then
+          cpl_t_int(ig) = cpl_t_int(ig) + t_int(ig) / REAL(nexca)
+          cpl_s_int(ig) = cpl_s_int(ig) + s_int(ig) / REAL(nexca)
+       end if
      ENDDO
 
@@ -799 +806 @@
 
           if (activate_ocean_skin == 2) then
-             ALLOCATE(cpl_t_int_2D(nbp_lon, jj_nb), stat = error)
+             ALLOCATE(cpl_t_int_2D(nbp_lon, jj_nb), &
+                  cpl_s_int_2D(nbp_lon, jj_nb), stat = error)
              sum_error = sum_error + error
           end if
@@ -857 +865 @@
        IF (carbon_cycle_cpl) &
             CALL gath2cpl(cpl_atm_co2(:,cpl_index), cpl_atm_co22D(:,:), knon, knindex)
-       if (activate_ocean_skin == 2) &
-            CALL gath2cpl(cpl_t_int, cpl_t_int_2D, knon, knindex)
+       if (activate_ocean_skin == 2) then
+          CALL gath2cpl(cpl_t_int, cpl_t_int_2D, knon, knindex)
+          CALL gath2cpl(cpl_s_int, cpl_s_int_2D, knon, knindex)
+       end if
     ENDIF
 
@@ -1252 +1262 @@
     tab_flds(:,:,ids_qraiic) = cpl_sens_rain2D(:,:,2)
     tab_flds(:,:,ids_qsnoic) = cpl_sens_snow2D(:,:,2)
-    if (activate_ocean_skin == 2) tab_flds(:, :, ids_t_int) = cpl_t_int_2D
+
+    if (activate_ocean_skin == 2) then
+       tab_flds(:, :, ids_t_int) = cpl_t_int_2D
+       tab_flds(:, :, ids_s_int) = cpl_s_int_2D
+    end if
     
     IF (version_ocean=='nemo') THEN
@@ -1489 +1503 @@
     ENDIF
 
-    if (activate_ocean_skin == 2) deallocate(cpl_t_int_2d)
+    if (activate_ocean_skin == 2) deallocate(cpl_t_int_2d, cpl_s_int_2d)
 
     IF (sum_error /= 0) THEN