Changeset 3201 for branches/2011/dev_NEMO_MERGE_2011

Timestamp:

2011-12-07T16:07:49+01:00 (12 years ago)

Author:

rblod

Message:

Final (?) commit for ticket #894

Location:

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG

Files:

• cfg.txt (copied) (copied from branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/TOOLS/COMPILE/cfg.txt) (2 diffs)
• makenemo (modified) (3 diffs)

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/cfg.txt

@@ -2 +2 @@
 GYRE_LOBSTER OPA_SRC TOP_SRC
 ORCA2_LIM3 OPA_SRC LIM_SRC_3
-ORCA2_LIM OPA_SRC LIM_SRC_2 NST_SRC
 POMME OPA_SRC NST_SRC
 AMM12 OPA_SRC
@@ -8 +7 @@
 ORCA2_OFF_PISCES OPA_SRC OFF_SRC TOP_SRC
 AMM12_PISCES OPA_SRC TOP_SRC
+ORCA2_LIM OPA_SRC LIM_SRC_2 NST_SRC

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/CONFIG/makenemo

@@ -77 +77 @@
 #-
 
-#- Local variables ---
-b_n=$(basename ${0})
-OPTIND=1
-MAIN_DIR=$(cd $(dirname "$0"); pwd)
-MAIN_DIR=${MAIN_DIR%/SETTE*}
-MAIN_DIR=${MAIN_DIR%/TOOLS*}
-MAIN_DIR=${MAIN_DIR%/CONFIG*}
-export MAIN_DIR
-#
-export CONFIG_DIR=${MAIN_DIR}/CONFIG
-export TOOLS_DIR=${MAIN_DIR}/TOOLS
-export COMPIL_DIR=${MAIN_DIR}/TOOLS/COMPILE
-export NEMO_DIR=${MAIN_DIR}/${x_s}
-export AGRIFUSE=10
-
-declare -a TAB
-#-
-#- FCM and functions location ---
-export PATH=${MAIN_DIR}/EXTERNAL/fcm/bin:$PATH
-
-#-
-#- Choice of the options ---
+#-
+#- Initialization of the options ---
 x_d="";
 x_h="";
@@ -110 +90 @@
 x_s=NEMO;
 x_v=1;
+
+#- Local variables ---
+b_n=$(basename ${0})
+OPTIND=1
+MAIN_DIR=$(cd $(dirname "$0"); pwd)
+MAIN_DIR=${MAIN_DIR%/SETTE*}
+MAIN_DIR=${MAIN_DIR%/TOOLS*}
+MAIN_DIR=${MAIN_DIR%/CONFIG*}
+export MAIN_DIR
+#
+export CONFIG_DIR=${MAIN_DIR}/CONFIG
+export TOOLS_DIR=${MAIN_DIR}/TOOLS
+export COMPIL_DIR=${MAIN_DIR}/TOOLS/COMPILE
+export NEMO_DIR=${MAIN_DIR}/${x_s}
+export AGRIFUSE=10
+declare -a TAB
+#-
+#- FCM and functions location ---
+export PATH=${MAIN_DIR}/EXTERNAL/fcm/bin:$PATH
+
+#-
+#- Choice of the options ---
 while getopts :hd:n:r:m:j:e:s:v:t: V
 do
@@ -122 +124 @@
    echo " -d dir       : choose NEMO sub-directories";
    echo " -r conf      : choose reference configuration";
-    echo " -s Path      : choose alternative location for NEMO main directory";
-    echo " -e Path      : choose alternative location for MY_SRC directory";
-    echo " -j No        : number of processes used to compile (0=nocompilation)";
-    echo " -v No        : set verbosity level for compilation [0-3]";
+        echo " -s Path      : choose alternative location for NEMO main directory";
+        echo " -e Path      : choose alternative location for MY_SRC directory";
+        echo " -j No        : number of processes used to compile (0=nocompilation)";
+        echo " -v No        : set verbosity level for compilation [0-3]";
    echo " -t dir       : temporary directory for compilation"
    echo "";