Changeset 1302 for trunk/LMDZ.COMMON/makelmdz_fcm

Timestamp:

Jun 26, 2014, 6:07:05 PM (11 years ago)

Author:

emillour

Message:

Common dynamics:
Some updates to keep up with LMDZ5 Earth model evolution
(up to LMDZ5 rev 2070). See file "DOC/chantiers/commit_importants.log"
for detailed list of changes.
Note that the updates of exner* routines change (as expected) results
at numerical roundoff level.
EM

File:

• trunk/LMDZ.COMMON/makelmdz_fcm (modified) (8 diffs)

trunk/LMDZ.COMMON/makelmdz_fcm

@@ -23 +23 @@
 veget=false
 sisvat=false
+rrtm=false
 chimie=false
 chemistry=false
@@ -40 +41 @@
 LIBFGCM=$LMDGCM/libf
 # path for optional packages, but default set to ".void_dir"
+RRTM_PATH=$LMDGCM/.void_dir
+SISVAT_PATH=$LMDGCM/.void_dir
 COSP_PATH=$LMDGCM/.void_dir
 CHEM_PATH=$LMDGCM/.void_dir
@@ -76 +79 @@
 [-p PHYS]                  : set of physical parametrizations (in libf/phyPHYS), (default: lmd)
 [-prod / -dev / -debug]    : compilation mode production (default) / developement / debug .
-[-c false/MPI1/MPI2]       : (Earth) coupling with ocean model : MPI1/MPI2/false (default: false)
+[-c false/MPI1/OMCT]       : coupling with ocean model : MPI1/OMCT/false (default: false)
 [-v false/orchidee2.0/orchidee1.9/true] : version of the vegetation model to include (default: false)
           false       : no vegetation model
@@ -138 +141 @@
           sisvat="$2" ; shift ; shift ;;
 
+      "-rrtm")
+          rrtm="$2" ; shift ; shift ;;
+
       "-chimie")
           chimie="$2" ; shift ; shift ;;
@@ -250 +256 @@
 if [[ "$couple" != "false" ]]
 then
-   CPP_KEY="$CPP_KEY CPP_COUPLE"
-   INCLUDE="$INCLUDE -I${OASIS_INCDIR}"
-   LIB="$LIB -L${OASIS_LIBDIR} -lpsmile.${couple} -lmpp_io"
+    if [[ "$couple" == "MPI1" ]]
+    then
+        CPP_KEY="$CPP_KEY CPP_COUPLE"
+        export OASIS_INCDIR=$LMDGCM/../../prism/X64/build/lib/psmile.MPI1
+        export OASIS_LIBDIR=$LMDGCM/../../prism/X64/lib
+        INCLUDE="$INCLUDE -I${OASIS_INCDIR}"
+        LIB="$LIB -L${OASIS_LIBDIR} -lpsmile.MPI1 -lmpp_io"
+    else
+        CPP_KEY="$CPP_KEY CPP_COUPLE CPP_OMCT"
+        INCLUDE="$INCLUDE -I${OASIS_INCDIR}"
+        LIB="$LIB -L${OASIS_LIBDIR} -lpsmile.MPI1 -lscrip -lmct -lmpeu"
+    fi
 fi
 
@@ -310 +325 @@
 then
    CPP_KEY="$CPP_KEY CPP_SISVAT"
-   sed -e 's/^#src::sisvat/src::sisvat/' bld.cfg > bld.tmp
-   mv bld.tmp bld.cfg
+   SISVAT_PATH="$LIBFGCM/%PHYS/sisvat"
+   #sed -e 's/^#src::sisvat/src::sisvat/' bld.cfg > bld.tmp
+   #mv bld.tmp bld.cfg
+fi
+
+if [[ "$rrtm" == "true" ]]
+then
+   CPP_KEY="$CPP_KEY CPP_RRTM"
+   RRTM_PATH="$LIBFGCM/%PHYS/rrtm"
+   #sed -e 's/^#src::rrtm/src::rrtm/' bld.cfg > bld.tmp
+   #mv bld.tmp bld.cfg
 fi
 
@@ -536 +560 @@
 echo "%DYN           $DYN"           >> $config_fcm
 echo "%PHYS          phy${physique}" >> $config_fcm
+echo "%RRTM          $RRTM_PATH"     >> $config_fcm
+echo "%SISVAT        $SISVAT_PATH"   >> $config_fcm
 echo "%COSP          $COSP_PATH"     >> $config_fcm
 echo "%CHEM          $CHEM_PATH"     >> $config_fcm
@@ -567 +593 @@
 
 #eventual cleanup for SISVAT
-sed -e 's/^src::sisvat/#src::sisvat/' bld.cfg > bld.tmp
-mv bld.tmp bld.cfg
+#sed -e 's/^src::sisvat/#src::sisvat/' bld.cfg > bld.tmp
+#mv bld.tmp bld.cfg
+
+#eventual cleanup for RRTM
+#sed -e 's/^src::rrtm/#src::rrtm/' bld.cfg > bld.tmp
+#mv bld.tmp bld.cfg