Changeset 3719

Timestamp:

Jun 12, 2020, 9:31:02 PM (4 years ago)

Author:

lguez

Message:

Change name and meaning of t_int to sst_nff

Rename variable t_int of module phys_output_var_mod to
sst_nff. Rename local variable yt_int of pbl_surface to
ysst_nff. Rename type o_t_int of module phys_output_ctrlout_mod
to o_sst_nff. In procedure phys_output_write, write sst_nff if
activate_ocean_skin >= 1, while t_int was written only for
activate_ocean_skin == 1.

In procedure surf_ocean, rename dummy argument t_int to
sst_nff. Create local variable t_int. Set sst_nff to t_int or
tsurf_new depending on activate_ocean_skin.

Motivation: we want to output the bulk SST if activate_ocean_skin

2. Before this revision, the bulk SST in variable tsurf_new in

procedure surf_ocean was overwritten with interface temperature and
lost. We already had two output variables for SST: t_int and
ftsol, containing the same values if activate_ocean_skin

2. Instead of creating a third variable for bulk SST, change the

name and meaning of t_int to sst_nff, the SST not used to compute
surface fluxes. That is either the interface temperature or the bulk
SST depending on activate_ocean_skin. The SST used to compute
surface fluxes is always ftsol, meaning either the interface
temperature or the bulk SST depending on activate_ocean_skin.

Location:

LMDZ6/branches/Ocean_skin/libf/phylmd

Files:

• pbl_surface_mod.F90 (modified) (5 diffs)
• phys_output_ctrlout_mod.F90 (modified) (1 diff)
• phys_output_var_mod.F90 (modified) (3 diffs)
• phys_output_write_mod.F90 (modified) (3 diffs)
• surf_ocean_mod.F90 (modified) (4 diffs)

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

@@ -293 +293 @@
     USE ioipsl_getin_p_mod, ONLY : getin_p
     use phys_state_var_mod, only: s_int, ds_ns, dt_ns
-    use phys_output_var_mod, only: t_int, dter, dser, tkt, tks, taur
+    use phys_output_var_mod, only: sst_nff, dter, dser, tkt, tks, taur
 #ifdef CPP_XIOS
     USE wxios, ONLY: missing_val
@@ -830 +830 @@
     ! Martin
 
-    real, DIMENSION(klon):: yt_int, ys_int, yds_ns, ydt_ns, ydter, ydser, &
+    real, DIMENSION(klon):: ysst_nff, ys_int, yds_ns, ydt_ns, ydter, ydser, &
          ytkt, ytks, ytaur
-    ! compression of t_int, s_int, ds_ns, dt_ns, dter, dser, tkt, tks,
+    ! compression of sst_nff, s_int, ds_ns, dt_ns, dter, dser, tkt, tks,
     ! taur on ocean points
 
@@ -1954 +1954 @@
                yz0m, yz0h, SFRWL,yalb_dir_new, yalb_dif_new, yevap, yfluxsens,yfluxlat,&
                ytsurf_new, y_dflux_t, y_dflux_q, slab_wfbils, &
-               y_flux_u1, y_flux_v1, yt_int(:knon), ys_int(:knon), &
+               y_flux_u1, y_flux_v1, ysst_nff(:knon), ys_int(:knon), &
                yds_ns(:knon), ydt_ns(:knon), ydter(:knon), ydser(:knon), &
                ytkt(:knon), ytks(:knon), ytaur(:knon))
@@ -2564 +2564 @@
           ds_ns = missing_val
           dt_ns = missing_val
-          t_int = missing_val
+          sst_nff = missing_val
           dter = missing_val
           dser = missing_val
@@ -2574 +2574 @@
           ds_ns(ni(:knon)) = yds_ns(:knon)
           dt_ns(ni(:knon)) = ydt_ns(:knon)
-          t_int(ni(:knon)) = yt_int(:knon)
+          sst_nff(ni(:knon)) = ysst_nff(:knon)
           dter(ni(:knon)) = ydter(:knon)
           dser(ni(:knon)) = ydser(:knon)

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

@@ -1947 +1947 @@
 #endif
 
-   type(ctrl_out), save:: o_t_int &
-        = ctrl_out([1, 10, 10, 1, 10, 10, 11, 11, 11, 11], 'T_int', &
-        "ocean-air interface temperature", "K", '')
+   type(ctrl_out), save:: o_sst_nff &
+        = ctrl_out([1, 10, 10, 1, 10, 10, 11, 11, 11, 11], 'SST_nff', &
+        "SST not used to compute fluxes", "K", '')
 
    type(ctrl_out), save:: o_s_int &

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

