Changeset 2301

Timestamp:

2010-10-21T10:09:17+02:00 (14 years ago)

Author:

flavoni

Message:

improvement of makenemo , see ticket : #740

Location:

branches/nemo_v3_3_beta/NEMOGCM

Files:

• CONFIG/makenemo (modified) (6 diffs)
• TOOLS/COMPILE/Fclean_config.sh (added)
• TOOLS/COMPILE/bldxio.cfg (added)

branches/nemo_v3_3_beta/NEMOGCM/CONFIG/makenemo

@@ -46 +46 @@
 #
 # - TAB         : NEMO subdirectory used (read)  
-# - MAIN_DIR : self explaining
+# - MAIN_DIR    : self explaining
 # - CONFIG_DIR  :   "    "    "   
 # - MODELES_DIR :   "    "    " 
@@ -107 +107 @@
            echo " -h  : help";
            echo " -n name : config name, [-n help] to list existing configurations";
-           echo " -m arch : choose compiler, [-m help] to list exiting compilers";
+           echo " -m arch : choose compiler, [-m help] to list existing compilers";
            echo " -d dir  : choose NEMO sub-directories";
            echo " -r conf : choose reference configuration";
            echo " -j No  : number of processes used to compile (0=nocompilation)";
-           echo " -t dir  : remporary directory for compilation"
+           echo " -t dir  : temporary directory for compilation"
            echo "";
            echo "Example to install a new configuration MY_CONFIG";
@@ -119 +119 @@
                           echo "Available configurations :"; cat ${COMPIL_DIR}/cfg.txt; 
            echo "";
+           echo "Example to remove bad configuration ";
+           echo "./makenemo -n MY_CONFIG clean_config";
+                          echo "";
+           echo "Example to clean ";
+           echo "./makenemo clean";
+                          echo "";
                           . ${COMPIL_DIR}/Flist_archfile.sh  ;
                           echo "";
@@ -137 +143 @@
 shift $(($OPTIND-1));
 
-#-
-#- Get the clean option
-[[ "${#@}" -ne 0 && "${@}" != clean ]] && echo "Invalid option "$@" " && exit
-[ "${#@}" -ne 0 ] && x_c="--$@"
+
+while [ ${#1} -gt 0 ]   # Get clean, clean_config options
+do
+    case "$1" in
+   clean)
+         echo "command $1" 
+      x_c="--$1"
+         ;;
+   clean_config)
+         echo "command $1" 
+      . ${COMPIL_DIR}/Fclean_config.sh
+      exit
+         ;;
+   *)
+         echo "BAD OPTION" 
+      exit
+         ;;
+
+   esac
+shift
+done
 
 #-
@@ -216 +239 @@
 . ${COMPIL_DIR}/Fprep_agrif.sh ${NEW_CONF} ${NEMO_TDIR} || exit
 
+#- and test whether we need to build the ioserver
+export USEBLD=bldxio.cfg
+grep key_iomput ${COMPIL_DIR}/cpp.fcm && export USEBLD=bld.cfg
+
 #-
 #_ END OF CONFIGURATION PHASE
@@ -228 +255 @@
    #if AGRIF we do a first preprocessing
    if [ ${#x_c} -eq 0 ]; then
-      [ "$AGRIFUSE" == 1 ] && fcm build --ignore-lock -s 2 ${COMPIL_DIR}/bld.cfg 
+      [ "$AGRIFUSE" == 1 ] && fcm build --ignore-lock -s 2 ${COMPIL_DIR}/$USEBLD 
       [ "$AGRIFUSE" == 1 ] && rm -rf  ${NEMO_TDIR}/${NEW_CONF}/BLD/*
    fi
-   fcm build ${x_c} --ignore-lock -v 1 -j ${NBR_PRC} ${COMPIL_DIR}/bld.cfg || cd -
+   fcm build ${x_c} --ignore-lock -v 1 -j ${NBR_PRC} ${COMPIL_DIR}/$USEBLD || cd -
    [ -f ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/nemo.exe ] && ln -sf ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/nemo.exe  ${CONFIG_DIR}/${NEW_CONF}/EXP00/opa
    [ -f ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/server.exe ] && ln -sf ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/server.exe  ${CONFIG_DIR}/${NEW_CONF}/EXP00/server.exe
+
+   #add remove for clean option
+   if  [ ${#x_c} -ne 0 ]; then
+   echo "cleaning ${NEW_CONF} WORK, BLD"
+   rm -rf ${NEMO_TDIR}/${NEW_CONF}/WORK
+   rm -rf ${NEMO_TDIR}/${NEW_CONF}/BLD
+   rm -rf ${NEMO_TDIR}/${NEW_CONF}/EXP00/opa
+   rm -rf ${NEMO_TDIR}/${NEW_CONF}/EXP00/server.exe
+  fi
+      
 fi