Changeset 658 for trunk/libIGCM/AA_pack_output

Timestamp:

04/18/12 17:00:47 (12 years ago)

Author:

labetoulle

Message:

Add Ensemble functionality to libIGCM - First step :
modify output directories according to an option in section [Ensemble]
in config.card (modification of config.card yet to be done).

File:

• trunk/libIGCM/AA_pack_output (modified) (3 diffs)

trunk/libIGCM/AA_pack_output

@@ -225 +225 @@
 done
 #
+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"
@@ -236 +242 @@
 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
 
@@ -247 +255 @@
 if ( [ ! X${config_UserChoices_SpaceName} = X ] && [ ! X${config_UserChoices_ExperimentName} = X ] ) ; then
   FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' )
-  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}
+  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
-  R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName}
-  R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName}
+  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}