@@ -135 +135 @@
   ! Ocean-atmosphere interface, subskin ocean and near-surface ocean:
   
-  REAL, ALLOCATABLE, SAVE:: t_int(:) ! interface temperature, in K
+  REAL, ALLOCATABLE, SAVE:: sst_nff(:)
+  ! SST not used to compute surface fluxes, in K. If
+  ! activate_ocean_skin == 0 then it is not allocated; if
+  ! activate_ocean_skin == 1 then it is the ocean-air interface
+  ! temperature; if activate_ocean_skin == 2 then it is the bulk SST.
 
   REAL, ALLOCATABLE, SAVE:: dter(:)
@@ -155 +159 @@
   ! momentum flux due to rain, in Pa
   
-  !$OMP THREADPRIVATE(t_int, dter, dser, tkt, tks, taur)
+  !$OMP THREADPRIVATE(sst_nff, dter, dser, tkt, tks, taur)
 
 CONTAINS
@@ -216 +220 @@
     IF (ok_gwd_rando) allocate(zustr_gwd_rando(klon), zvstr_gwd_rando(klon))
 
-    if (activate_ocean_skin >= 1) allocate(t_int(klon), dter(klon), &
+    if (activate_ocean_skin >= 1) allocate(sst_nff(klon), dter(klon), &
          dser(klon), tkt(klon), tks(klon), taur(klon))
 

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

@@ -202 +202 @@
 !--interactive CO2
          o_flx_co2_ocean, o_flx_co2_land, o_flx_co2_ff, o_flx_co2_bb, &
-         o_t_int, o_s_int, o_ds_ns, o_dt_ns, o_dter, o_dser, o_tkt, o_tks, &
+         o_sst_nff, o_s_int, o_ds_ns, o_dt_ns, o_dter, o_dser, o_tkt, o_tks, &
          o_taur
 
@@ -360 +360 @@
          alt_tropo, &
 !Ionela
-         ok_4xCO2atm, t_int, dter, dser, tkt, tks, taur
+         ok_4xCO2atm, sst_nff, dter, dser, tkt, tks, taur
 
     USE ocean_slab_mod, ONLY: nslay, tslab, slab_bilg, tice, seaice, &
@@ -2304 +2304 @@
 
        if (activate_ocean_skin >= 1) then
-          if (activate_ocean_skin == 1) CALL histwrite_phy(o_t_int, t_int)
-          ! (no need to duplicate with netCDF variable "tsol_oce" if
-          ! activate_ocean_skin == 2)
-          
+          CALL histwrite_phy(o_sst_nff, sst_nff)
           CALL histwrite_phy(o_s_int, s_int)
           CALL histwrite_phy(o_ds_ns, ds_ns)

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

@@ -20 +20 @@
        z0m, z0h, SFRWL, alb_dir_new, alb_dif_new, evap, fluxsens, fluxlat, & 
        tsurf_new, dflux_s, dflux_l, lmt_bils, &
-       flux_u1, flux_v1, t_int, s_int, ds_ns, dt_ns, dter, dser, tkt, tks, taur)
+       flux_u1, flux_v1, sst_nff, s_int, ds_ns, dt_ns, dter, dser, tkt, tks, taur)
 
     use albedo, only: alboc, alboc_cd
@@ -102 +102 @@
     REAL, DIMENSION(klon), INTENT(OUT)       :: flux_u1, flux_v1
 
-    REAL, intent(out):: t_int(:) ! (knon) ocean-air interface temperature, in K
+    REAL, intent(out):: sst_nff(:) ! (knon)
+    ! SST not used to compute surface fluxes, in K. If
+    ! activate_ocean_skin == 0 then it is not defined; if
+    ! activate_ocean_skin == 1 then it is the ocean-air interface
+    ! temperature; if activate_ocean_skin == 2 then it is the bulk SST.
 
     REAL, intent(out):: dter(:) ! (knon)
@@ -140 +144 @@
     ! size klon because of the coupling machinery.)
 
-    ! End definition
+    REAL t_int(knon) ! ocean-air interface temperature, in K
+
     !******************************************************************************
 
@@ -321 +326 @@
             xlv = [(rlvtt, i = 1, knon)], rf = - sens_prec_liq, dtime = dtime, &
             rns = swnet(:knon))
-       if (activate_ocean_skin == 2) tsurf_new(:knon) = t_int
+
+       if (activate_ocean_skin == 1) then
+          sst_nff = t_int
+       else
+          ! activate_ocean_skin == 2
+          sst_nff = tsurf_new(:knon)
+          tsurf_new(:knon) = t_int
+       end if
     end if