Changeset 1828 for modipsl/trunk/util/model

Timestamp:

07/20/12 11:01:47 (12 years ago)

Author:

jgipsl

Message:

Merged branche modipsl/newdev into modipsl/trunk . Changes are :

• Cleaning up in mod.def. Fewer configurations are now distributed.
• ins_job : Added option for creating job for ensembles and updated use of new configuration v5.
• model :
  • Added coupled configuration IPSLCM5CHS and IPSLCM5CHT.
  • Added option DEFAULT : This option has for purpose to ask the user if he wants to change a component will extracting a configuration. This option is activated by adding DEFAULT in front of component name in mod.def. This option is not used for the moment.

File:

• modipsl/trunk/util/model (modified) (6 diffs)

modipsl/trunk/util/model

@@ -16 +16 @@
 #-
 m_n=""; m_a="checkout"; m_v='silencious'; no_tag='false';
-while getopts :hevH V
+# Option -d to take default set up without asking
+changeok='yes'
+while getopts :hevdH V
   do
     case $V in
@@ -22 +24 @@
       (e)  m_a='checkout';;
       (v)  m_v='verbose';;
+      (d)  changeok='no';;
       (H)  no_tag='true';;
       (:)  echo ${b_n}" : option $OPTARG : missing value" 1>&2;
@@ -178 +181 @@
   echo ' ';
   if [ -z "${m_n}" ]; then
-    echo ${b_n} 'extracts the components of a model';
+    echo ${b_n} ': This script is used to extract one configuration';
     echo ' ';
     echo 'Usage    :';
-    echo ${b_n} '[-h]';
-    echo ${b_n} '[-h] model_name';
-    echo ${b_n} '[-e] [-H] [-v] model_name';
-    echo 'h            : this help';
-    echo 'h model-name : help on model';
-    echo 'e            : extract model';
-    echo 'H            : suppress the tags and take the HEAD version';
-    echo 'v            : verbose mode';
-    echo 'Defaults     : -e';
+    echo './'${b_n} '[-h]';
+    echo './'${b_n} '[-h] ConfName';
+    echo './'${b_n} '[-v] ConfName';
+    echo ''
+    echo 'Arguments :'
+    echo 'ConfName       : name of configuration to be extracted';
+    echo '-h             : this help';
+    echo '-h ConfName    : description of configuration ConfName';
+# Meaningless option    echo '-e                : extract model';
+# Does not work    echo 'H                : suppress the tags and take the HEAD version';
+    echo '-v             : verbose mode';
+#    echo 'd                : extract default components without option to change';
     echo ' ';
-    echo 'model_name in :';
+    echo 'Possible configurations are :';
     qi=0; while (( ${qi} < ${#m_x[@]} ));
       do ((qi=qi+1)); echo ${m_x[${qi}]}; done
@@ -266 +272 @@
     zp=${m_p[${qi}]}; zs=${m_s[${qi}]};
     zd=${m_d[${qi}]}; zl=${m_l[${qi}]};
+
+# Maybe change some information marked with DEFAULT. 
+# Check if key word DEFAULT is used in component name
+    defcomp=$(echo ${zc} | awk -FDEFAULT: '{print $2}')
+    if [ X$defcomp != X ] ; then
+        if [ $changeok == 'yes' ] ; then
+            echo "=> Default component $defcomp can be changed."
+            echo "   Do you want to change this path ? Type new path or return for the above default."
+            read newcomp
+            echo "   Type revision number for chosen component version or return for $zt default value"
+            read newrev
+            if [ X$newcomp == X ] ; then
+                zc=$defcomp
+            else
+                zc=$newcomp
+            fi
+
+            if [ X$newrev != X ] ; then
+                zt=$newrev
+            fi
+        else
+            # changeok=no : Take default value#
+            zc=$defcomp
+        fi
+    fi
     [[ ${m_v} = 'verbose' ]] && \
      { echo '---';
@@ -394 +425 @@
   ( IPSLCM5B )
   ../modeles/UTIL/fait_config IPSLCM5B ;;
-  ( IPSLCM5_v4 )
-  ../modeles/UTIL/fait_config IPSLCM5_v4 ;;
+  ( IPSLCM5_v5 )
+  ../modeles/UTIL/fait_config IPSLCM5_v5 ;;
+  ( IPSLCM5CHS_v5 )
+  ../modeles/UTIL/fait_config IPSLCM5CHS_v5 ;;
+  ( IPSLCM5CHT_v5 )
+  ../modeles/UTIL/fait_config IPSLCM5CHT_v5 ;;
   (IPSLCM5* )
   ../modeles/UTIL/fait_config IPSLCM5 ;;
@@ -401 +436 @@
   ../modeles/UTIL/fait_config IPSL_ESM_v2 ;;
 esac
+
+#--- Create Makefiles using the script ins_make
+#    ins_make will detect target machine among predefined targets in AA_make.gdef and 
+#    create Makefiles to the corresponding target.
+#    ins_make can be re-run afterwards using another target or after editing the 
+#    AA_make.gdef. ins_make will then overwrite Makefiles already created.
+#
+./ins_make
+
 #---
 #- That's all folks