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

Timestamp:

Jul 19, 2020, 5:25:06 PM (4 years ago)

Author:

lguez

Message:

Store delta_sal instead of s_int

Revision analoguous to revision [3744], for salinity. Store as a state
variable and send to the ocean delta_sal, the difference between
ocean-air interface salinity and bulk salinity, instead of s_int,
the interface salinity.

So replace dummy argument s_int of procedure cpl_send_ocean_fields
by dummy argument delta_sal. Replace dummy argument s_int of
procedures ocean_cpl_noice and surf_ocean by dummy argument
delta_sal. Replace variable s_int of module phys_state_var_mod
by variable delta_sal. Rename local variable ys_int of procedure
pbl_surface to ydelta_sal. Set variable delta_sal of module
phys_state_var_mod to 0 for an appearing ocean fraction and a
missing startup field. Replace variable o_s_int of module
phys_output_ctrlout_mod by variable o_delta_sal.

Rename variables cpl_s_int and cpl_s_int_2D of module cpl_mod to
cpl_delta_sal and cpl_delta_sal_2D. Rename variable ids_s_int of
module oasis to ids_delta_sal. Change infosend(ids_delta_sal)%name
to "CODELSSS".

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_delta_sst(:), cpl_s_int(:)
-  !$OMP THREADPRIVATE(cpl_delta_sst, cpl_s_int)
+  REAL, ALLOCATABLE, SAVE:: cpl_delta_sst(:), cpl_delta_sal(:)
+  !$OMP THREADPRIVATE(cpl_delta_sst, cpl_delta_sal)
   
   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_delta_sst_2D(:,:), cpl_s_int_2D(:,:)
-  !$OMP THREADPRIVATE(cpl_delta_sst_2D, cpl_s_int_2D)
+  REAL, ALLOCATABLE, SAVE:: cpl_delta_sst_2D(:,:), cpl_delta_sal_2D(:,:)
+  !$OMP THREADPRIVATE(cpl_delta_sst_2D, cpl_delta_sal_2D)
 
   REAL, ALLOCATABLE, DIMENSION(:,:,:), SAVE :: cpl_fder2D, cpl_albe2D
@@ -237 +237 @@
     
        if (activate_ocean_skin == 2) then
-          ALLOCATE(cpl_delta_sst(klon), cpl_s_int(klon), stat = error)
+          ALLOCATE(cpl_delta_sst(klon), cpl_delta_sal(klon), stat = error)
           sum_error = sum_error + error
        end if
@@ -646 +646 @@
        precip_rain, precip_snow, evap, tsurf, fder, albsol, taux, tauy, windsp,&
        sens_prec_liq, sens_prec_sol, lat_prec_liq, lat_prec_sol, delta_sst, &
-       s_int)
+       delta_sal)
 
     ! This subroutine cumulates some fields for each time-step during
@@ -677 +677 @@
     ! K. Defined only if activate_ocean_skin >= 1.
 
-    real, intent(in):: s_int(:) ! (knon) ocean-air interface salinity, in ppt
+    real, intent(in):: delta_sal(:) ! (knon)
+    ! Ocean-air interface salinity minus bulk salinity, in ppt.
 
 ! Local variables
@@ -715 +716 @@
 
        if (activate_ocean_skin == 2) then
-          cpl_delta_sst(:knon) = 0.
-          cpl_s_int = 0.
+          cpl_delta_sst = 0.
+          cpl_delta_sal = 0.
        end if
     ENDIF
@@ -762 +763 @@
        if (activate_ocean_skin == 2) then
           cpl_delta_sst(ig) = cpl_delta_sst(ig) + delta_sst(ig) / REAL(nexca)
-          cpl_s_int(ig) = cpl_s_int(ig) + s_int(ig) / REAL(nexca)
+          cpl_delta_sal(ig) = cpl_delta_sal(ig) + delta_sal(ig) / REAL(nexca)
        end if
      ENDDO
@@ -812 +813 @@
           if (activate_ocean_skin == 2) then
              ALLOCATE(cpl_delta_sst_2D(nbp_lon, jj_nb), &
-                  cpl_s_int_2D(nbp_lon, jj_nb), stat = error)
+                  cpl_delta_sal_2D(nbp_lon, jj_nb), stat = error)
              sum_error = sum_error + error
           end if
@@ -872 +873 @@
        if (activate_ocean_skin == 2) then
           CALL gath2cpl(cpl_delta_sst, cpl_delta_sst_2D, knon, knindex)
-          CALL gath2cpl(cpl_s_int, cpl_s_int_2D, knon, knindex)
+          CALL gath2cpl(cpl_delta_sal, cpl_delta_sal_2D, knon, knindex)
        end if
     ENDIF
@@ -1270 +1271 @@
     if (activate_ocean_skin == 2) then
        tab_flds(:, :, ids_delta_sst) = cpl_delta_sst_2D
-       tab_flds(:, :, ids_s_int) = cpl_s_int_2D
+       tab_flds(:, :, ids_delta_sal) = cpl_delta_sal_2D
     end if
     
@@ -1508 +1509 @@
     ENDIF
 
-    if (activate_ocean_skin == 2) deallocate(cpl_delta_sst_2d, cpl_s_int_2d)
+    if (activate_ocean_skin == 2) deallocate(cpl_delta_sst_2d, cpl_delta_sal_2d)
 
     IF (sum_error /= 0) THEN