Changeset 1910 for LMDZ5/branches/testing/makelmdz_fcm

Timestamp:

Nov 29, 2013, 9:40:25 AM (11 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r1860:1909 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (2 props)
• makelmdz_fcm (modified) (5 diffs, 1 prop)

LMDZ5/branches/testing/makelmdz_fcm

@@ -22 +22 @@
 couple=false
 veget=false
+sisvat=false
 chimie=false
 parallel=none
@@ -117 +118 @@
           veget="$2" ; shift ; shift ;;
 
+      "-sisvat")
+          sisvat="$2" ; shift ; shift ;;
+
       "-chimie")
           chimie="$2" ; shift ; shift ;;
@@ -284 +288 @@
 fi
 
+if [[ "$sisvat" == "true" ]]
+then
+   CPP_KEY="$CPP_KEY CPP_SISVAT"
+   sed -e 's/^#src::sisvat/src::sisvat/' bld.cfg > bld.tmp
+   mv bld.tmp bld.cfg
+fi
+
 if [[ $io == ioipsl ]]
 then
@@ -289 +300 @@
    INCLUDE="$INCLUDE -I${IOIPSL_INCDIR}"
    LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl"
-fi
+elif [[ $io == xios ]]
+then
+   # For now, xios implies also using ioipsl
+   CPP_KEY="$CPP_KEY CPP_IOIPSL CPP_XIOS"
+   INCLUDE="$INCLUDE -I${IOIPSL_INCDIR} -I${XIOS_INCDIR}"
+   LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl -L${XIOS_LIBDIR} -l${LIBPREFIX}stdc++ -l${LIBPREFIX}xios"
+fi
+
 if [[ "$cosp" == "true" ]]
 then
@@ -482 +500 @@
 ln -s $LIBOGCM/${arch}${SUFF_NAME}/.config/tmp tmp_src
 
+#eventual cleanup for SISVAT
+sed -e 's/^src::sisvat/#src::sisvat/' bld.cfg > bld.tmp
+mv bld.tmp bld.cfg
+
+
 if [[ -r $LIBFGCM/grid/dimensions.h ]]
 then