Changeset 1373 for trunk

Timestamp:

12/14/16 23:39:49 (8 years ago)

Author:

sdipsl

Message:

• add an option to inhibate xios_parser.py behaviour.
• purge_simulation will also remove run.card, Script_Output* and Debug/
• R_IN printed in Script_Output and included in AA_job as comments

Location:

trunk/libIGCM

Files:

• AA_job (modified) (1 diff)
• AA_purge_simulation (modified) (1 diff)
• libIGCM_comp/libIGCM_comp.ksh (modified) (1 diff)
• libIGCM_config/libIGCM_config.ksh (modified) (2 diffs)

trunk/libIGCM/AA_job

@@ -168 +168 @@
 #D- Define input file root directory
 #D- Default=/IGCMG/common/account/of/this/machine
-#D-
+#D- IPSL:   /prodigfs/ipslfs/igcmg/IGCM
+#D- TGCC:   /ccc/work/cont003/igcmg/igcmg/IGCM
+#D- IDRIS:  /workgpfs/rech/psl/rpsl035/IGCM
+#D- OBELIX: /home/orchideeshare/igcmg/IGCM
+#D- OTHER:  /home/${LOGIN}/IGCM
+
+#D- Change below to override the default
 #R_IN=/u/rech/por/rpor111/DATA
 

trunk/libIGCM/AA_purge_simulation

@@ -95 +95 @@
     # Remove dods hardlink
     IGCM_sys_Dods_Rm
+    # Remove run.card
+    rm -f ${SUBMIT_DIR}/run.card
+    # Remove Script_Output
+    rm -f ${SUBMIT_DIR}/Script_Output_*.??????
+    # Remove the Debug directory
+    rm -rf ${SUBMIT_DIR}/Debug
     # Send a message telling we want to purge
     IGCM_debug_sendAMQP_Purge 

trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh

@@ -635 +635 @@
         IGCM_debug_Print 1 "${compname} XIOS XMLs are consistent"
       else
-        IGCM_debug_Print 1 "${compname} XIOS XMLs ARE NOT consistent. Try to fix it:"
-        IGCM_debug_Print 3 "${libIGCM}/libIGCM_post/xios_parser.py -v modify --field ${FieldDef[*]} --file ${FileDef[*]}"
-        ${libIGCM}/libIGCM_post/xios_parser.py -vv modify --field ${FieldDef[*]} --file ${FileDef[*]}
-        [ $? != 0 ] &&  IGCM_debug_Exit "Failed to fix XIOS xml files for ${compname}"
+        IGCM_debug_Print 1 "${compname} XIOS XMLs ARE NOT consistent"
+        if [ X${config_Post_ParserXIOS} = XTRUE ]  ; then
+          IGCM_debug_Print 1 "Try to fix it:"
+          IGCM_debug_Print 3 "${libIGCM}/libIGCM_post/xios_parser.py -v modify --field ${FieldDef[*]} --file ${FileDef[*]}"
+          ${libIGCM}/libIGCM_post/xios_parser.py -vv modify --field ${FieldDef[*]} --file ${FileDef[*]}
+          [ $? != 0 ] &&  IGCM_debug_Exit "Failed to fix XIOS xml files for ${compname}"
+        fi
       fi
     fi

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -151 +151 @@
   if ( [ X${config_Post_AtlasIPSL} = X${NULL_STR} ] || [ X${config_Post_AtlasIPSL} = X ] ) ; then
     config_Post_AtlasIPSL=TRUE
+  fi
+
+  #====================================================
+  # ParserXIOS : apply default value if not defined
+  if ( [ X${config_Post_ParserXIOS} = X${NULL_STR} ] || [ X${config_Post_ParserXIOS} = X ] ) ; then
+    config_Post_ParserXIOS=TRUE
   fi
 
@@ -291 +297 @@
   echo
   IGCM_debug_Print 2 "(Re)Define R_INIT, R_BC and PeriodNb"
+  IGCM_debug_Print 3 "R_IN=${R_IN}"
   IGCM_debug_Print 3 "R_INIT=${R_INIT}"
   R_BC=${config_UserChoices_R_BC:=${R_IN}/BC}