Changeset 7646 for trunk/NEMOGCM/SETTE/all_functions.sh

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/SETTE/all_functions.sh (modified) (6 diffs)

trunk/NEMOGCM/SETTE/all_functions.sh

@@ -12 +12 @@
 ######################################################
 #set -x
-set -o posix
+#set -o posix
 #set -u
 #set -e
@@ -197 +197 @@
     cd ${CONFIG_DIR}
     cd ../
-    REVISION_NB=`svn info | grep -i "Revision:" | sed -e "s/ //" | cut -d ":" -f 2`
+    REVISION_NB=`svn info | grep -i "Last Changed Rev:" | sed -e "s/ //g" | cut -d ":" -f 2`
     if [ ${#REVISION_NB} -eq 0 ]
     then
@@ -256 +256 @@
 #   set_xio_using_server iodef.xml true
 #   set_xio_buffer_size  iodef.xml 50000000
+#   set_xio_field_defs   iodef.xml
 #
 #############################################################
@@ -262 +263 @@
 usage3=" Usage : set_xio_using_server input_iodef.xml true||false"
 usage4=" Usage : set_xio_buffer_size input_iodef.xml int_buffer_size"
+usage5=" Usage : set_xio_field_defs input_iodef.xml"
 
 set_xio_file_type () {
@@ -333 +335 @@
         echo "################" >> ${SETTE_DIR}/output.sette
 
-        VAR_NAME=$( grep "^.*<.*variable id.*=.*using_server.*=.*boolean" ${EXE_DIR}/$1 | sed -e "s% *\!.*%%" )
+        VAR_NAME=$( grep "^.*<.*variable id.*=.*using_server.*=.*bool" ${EXE_DIR}/$1 | sed -e "s% *\!.*%%" )
         if [ ${#VAR_NAME} -eq 0 ]
         then
                 echo "doing \"set_xio_using_server $@\". "
-                echo "xml_tag: "variable id=using_server" with variable: boolean is empty"
+                echo "xml_tag: "variable id=using_server" with variable: bool is empty"
                 echo "confirm that an appropriate variable id is in \"${EXE_DIR}/$1\" "
                 echo "exit"
@@ -394 +396 @@
 }
 
+set_xio_field_defs () {
+        minargcount=1
+        if [ ${#} -lt ${minargcount} ]
+        then
+                echo "not enough arguments for set_xio_field_defs"
+                echo "${usage5}"
+                exit 1
+        fi
+        unset minargcount
+        if [  ! -f ${SETTE_DIR}/output.sette ] ; then
+                touch ${SETTE_DIR}/output.sette
+        fi
+
+        echo "executing script : set_xio_field_defs $@" >> ${SETTE_DIR}/output.sette
+        echo "################" >> ${SETTE_DIR}/output.sette
+
+
+        [ -f ${EXE_DIR}/field_def_nemo-opa.xml ] || sed -i '/field_def_nemo-opa/d' $1
+        [ -f ${EXE_DIR}/field_def_nemo-lim.xml ] || sed -i '/field_def_nemo-lim/d' $1
+        [ -f ${EXE_DIR}/field_def_nemo-pisces.xml ] || sed -i '/field_def_nemo-pisces/d' $1
+
+        echo "finished script : set_xio_field_defs $@" >> ${SETTE_DIR}/output.sette
+        echo "++++++++++++++++" >> ${SETTE_DIR}/output.sette
+        echo "                " >> ${SETTE_DIR}/output.sette
+}