Changeset 2084

Timestamp:

Jul 9, 2014, 5:11:19 PM (10 years ago)

Author:

Ehouarn Millour

Message:

Small cosmetic change in makelmdz_fcm, use an empty dir strategy for optional packages rather than overwriting the bld.cfg file (causes issues when the later is a symbolic link).
EM

Location:

LMDZ5/trunk

Files:

• bld.cfg (modified) (1 diff)
• makelmdz_fcm (modified) (5 diffs)

LMDZ5/trunk/bld.cfg

@@ -24 +24 @@
 src::dyn     %SRC_PATH/%DYN
 src::phys    %SRC_PATH/%PHYS
-#src::sisvat  %SRC_PATH/%PHYS/sisvat
-#src::rrtm  %SRC_PATH/%PHYS/rrtm
+src::sisvat  %SISVAT
+src::rrtm    %RRTM
 src::grid    %SRC_PATH/grid
 src::filtrez %SRC_PATH/filtrez

LMDZ5/trunk/makelmdz_fcm

@@ -37 +37 @@
 LIBOGCM=$LMDGCM/libo
 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
 fcm_path=$LMDGCM/tools/fcm/bin
@@ -304 +307 @@
 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"
 fi
 
@@ -311 +313 @@
 then
    CPP_KEY="$CPP_KEY CPP_RRTM"
-   sed -e 's/^#src::rrtm/src::rrtm/' bld.cfg > bld.tmp
-   mv bld.tmp bld.cfg
+   RRTM_PATH="$LIBFGCM/%PHYS/rrtm"
 fi
 
@@ -492 +493 @@
 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 "%CPP_KEY       $CPP_KEY"       >> $config_fcm
@@ -520 +523 @@
 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
-
-#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 ]]