Changeset 1999 for LMDZ5/branches/testing/makelmdz_fcm

Timestamp:

Mar 20, 2014, 10:57:19 AM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r1920:1997 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• makelmdz_fcm (modified) (6 diffs)

LMDZ5/branches/testing/makelmdz_fcm

@@ -23 +23 @@
 veget=false
 sisvat=false
+rrtm=false
 chimie=false
 parallel=none
@@ -66 +67 @@
 [-p PHYS]                  : set of physical parametrizations (in libf/phyPHYS), (default: lmd)
 [-prod / -dev / -debug]    : compilation mode production (default) / developement / debug
-[-c false/MPI1/MPI2]       : 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
@@ -121 +122 @@
           sisvat="$2" ; shift ; shift ;;
 
+      "-rrtm")
+          rrtm="$2" ; shift ; shift ;;
+
       "-chimie")
           chimie="$2" ; shift ; shift ;;
@@ -231 +235 @@
 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
 
@@ -295 +308 @@
 fi
 
+if [[ "$rrtm" == "true" ]]
+then
+   CPP_KEY="$CPP_KEY CPP_RRTM"
+   sed -e 's/^#src::rrtm/src::rrtm/' bld.cfg > bld.tmp
+   mv bld.tmp bld.cfg
+fi
+
 if [[ $io == ioipsl ]]
 then
@@ -504 +524 @@
 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
+
 
 if [[ -r $LIBFGCM/grid/dimensions.h ]]