Changeset 1755 for LMDZ5/trunk/makelmdz_fcm

Timestamp:

May 15, 2013, 3:00:59 PM (11 years ago)

Author:

Ehouarn Millour

Message:

Updates wich had been made on 'testing' branch (r1752) instead of trunk:
Add better handling of fcm path from makelmdz_fcm script to build_gcm script; and some translation of output messages to English.
EM

File:

• LMDZ5/trunk/makelmdz_fcm (modified) (3 diffs)

LMDZ5/trunk/makelmdz_fcm

@@ -158 +158 @@
 
 ###############################################################
-# mettre le chemin du fcm dans le path
+# path to fcm 
 ###############################################################
-export PATH=${fcm_path}:${PATH}
-
-echo "Chemin du fcm utlise :" 
-which fcm
+# handle case when provided path to fcm was given as a relative
+# path (from makelmdz_fcm script directory) and not an absolute path
+if [[ ${fcm_path:0:1} != "/" ]] ; then
+  # prepend with makelmdz_fcm location
+  fcm_path=$(cd $(dirname $0) ; pwd)"/"${fcm_path}
+fi
+
+echo "Path to fcm:"
+echo ${fcm_path}
 
 ###############################################################
@@ -291 +296 @@
   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" ]]
+  if [[ $reponse == "oui" || $reponse == "yes" ]]
   then
     \rm -f $LIBFGCM/grid/dimensions.h
@@ -433 +444 @@
 
 rm -f $LIBOGCM/${arch}${SUFF_NAME}/.config/fcm.bld.lock
-./build_gcm
+./build_gcm ${fcm_path}
 
 rm -rf tmp_src