Changeset 727 for trunk/libIGCM/AA_TimeSeries_Checker

Timestamp:

10/18/12 11:05:46 (12 years ago)

Author:

sdipsl

Message:

• use IGCM_config_CommonConfiguration

File:

• trunk/libIGCM/AA_TimeSeries_Checker (modified) (2 diffs)

trunk/libIGCM/AA_TimeSeries_Checker

@@ -91 +91 @@
 # First of all
 #
-typeset option
-
+# Read libIGCM compatibility version in config.card
+# Read UserChoices section
+# Read Ensemble section
+# Read Post section
+# Define all netcdf output directories
 #==================================
-# Read UserChoices section: 
-IGCM_card_DefineArrayFromSection       ${CARD_DIR}/config.card UserChoices
-echo
-IGCM_debug_Print 1 "DefineArrayFromOption  : config_UserChoices"
-for option in ${config_UserChoices[*]} ; do
-    IGCM_card_DefineVariableFromOption ${CARD_DIR}/config.card UserChoices ${option}
-    eval auxprint=\${config_UserChoices_${option}}
-    IGCM_debug_Print 3 "${option} : ${auxprint}"
-done
-#
-echo
+IGCM_config_CommonConfiguration ${CARD_DIR}/config.card
 
 #==================================
-# Read Ensemble section: 
-IGCM_card_DefineArrayFromSection       ${CARD_DIR}/config.card Ensemble
-echo
-
-for option in ${config_Ensemble[*]} ; do
-    IGCM_card_DefineVariableFromOption ${CARD_DIR}/config.card Ensemble ${option}
-    eval auxprint=\${config_Ensemble_${option}}
-    IGCM_debug_Print 3 "${option} : ${auxprint}"
-done
-#
-echo
-
-#==================================
-# Read Post section: 
-IGCM_card_DefineArrayFromSection ${CARD_DIR}/config.card Post
-echo
-IGCM_debug_Print 1 "DefineArrayFromOption : config_Post"
-
-for option in ${config_Post[*]} ; do
-  IGCM_card_DefineVariableFromOption ${CARD_DIR}/config.card Post ${option}
-  eval auxprint=\${config_Post_${option}}
-  IGCM_debug_Print 3 "${option} : ${auxprint}"
-done
-#
-echo
+# Read ListOfComponents section:
+IGCM_card_DefineArrayFromSection ${CARD_DIR}/config.card ListOfComponents
 
 if [ -f ${CARD_DIR}/run.card ] ; then
@@ -163 +133 @@
 IGCM_debug_Print 1 "CompletedFlag = "${CompletedFlag}
 echo
-
-#====================================================
-#R_SAVE : Job output directory
-#R_BUFR : Job output buffered directory
-if ( [ ! X${config_UserChoices_SpaceName} = X ] && [ ! X${config_UserChoices_ExperimentName} = X ] ) ; then
-  FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' )
-  if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then
-    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName}
-    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName}
-    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName}
-  else
-    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName}
-    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName}
-    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName}
-  fi
-else
-  if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then
-    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName}
-    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName}
-    R_DODS=${config_UserChoices_TagName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${config_UserChoices_JobName}
-  else
-    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName}
-    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName}
-    R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName}
-  fi
-fi
-
-IGCM_card_DefineArrayFromSection ${CARD_DIR}/config.card ListOfComponents
 
 for comp in ${config_ListOfComponents[*]} ; do