Changeset 4013 for LMDZ6/branches/Ocean_skin/makelmdz

Timestamp:

Nov 19, 2021, 4:58:59 PM (3 years ago)

Author:

lguez

Message:

Sync latest trunk changes to Ocean_skin

Location:

LMDZ6/branches/Ocean_skin

Files:

• . (modified) (1 prop)
• makelmdz (modified) (11 diffs)

LMDZ6/branches/Ocean_skin/makelmdz

@@ -19 +19 @@
 chimie=false
 parallel=none
-paramem="par"
+paramem="mem"
 compil_mod=prod
 io=ioipsl
@@ -27 +27 @@
 cosp2=false
 cospv2=false
-sisvat=false
 inlandsis=false
 rrtm=false
-rrtm=false
+rad=""
 dust=false
 strataer=false
@@ -87 +86 @@
 ########################################################################
 
-CPP_KEY="" 
+CPP_KEY="IN_LMDZ" 
 INCLUDE='-I$(LIBF)/grid -I$(LIBF)/misc -I$(LIBF)/filtrez -I. '
 LIB=""
@@ -122 +121 @@
 [-cosp2 true/false]    : compile with/without cosp2 package (default: false)
 [-cospv2 true/false]    : compile with/without cospv2 package (default: false)
-[-sisvat true/false]  : compile with/without sisvat package (default: false)
 [-inlandsis true/false]  : compile with/without inlandsis package (default: false)
 [-rrtm true/false]    : compile with/without rrtm package (default: false)
+[-rad old/rrtm/ecrad]    : compile with old/rrtm/ecrad radiatif code (default: old)
 [-dust true/false]    : compile with/without the dust package from Boucher et al. (default: false)
 [-strataer true/false]    : compile with/without the strat aer package from Boucher et al. (default: false)
@@ -133 +132 @@
 [-cpp CPP_KEY]             : additional preprocessing definitions
 [-adjnt]                   : adjoint model, not operational ...
-[-mem]                     : reduced memory dynamics (if in parallel mode)
+[-mem]                     : reduced memory dynamics (obsolete flag; always on in parallel mode)
 [-filtre NOMFILTRE]        : use filtre from libf/NOMFILTRE (default: filtrez)
 [-full]                    : Full (re)compilation (from scratch)
@@ -192 +191 @@
           cospv2="$2" ; shift ; shift ;;
       
-      "-sisvat")
-          sisvat="$2" ; shift ; shift ;;
-
       "-inlandsis")
           inlandsis="$2" ; shift ; shift ;;  
 
       "-rrtm")
-          rrtm="$2" ; shift ; shift ;;
+          rrtm="$2" ; if [ "$2" = "false" ] ; then rad="old" ; else rad="rrtm" ; fi ; shift ; shift ;;
+
+      "-rad")
+          rad="$2" ; shift ; shift ;;
 
       "-dust")
@@ -208 +207 @@
       
       "-mem")
+          echo "option -mem is obsolete (now always on in parallel)"
           paramem="mem" ; shift ;;
 
@@ -353 +353 @@
 if [[ "${physique:0:5}" == "venus" ]] ; then phys_root=venus ; fi
 if [[ "${physique:0:5}" == "titan" ]] ; then phys_root=titan ; fi
-if [[ "${physique:0:3}" == "mar" ]] ; then phys_root=mar ; fi
 if [[ "${physique:0:3}" == "dev" ]] ; then phys_root=dev ; fi
 
@@ -518 +517 @@
 
 
-if [[ "$sisvat" == "true" ]]
-then
-   CPP_KEY="$CPP_KEY CPP_SISVAT"
-   src_dirs="$src_dirs phy${physique}/sisvat"
-fi
-
-
 if [[ "$inlandsis" == "true" ]]
 then
@@ -532 +524 @@
 
 
-if [[ "$rrtm" == "true" ]]
+if [[ "$rad" == "rrtm" ]]
 then
    CPP_KEY="$CPP_KEY CPP_RRTM"
    src_dirs="$src_dirs phy${physique}/rrtm"
 fi
+if [[ "$rad" == "ecrad" ]]
+then
+   CPP_KEY="$CPP_KEY CPP_ECRAD"
+   src_dirs="$src_dirs phy${physique}/ecrad"
+fi
 
 if [[ "$dust" == "true" ]]
@@ -549 +546 @@
    src_dirs="$src_dirs phy${physique}/StratAer"
 fi
+
+#add new ocean skin modelisation to source dir by default
+
+src_dirs="$src_dirs phy${physique}/Ocean_skin"