Changeset 727 for trunk/libIGCM/AA_pack_output

Timestamp:

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

Author:

sdipsl

Message:

• use IGCM_config_CommonConfiguration

File:

• trunk/libIGCM/AA_pack_output (modified) (1 diff)

trunk/libIGCM/AA_pack_output

@@ -220 +220 @@
 fi
 
-#====================================================
+#==================================
 # First of all
 #
-# Read config.card
-
-IGCM_card_DefineArrayFromSection     ${CARD_DIR}/config.card UserChoices
-typeset option
-for option in ${config_UserChoices[*]} ; do
-  IGCM_card_DefineVariableFromOption ${CARD_DIR}/config.card UserChoices ${option}
-done
+# Read libIGCM compatibility version in config.card
+# Read UserChoices section
+# Read Ensemble section
+# Read Post section
+# Define all netcdf output directories
+#==================================
+IGCM_config_CommonConfiguration ${CARD_DIR}/config.card
+
+#==================================
+# Read ListOfComponents section
+# to drive the loop over find
+IGCM_card_DefineArrayFromSection ${CARD_DIR}/config.card ListOfComponents
 #
-IGCM_card_DefineArrayFromSection     ${CARD_DIR}/config.card Ensemble
-typeset option
-for option in ${config_Ensemble[*]} ; do
-  IGCM_card_DefineVariableFromOption ${CARD_DIR}/config.card Ensemble ${option}
-done
-#
-echo
-IGCM_debug_Print 1 "DefineArrayFromOption  : config_UserChoices"
-IGCM_debug_PrintVariables 3 config_UserChoices_JobName
-IGCM_debug_PrintVariables 3 config_UserChoices_LongName
-IGCM_debug_PrintVariables 3 config_UserChoices_TagName
-IGCM_debug_PrintVariables 3 config_UserChoices_SpaceName
-IGCM_debug_PrintVariables 3 config_UserChoices_ExperimentName
-IGCM_debug_PrintVariables 3 config_UserChoices_CalendarType
-IGCM_debug_PrintVariables 3 config_UserChoices_DateBegin
-IGCM_debug_PrintVariables 3 config_UserChoices_DateEnd
-IGCM_debug_PrintVariables 3 config_UserChoices_PeriodLength
-IGCM_debug_PrintVariables 3 config_Ensemble_EnsembleName
-IGCM_debug_PrintVariables 3 config_Ensemble_EnsembleDate
-echo
-
-# Get ListOfComponents to drive the loop over find
-IGCM_card_DefineArrayFromSection ${CARD_DIR}/config.card ListOfComponents
-
-#====================================================
-#R_SAVE : Job output storage 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}
-  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}
-  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}
-  else
-    R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName}
-    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName}
-  fi
-fi
 IGCM_sys_TestDirArchive ${R_SAVE}
 [ $? != 0 ] && IGCM_debug_Exit "IGCM_sys_TestDirArchive"