Changeset 7646 for trunk/NEMOGCM/CONFIG/makenemo

Timestamp:

2017-02-06T10:25:03+01:00 (7 years ago)

Author:

timgraham

Message:

Merge of dev_merge_2016 into trunk. UPDATE TO ARCHFILES NEEDED for XIOS2.
LIM_SRC_s/limrhg.F90 to follow in next commit due to change of kind (I'm unable to do it in this commit).
Merged using the following steps:

1) svn merge --reintegrate ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk .
2) Resolve minor conflicts in sette.sh and namelist_cfg for ORCA2LIM3 (due to a change in trunk after branch was created)
3) svn commit
4) svn switch ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
5) svn merge ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2016/dev_merge_2016 .
6) At this stage I checked out a clean copy of the branch to compare against what is about to be committed to the trunk.
6) svn commit #Commit code to the trunk

In this commit I have also reverted a change to Fcheck_archfile.sh which was causing problems on the Paris machine.

File:

• trunk/NEMOGCM/CONFIG/makenemo (modified) (7 diffs)

trunk/NEMOGCM/CONFIG/makenemo

@@ -90 +90 @@
 x_r="";
 x_u="";
+x_a="";
 x_m="";
 x_t="";
@@ -123 +124 @@
 #-
 #- Choice of the options ---
-while getopts :hd:n:r:u:m:j:e:s:v:t:k: V
+while getopts :hd:n:r:u:a:m:j:e:s:v:t:k: V
 do
     case $V in
@@ -142 +143 @@
         echo " -k 0/1       : used cpp keys check (default = 1 -> check activated)";
    echo " -t dir       : temporary directory for compilation"
+   echo " -a dir       : alternative sub-directory for configurations (below CONFIG)"
    echo "";
    echo "Example to install a new configuration MY_CONFIG";
@@ -149 +151 @@
    echo "Available configurations :"; cat ${CONFIG_DIR}/cfg.txt;
    echo "";
-        echo "Available unsupported (external) configurations :"; cat ${CONFIG_DIR}/uspcfg.txt;
+        echo "Available unsupported (external) configurations :"; 
+              if [ -f ${CONFIG_DIR}/uspcfg.txt ] ; then cat ${CONFIG_DIR}/uspcfg.txt; fi;
+   echo "";
+   echo "Example to install an unsupoorted configuration MY_USP";
+   echo "makenemo -n MY_USP -u MY_USP" ;
    echo "";
    echo "Example to remove bad configuration ";
@@ -174 +180 @@
    (r)  x_r=${OPTARG};;
    (u)  x_u=${OPTARG};;
+   (a)  x_a=${OPTARG};;
    (m)  x_m=${OPTARG};;
    (j)  x_j=${OPTARG};;
@@ -223 +230 @@
 
 #-
-#- Go to NEMOGCM/config directory ---
+#- Go to NEMOGCM/CONFIG directory ---
 cd ${CONFIG_DIR}
 
 #-
 #- Initialisation from input ---
+export ALT_DIR=${x_a}
+if [ ! -z $ALT_DIR ]; then
+ if [ -d ${CONFIG_DIR}/${ALT_DIR} ]; then
+   export CONFIG_DIR=${CONFIG_DIR}/${ALT_DIR}
+#-
+#- Go to named subdirectory of the NEMOGCM/CONFIG directory ---
+   cd ${CONFIG_DIR}
+ fi
+fi
 export NEW_CONF=${x_n}
 NBR_PRC=${x_j}
@@ -244 +260 @@
     echo
     echo "Available unsupported (external) configurations :" 
-    cat ${CONFIG_DIR}/uspcfg.txt
+    if [ -f ${CONFIG_DIR}/uspcfg.txt ] ; then cat ${CONFIG_DIR}/uspcfg.txt; fi;
     exit
 fi