Changeset 3499 for trunk

Timestamp:

Nov 8, 2024, 10:55:50 AM (13 days ago)

Author:

afalco

Message:

libphy compilation: fixed a few pathes for compilation with dynamico & others.
Removing lock when fail.
Allows for user to re-run compilation without the warning "ATTENTION... you might be already compiling"
AF

Location:

trunk/LMDZ.COMMON

Files:

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

trunk/LMDZ.COMMON/build_gcm

@@ -44 +44 @@
 
 # run "fcm build" command
-${dirname}fcm build $*
+${dirname}fcm build $* || (exit 1)
 if [ $? != 0 ]; then # check if fcm command worked
-    exit 1
+  echo "Removing .lock"
+  \rm -f '.lock'
+  exit 1
 fi
 

trunk/LMDZ.COMMON/makelmdz_fcm

@@ -682 +682 @@
 ######################################################################
 
-
-SUFF_NAME=_${dim_full}
+if [[ $libphy != "true" ]];then
+  SUFF_NAME=_${dim_full}
+fi
 SUFF_NAME=${SUFF_NAME}_phy${physique}
 
@@ -731 +732 @@
   SUFF_NAME=${SUFF_NAME}_inca
 fi
-SUFF_DIR=
+SUFF_DEBUG=
 if [[ "$compil_mod" == "debug" ]]
 then
-  SUFF_DIR=_debug
-fi
-SUFF_DIR=${SUFF_NAME}
+  SUFF_DEBUG=_debug
+fi
+SUFF_DIR=${SUFF_NAME}${SUFF_DEBUG}
 
 if [[ $libphy == "true" ]]
@@ -749 +750 @@
   code=""
   SUFF_NAME=""
+  # SUFF_DIR=
 else
   SUFF_NAME=${SUFF_NAME}.e
@@ -803 +805 @@
 # cleanup before compiling
 if [[ $libphy != "true" ]]; then
-    rm -f bin/${code}${SUFF_NAME}
-fi
-rm -f $LIBOGCM/${arch}${SUFF_NAME}/.config/fcm.bld.lock
-./build_gcm ${fcm_path} -j $job $full
-if [ $? != 0 ]; then # check if fcm command worked
-    exit 1
-fi
+  rm -f bin/${code}${SUFF_NAME}
+fi
+rm -f $LIBOGCM/${arch}${SUFF_DIR}/.config/fcm.bld.lock
+
+function delete_dim_h {
+  if [[ -r $LIBFGCM/grid/dimensions.h ]];then
+    echo "Removing dimensions.h"
+    \rm -f $LIBFGCM/grid/dimensions.h
+  fi
+}
+
+./build_gcm ${fcm_path} -j $job $full || (echo "Build gcm failed."; delete_dim_h; exit 1)
 
 rm -rf tmp_src
 rm -rf config
-ln -s $LIBOGCM/${arch}${SUFF_NAME}/.config config
-ln -s $LIBOGCM/${arch}${SUFF_NAME}/.config/ppsrc tmp_src
-
-
-if [[ -r $LIBFGCM/grid/dimensions.h ]]
-then
-  # Cleanup: remove dimension.h file
-  \rm -f $LIBFGCM/grid/dimensions.h
-fi
+ln -s $LIBOGCM/${arch}${SUFF_DIR}/.config config
+ln -s $LIBOGCM/${arch}${SUFF_DIR}/.config/ppsrc tmp_src
+
+delete_dim_h