Changeset 1300 for trunk/LMDZ.COMMON/makelmdz_fcm

Timestamp:

Jun 25, 2014, 1:19:59 PM (10 years ago)

Author:

emillour

Message:

Common dynamics:
Some updates to keep up with LMDZ5 Earth model evolution (up to LMDZ5 rev 1955).
Main change is the introduction of a "dyn3d_common" directory
to store files common to dyn3d and dyn3dpar.
See file "DOC/chantiers/commit_importants.log" for detailed list
of changes. These changes do not change results on test cases.
EM

File:

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

trunk/LMDZ.COMMON/makelmdz_fcm

@@ -22 +22 @@
 couple=false
 veget=false
+sisvat=false
 chimie=false
 chemistry=false
@@ -134 +135 @@
           veget="$2" ; shift ; shift ;;
 
+      "-sisvat")
+          sisvat="$2" ; shift ; shift ;;
+
       "-chimie")
           chimie="$2" ; shift ; shift ;;
@@ -287 +291 @@
    fi
    if [[ "$veget" == "orchidee2.0" ]] ; then
-      orch_libs=orchidee
+      orch_libs="sechiba parameters stomate parallel orglob orchidee"
    else
       orch_libs="sechiba parameters stomate parallel orglob"
@@ -303 +307 @@
 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
@@ -308 +319 @@
    INCLUDE="$INCLUDE -I${IOIPSL_INCDIR}"
    LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl"
+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
 
@@ -549 +566 @@
 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