Changeset 5048 for LMDZ6

Timestamp:

Jul 12, 2024, 4:19:11 PM (2 months ago)

Author:

fhourdin

Message:

Comportemnt de makelmdz* quand on compile deja

Location:

LMDZ6/trunk

Files:

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

LMDZ6/trunk/makelmdz

@@ -32 +32 @@
 cosp2=false
 cospv2=false
+force_compile=false
+
 
 full=""
@@ -141 +143 @@
 [-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
@@ -232 +235 @@
       "-arch_path")
           arch_path=$2 ; arch_path_defined="TRUE"; shift ; shift ;;
+
+      "-force_compile")
+          force_compile=true ; shift ;;
 
       *)
@@ -585 +591 @@
 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
-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 "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 with option -force_compile"
+        exit 1
+    fi
+fi
+
 
 cd $LIBFGCM/grid/dimension
 ./makdim $dim
-if (($? != 0))
-then
-    exit 1
-fi
-
 cat $LIBFGCM/grid/dimensions.h
 cd $LMDGCM

LMDZ6/trunk/makelmdz_fcm

@@ -576 +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
+