Changeset 4096

Timestamp:

Mar 14, 2022, 4:28:13 PM (3 years ago)

Author:

lguez

Message:

Add option -force_compile to makelmdz_fcm

Instead of asking the user to answer a question interactively, stop
makelmdz_fcm and inform of the possible use of option
-force_compile. The interactive question risked being hidden in
redirection of standard output.

Location:

LMDZ6/trunk

Files:

• build_gcm (modified) (1 diff)
• makelmdz_fcm (modified) (4 diffs)

LMDZ6/trunk/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

LMDZ6/trunk/makelmdz_fcm

@@ -44 +44 @@
 diagiso=false
 isotrac=false
+force_compile=false
 
 arch_defined="FALSE"
@@ -127 +128 @@
 [-ext_src path]            : path to an additional set of routines to compile with the model
 [-arch_path path]          : path to architecture files (default: $arch_default_path)
+[-force_compile]           : recompile although there seems to be an on-going compilation
  -arch nom_arch            : target architecture 
  exec                      : executable to build
@@ -242 +244 @@
       "-arch_path")
           arch_path=$2 ; arch_path_defined="TRUE"; shift ; shift ;;
+
+      "-force_compile")
+          force_compile=true ; shift ;;
 
       *)
@@ -551 +556 @@
 if [[ -f dimensions.h ]]
 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 ""
-  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 reponse
-  if [[ $reponse == "oui" || $reponse == "yes" ]]
-  then
-    \rm -f $LIBFGCM/grid/dimensions.h
-  else
-    exit
-  fi
+    if [[ $force_compile == true ]]
+    then
+        \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
+    fi
 fi