Changeset 3432 for LMDZ6/branches/Ocean_skin

Timestamp:

Jan 18, 2019, 6:29:40 PM (6 years ago)

Author:

lguez

Message:

Move the call to config_ocean_skin out of !$OMP MASTER in procedure
conf_phys. Definition of jcool, jwarm and rain_effect must be done by
all threads.

Use keywords in call to bulk_flux in procedure surf_ocean, for clarity.

Define CPP_KEY IN_LMDZ in makelmdz_fcm. This could be useful for any
external code used with LMDZ.

Move the Ocean_skin folder out of the LMDZ tree. This is more
convenient and clearer because Ocean_skin stays under Git control for
now. So we do not declare a phylmd/Ocean_skin folder in
"bld.cfg". Instead, we use the option -ext_src of makelmdz_fcm.

Location:

LMDZ6/branches/Ocean_skin

Files:

• bld.cfg (modified) (2 diffs)
• libf/phylmd/conf_phys_m.F90 (modified) (2 diffs)
• libf/phylmd/surf_ocean_mod.F90 (modified) (1 diff)

LMDZ6/branches/Ocean_skin/bld.cfg

@@ -37 +37 @@
 src::cosp    %COSP
 src::ext_src %EXT_SRC
-src::ocean_skin %SRC_PATH/phylmd/Ocean_skin
 
 bld::lib            lmdz
@@ -48 +47 @@
 dir::root            %CONFIG_PATH
 #dir::lib             %BASE_CONFIG_PATH
-dir::bin             %LIBO
+dir::bin             %ROOT_PATH/bin
 
 #search_src           1

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

@@ -2171 +2171 @@
     CALL getin('level_coupling_esm',level_coupling_esm_omp)
     ! << PC
-
-    call config_ocean_skin
 
     !$OMP END MASTER
@@ -2747 +2745 @@
 
     !$OMP END MASTER
-
-    RETURN
+    call config_ocean_skin
 
   END SUBROUTINE conf_phys

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

@@ -318 +318 @@
     s1 = 35.
     call bulk_flux(tkt, tks, taur, dter, dser, t_int, s_int, ds_ns, dt_ns, &
-         windsp(:knon), tsurf_new(:knon), s1, precip_tot, - fluxsens(:knon), &
-         - fluxlat(:knon), - lwnet(:knon), &
-         sqrt(flux_u1(:knon)**2 + flux_v1(:knon)**2), rhoa, xlv, rf, dtime, &
-         swnet(:knon))
+         u = windsp(:knon), t_ocean_1 = tsurf_new(:knon), s1 = s1, &
+         rain = precip_tot, hf = - fluxsens(:knon), hlb = - fluxlat(:knon), &
+         rnl = - lwnet(:knon), &
+         tau = sqrt(flux_u1(:knon)**2 + flux_v1(:knon)**2), rhoa = rhoa, &
+         xlv = xlv, rf = rf, dtime = dtime, rns = swnet(:knon))
 
   END SUBROUTINE surf_ocean