Changeset 592 for branches/libIGCM_MPI_OpenMP/libIGCM_config/libIGCM_config.ksh

Timestamp:

03/22/12 18:02:50 (12 years ago)

Author:

mafoipsl

Message:

Second merge of libIGCM_MPI_OpenMP branch with libIGCM trunk, revision 591.

File:

• branches/libIGCM_MPI_OpenMP/libIGCM_config/libIGCM_config.ksh (modified) (4 diffs)

branches/libIGCM_MPI_OpenMP/libIGCM_config/libIGCM_config.ksh

@@ -61 +61 @@
 
   #==================================
+  # Read UserChoices section: 
   IGCM_card_DefineArrayFromSection ${SUBMIT_DIR}/config.card UserChoices
 
@@ -88 +89 @@
 
   #==================================
-
+  # Read Post section: 
+  IGCM_card_DefineArrayFromSection ${SUBMIT_DIR}/config.card Post
+  echo
+  IGCM_debug_Print 1 "DefineArrayFromOption : config_Post"
+
+  for option in ${config_Post[*]} ; do
+    IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/config.card Post ${option}
+    eval auxprint=\${config_Post_${option}}
+    IGCM_debug_Print 3 "${option} : ${auxprint}"
+  done
+
+  #==================================
+  # Define default value to keep compatibility with previous card: means before changes due to TGCC 
+  [ X${config_Post_PackFrequency} = X ] && config_Post_PackFrequency=${config_Post_RebuildFrequency}
+
+  #==================================
+  # Read ListOfComponents section: 
   IGCM_card_DefineArrayFromSection ${SUBMIT_DIR}/config.card ListOfComponents
   for comp in ${config_ListOfComponents[*]} ; do
@@ -189 +206 @@
     FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' )
     R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName}
+    R_FIGR=${R_FIG}/${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}
   else
     R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName}
+    R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_JobName}
     R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName}
     R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName}
@@ -218 +237 @@
     fi
   fi
-
-  #==================================
-  # Read Post section: 
-  IGCM_card_DefineArrayFromSection ${SUBMIT_DIR}/config.card Post
-
-  echo
-  IGCM_debug_Print 1 "DefineArrayFromOption : config_Post"
-
-  for option in ${config_Post[*]} ; do
-    IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/config.card Post ${option}
-    eval auxprint=\${config_Post_${option}}
-    IGCM_debug_Print 3 "${option} : ${auxprint}"
-  done
-
-  #==================================
-  # Define default value to keep compatibility with previous card: means before changes due to TGCC 
-  [ X${config_Post_PackFrequency} = X ] && config_Post_PackFrequency=${config_Post_RebuildFrequency}
 
   #====================================================