Changeset 1338 for trunk/libIGCM/libIGCM_comp

Timestamp:

08/16/16 18:08:36 (8 years ago)

Author:

sdipsl

Message:

Call xios_parser.py and ensure field_compname.xml file and file_def_*_companme.xml are coherent. See #256

File:

• trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh (modified) (3 diffs)

trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh

@@ -256 +256 @@
 
 #=======================================================================
+function IGCM_comp_PrepareXiosFiles
+{
+  IGCM_debug_PushStack "IGCM_comp_PrepareXiosFiles" $@
+
+  typeset file
+  [ X${2} != X. ] && file=$( basename ${2} ) || file=$( basename ${1} )
+
+  if [ $( echo ${file} | grep "^field_def_" | wc -l ) = 1 ] ; then
+    eval FieldDef[${#FieldDef[@]}]=${file} > /dev/null 2>&1
+  fi
+  if [ $( echo ${file} | grep "^file_def_" | wc -l ) = 1 ] ; then
+    eval FileDef[${#FileDef[@]}]=${file} > /dev/null 2>&1
+  fi
+  
+  IGCM_debug_PopStack "IGCM_comp_PrepareXiosFiles"
+}
+
+#=======================================================================
 function IGCM_comp_GetInputInitialStateFiles
 {
@@ -578 +596 @@
     eval comptagname=\${config_ListOfComponents_${comp}[1]} > /dev/null 2>&1
 
+    # Initialize array hosting file_def and field_def files to check and/or modify
+    unset FieldDef
+    unset FileDef
+
     # Debug Print :
     IGCM_debug_Print 3 "Parameters ${compname}"
@@ -600 +622 @@
         IGCM_sys_Cp ${file_in} ${file_out}
         IGCM_comp_PrepareDeletedFiles ${file_in} ${file_out}
+        IGCM_comp_PrepareXiosFiles    ${file_in} ${file_out}
 
         (( i=i+2 ))
       done
+    fi
+
+    if [ ${#FileDef[@]} -ne 0 ] ; then
+      # Check XMLs coherency now
+      ${libIGCM}/libIGCM_post/xios_parser.py check --field ${FieldDef} --file ${FileDef}
+      if [ $? = 0 ] ; then
+        IGCM_debug_Print 3 "${compname} XIOS XMLs are consistent"
+      else
+        IGCM_debug_Print 3 "${compname} XIOS XMLs ARE NOT consistent"
+        ${libIGCM}/libIGCM_post/xios_parser.py -v modify --field ${FieldDef} --file ${FileDef}
+        [ $? != 0] &&  IGCM_debug_Exit "Failed to fix XIOS xml files for ${compname}"
+      fi
     fi
   done