Changeset 5202 for LMDZ6/branches/cirrus/makelmdz_fcm

Timestamp:

Sep 20, 2024, 12:32:04 PM (7 weeks ago)

Author:

Laurent Fairhead

Message:

Updating cirrus branch to trunk revision 5171

Location:

LMDZ6/branches/cirrus

Files:

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

LMDZ6/branches/cirrus/makelmdz_fcm

@@ -474 +474 @@
 then
    CPP_KEY="$CPP_KEY CPP_INLANDSIS"
-   INLANDSIS_PATH="$LIBFGCM/%PHYS/inlandsis"
-fi
-
+   INLANDSIS_PATH="$LIBFGCM/phy${physique}/inlandsis"
+fi
 
 if [[ "$rad" == "rrtm" ]]
 then
    CPP_KEY="$CPP_KEY CPP_RRTM"
-   RAD_PATH="$LIBFGCM/%PHYS/rrtm"
+   RAD_PATH="$LIBFGCM/phy${physique}/rrtm"
 fi
 if [[ "$rad" == "ecrad" ]]
 then
    CPP_KEY="$CPP_KEY CPP_ECRAD"
-   RAD_PATH="$LIBFGCM/%PHYS/ecrad"
+   RAD_PATH="$LIBFGCM/phy${physique}/ecrad"
 fi
 
@@ -492 +491 @@
 then
    CPP_KEY="$CPP_KEY CPP_Dust"
-   DUST_PATH="$LIBFGCM/%PHYS/Dust"
+   DUST_PATH="$LIBFGCM/phy${physique}/Dust"
 fi
 
@@ -498 +497 @@
 then
    CPP_KEY="$CPP_KEY CPP_StratAer"
-   STRATAER_PATH="$LIBFGCM/%PHYS/StratAer"
+   STRATAER_PATH="$LIBFGCM/phy${physique}/StratAer"
 fi
 
@@ -577 +576 @@
     if [[ $force_compile == true ]]
     then
-        \rm -f $LIBFGCM/grid/dimensions.h
+        \rm -f $LIBFGCM/grid/dimensions.h
     else
-        echo "WARNING: you are probably already compiling the model somewhere else."
-        echo "Wait until the first compilation is finished before launching this one."
-        echo "If you are sure that you are not compiling elsewhere, "
-        echo "run makelmdz_fcm with option -force_compile"
-        exit 1
+        echo "WARNING: you are probably already compiling the model somewhere else."
+        echo "Wait until the first compilation is finished before launching this one."
+        echo "If you are sure that you are not compiling elsewhere, "
+        echo "If you are sure that you are not compiling elsewhere, then"
+        echo rm -f $LIBFGCM/grid/dimensions.h
+        echo "before reruning the compilation"
+        echo "or run makelmdz_fcm with option -force_compile"
+        exit 1
     fi
 fi
+