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

Timestamp:

Jan 30, 2019, 5:55:48 PM (5 years ago)

Author:

lguez

Message:

Introduce variable activate_ocean_skin in module config_ocean_skin_m.

Bug fix in phys_state_var_end: we need to deallocate variables for
lmdz1d (although it is useless for a 3D run).

File:

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

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

@@ -27 +27 @@
 !!                                  wx_pbl_fuse, wx_pbl_split
                                   wx_pbl0_fuse, wx_pbl0_split
+  use config_ocean_skin_m, only: activate_ocean_skin
 
   IMPLICIT NONE
@@ -963 +964 @@
     rh2m_x(:) = 0. ; qsat2m_x(:) = 0. ; rh2m_w(:) = 0. ; qsat2m_w(:) = 0.
 
-    t_int = nf90_fill_real
-    s_int = nf90_fill_real
-    dter = nf90_fill_real
-    dser = nf90_fill_real
-    tkt = nf90_fill_real
-    tks = nf90_fill_real
-    rf = nf90_fill_real
-    taur = nf90_fill_real
+    if (activate_ocean_skin >= 1) then
+       t_int = nf90_fill_real
+       s_int = nf90_fill_real
+       dter = nf90_fill_real
+       dser = nf90_fill_real
+       tkt = nf90_fill_real
+       tks = nf90_fill_real
+       rf = nf90_fill_real
+       taur = nf90_fill_real
+    end if
 
 ! 2b) Initialization of all local variables that will be compressed later
@@ -1431 +1434 @@
        ENDIF
 
-       if (nsrf == is_oce) then
+       if (nsrf == is_oce .and. activate_ocean_skin >= 1) then
           yds_ns(:knon) = ds_ns(ni(:knon))
           ydt_ns(:knon) = dt_ns(ni(:knon))
@@ -2561 +2564 @@
        ENDIF
 
-       if (nsrf == is_oce) then
+       if (nsrf == is_oce .and. activate_ocean_skin >= 1) then
           dt_ns = nf90_fill_real
           ds_ns = nf90_fill_real
@@ -3188 +3191 @@
     USE indice_sol_mod
     use phys_state_var_mod, only: ds_ns, dt_ns
+    use config_ocean_skin_m, only: activate_ocean_skin
 
     INCLUDE "dimsoil.h"
@@ -3274 +3278 @@
                       alb_dif(i,k,nsrf) = 0.06
                    ENDDO
-                   ds_ns(i) = 0.
-                   dt_ns(i) = 0.
+                   if (activate_ocean_skin >= 1) then
+                      ds_ns(i) = 0.
+                      dt_ns(i) = 0.
+                   end if
                 ELSE IF (nsrf.EQ.is_sic) THEN
                    tsurf(i,nsrf) = 271.35