Changeset 3432 for LMDZ6/branches/Ocean_skin/libf/phylmd/conf_phys_m.F90

Timestamp:

Jan 18, 2019, 6:29:40 PM (5 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.

File:

• LMDZ6/branches/Ocean_skin/libf/phylmd/conf_phys_m.F90 (modified) (2 diffs)

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