Changeset 4368 for LMDZ6/branches/Ocean_skin/build_gcm

Timestamp:

Dec 6, 2022, 12:01:16 AM (2 years ago)

Author:

lguez

Message:

Sync latest trunk changes to Ocean_skin

Location:

LMDZ6/branches/Ocean_skin

Files:

• . (modified) (1 prop)
• build_gcm (modified) (2 diffs)

LMDZ6/branches/Ocean_skin/build_gcm

@@ -5 +5 @@
 # the full path to where the 'fcm' command is to be found
 
-if test -f '.lock' 
-  then
-    echo 'ATTENTION: vous etes sans doute en train de compiler le modele par ailleurs'
-    echo "Attendez que la premiere compilation soit terminee pour relancer la suivante."
-    echo "Si vous etes sur que vous ne compilez pas le modele par ailleurs,"
-    echo "vous pouvez continuer en repondant oui."
-    echo "Voulez-vous vraiment continuer?"
-    echo ""
+if [[ -f '.lock' && $force_compile == false ]]
+then
     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, just answer "
-    echo "yes (or 'oui') to the question below to proceed."
-    echo "Do you wish to continue?"
-    read ouinon
-    if [[ $ouinon == "oui" || $ouinon == "yes" ]] 
-        then
-        echo OK 
-    else
-        exit
-    fi
-else
-    echo "compiling..." > '.lock'
+    echo "If you are sure that you are not compiling elsewhere,"
+    echo "run makelmdz_fcm with option -force_compile"
+    exit 1
 fi
+
+echo "compiling..." > '.lock'
 
 job=1
@@ -46 +33 @@
 ${dirname}fcm build $*
 
-err=$?
-# Check error message from fcm build
-if [ $err != 0 ] ; then
-  # ERROR IN COMPILING
-  echo ERROR IN COMPILING LMDZ : $err
-  exit 1
-fi
+build_command_status=$?
 
 # cleanup
 \rm -f '.lock' 
 
+exit $build_command_status
+