Changeset 592 for branches/libIGCM_MPI_OpenMP/AA_monitoring

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/AA_monitoring (modified) (2 diffs)

branches/libIGCM_MPI_OpenMP/AA_monitoring

@@ -231 +231 @@
     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}
 fi
+
+IGCM_sys_MkdirArchive ${R_FIGR}
 #
-IGCM_sys_TestDirArchive ${R_SAVE}/MONITORING
+IGCM_sys_TestDirArchive ${R_FIGR}/MONITORING
 if [ $? = 0 ] ; then
     IGCM_debug_Print 1 "Get MONITORING directory from archive"
-    IGCM_sys_Get_Dir ${R_SAVE}/MONITORING ${RUN_DIR}
+    IGCM_sys_Get_Dir ${R_FIGR}/MONITORING ${RUN_DIR}
 else
     IGCM_debug_Print 1 "MONITORING first pass. Nothing has been done before"
@@ -292 +296 @@
 
 # Save files
-IGCM_sys_Put_Dir MONITORING ${R_SAVE}
+IGCM_sys_Put_Dir MONITORING ${R_FIGR}
 
 # Dods copy
 IGCM_sys_Put_Dods MONITORING
 
-# Clean RUN_DIR_PATH (necessary for cesium)
+# Clean RUN_DIR_PATH (necessary for cesium and titane only)
 IGCM_sys_RmRunDir -Rf ${RUN_DIR_PATH}