Changeset 903

Timestamp:

08/08/13 11:06:18 (11 years ago)

Author:

sdipsl

Message:

• Dods copy is controled by an option in config.card/[Post]. See #150

Location:

trunk/libIGCM

Files:

• AA_atlas_LMDZ (modified) (1 diff)
• AA_atlas_ORCA_LIM (modified) (1 diff)
• AA_atlas_ORCHIDEE (modified) (1 diff)
• AA_atlas_PISCES (modified) (1 diff)
• AA_create_multi_se (modified) (1 diff)
• AA_create_se (modified) (1 diff)
• AA_create_ts (modified) (3 diffs)
• AA_monitoring (modified) (1 diff)
• libIGCM_config/libIGCM_config.ksh (modified) (1 diff)

trunk/libIGCM/AA_atlas_LMDZ

@@ -162 +162 @@
 
 # DODS copy
-IGCM_sys_TestDirArchive ${R_FIGR}/${R_ATLAS}
-[ $? = 0 ] && IGCM_sys_Put_Dods ${R_ATLAS}
-
+if [ X${config_Post_DodsCopy} = XTRUE ]  ; then
+  IGCM_sys_TestDirArchive ${R_FIGR}/${R_ATLAS}
+  [ $? = 0 ] && IGCM_sys_Put_Dods ${R_ATLAS}
+fi
 # Clean RUN_DIR_PATH (necessary for cesium and titane only)
 IGCM_sys_RmRunDir -Rf ${RUN_DIR_PATH}

trunk/libIGCM/AA_atlas_ORCA_LIM

@@ -205 +205 @@
 
 # DODS copy
-IGCM_sys_TestDirArchive ${R_FIGR}/${R_ATLAS}
-[ $? = 0 ] && IGCM_sys_Put_Dods ${R_ATLAS}
+if [ X${config_Post_DodsCopy} = XTRUE ]  ; then
+  IGCM_sys_TestDirArchive ${R_FIGR}/${R_ATLAS}
+  [ $? = 0 ] && IGCM_sys_Put_Dods ${R_ATLAS}
+fi
 
 # Clean RUN_DIR_PATH (necessary for cesium and titane only)

trunk/libIGCM/AA_atlas_ORCHIDEE

@@ -169 +169 @@
 
 # DODS copy
-IGCM_sys_TestDirArchive ${R_FIGR}/${R_ATLAS}
-[ $? = 0 ] && IGCM_sys_Put_Dods ${R_ATLAS}
+if [ X${config_Post_DodsCopy} = XTRUE ]  ; then
+  IGCM_sys_TestDirArchive ${R_FIGR}/${R_ATLAS}
+  [ $? = 0 ] && IGCM_sys_Put_Dods ${R_ATLAS}
+fi
 
 # Clean RUN_DIR_PATH (necessary for cesium and titane only)

trunk/libIGCM/AA_atlas_PISCES

@@ -167 +167 @@
 
 # DODS copy
-IGCM_sys_TestDirArchive ${R_FIGR}/${R_ATLAS}
-[ $? = 0 ] && IGCM_sys_Put_Dods ${R_ATLAS}
+if [ X${config_Post_DodsCopy} = XTRUE ]  ; then
+  IGCM_sys_TestDirArchive ${R_FIGR}/${R_ATLAS}
+  [ $? = 0 ] && IGCM_sys_Put_Dods ${R_ATLAS}
+fi
 
 # Clean RUN_DIR_PATH (necessary for cesium and titane only)

trunk/libIGCM/AA_create_multi_se

@@ -393 +393 @@
 
 # DODS copy
-for comp in ${config_ListOfComponents[*]} ; do
-  IGCM_sys_TestDirArchive ${R_SAVE}/${comp}/Analyse/${DIR_OUT}
-  [ $? = 0 ] && IGCM_sys_Put_Dods ${comp}/Analyse/${DIR_OUT}
-done
-
+if [ X${config_Post_DodsCopy} = XTRUE ]  ; then
+  for comp in ${config_ListOfComponents[*]} ; do
+    IGCM_sys_TestDirArchive ${R_SAVE}/${comp}/Analyse/${DIR_OUT}
+    [ $? = 0 ] && IGCM_sys_Put_Dods ${comp}/Analyse/${DIR_OUT}
+  done
+fi
+
+# Temporal coverage id for atlas
 YEARS=${an_multi_deb}_${an_multi_fin}
 

trunk/libIGCM/AA_create_se

@@ -555 +555 @@
 
 # DODS copy
-for comp in ${config_ListOfComponents[*]} ; do
-  IGCM_sys_TestDirArchive ${R_SAVE}/${comp}/Analyse/SE
-  [ $? = 0 ] && IGCM_sys_Put_Dods ${comp}/Analyse/SE
-done
-
+if [ X${config_Post_DodsCopy} = XTRUE ]  ; then
+  for comp in ${config_ListOfComponents[*]} ; do
+    IGCM_sys_TestDirArchive ${R_SAVE}/${comp}/Analyse/SE
+    [ $? = 0 ] && IGCM_sys_Put_Dods ${comp}/Analyse/SE
+  done
+fi
+
+# Temporal coverage id for atlas
 YEARS=${an_deb}_${an_fin}
 DIR_OUT=SE

trunk/libIGCM/AA_create_ts

@@ -186 +186 @@
 else
   CARD_DIR=${RUN_DIR_PATH}
+
+  #startTime_ms=$( getDate_ms ) #gp:added#
   IGCM_sys_Get_Master ${SUBMIT_DIR}/config.card ${RUN_DIR_PATH}
+  #endTime_ms=$( getDate_ms ) #gp:added#
+  #printInfosAction IGCM_sys_Get ${SUBMIT_DIR}/config.card $startTime_ms $endTime_ms ${RUN_DIR_PATH} ${SUBMIT_DIR}/config.card #gp:added#
+
+  #startTime_ms=$( getDate_ms ) #gp:added#
   IGCM_sys_Get_Master ${SUBMIT_DIR}/run.card    ${RUN_DIR_PATH}
+  #endTime_ms=$( getDate_ms ) #gp:added#
+  #printInfosAction IGCM_sys_Get ${SUBMIT_DIR}/run.card $startTime_ms $endTime_ms ${RUN_DIR_PATH} ${SUBMIT_DIR}/run.card  #gp:added#
+
+  #startTime_ms=$( getDate_ms ) #gp:added#
   IGCM_sys_Get_Master ${SUBMIT_DIR}/COMP        ${RUN_DIR_PATH}
+  #endTime_ms=$( getDate_ms ) #gp:added#
+  #printInfosAction IGCM_sys_Get ${SUBMIT_DIR}/COMP $startTime_ms $endTime_ms ${RUN_DIR_PATH} ${SUBMIT_DIR}/COMP  #gp:added#
+
+  #startTime_ms=$( getDate_ms ) #gp:added#
   IGCM_sys_Get_Master ${SUBMIT_DIR}/POST        ${RUN_DIR_PATH}
+  #endTime_ms=$( getDate_ms ) #gp:added#
+  #printInfosAction IGCM_sys_Get ${SUBMIT_DIR}/POST $startTime_ms $endTime_ms ${RUN_DIR_PATH} ${SUBMIT_DIR}/POST  #gp:added#
 fi
 
@@ -492 +508 @@
     done
     if [ X${file} != X${NULL_STR} ] ; then
+      #my_size=$( size_of_tab_content liste_file[*] ) #gp:added#
+      #startTime_ms=$( getDate_ms ) #gp:added#
       IGCM_sys_Get /l liste_file[*] ${RUN_DIR_PATH}/${comp}
+      #endTime_ms=$( getDate_ms ) #gp:added#
+      #printInfos_GetList IGCM_sys_Get $my_size $startTime_ms $endTime_ms ${RUN_DIR_PATH}/${comp} ${file_path} #gp:added#
+
       # Even if some files are missing we tried to continue
       # Either ListVar in compname.card are asked but not present in original history file
@@ -680 +701 @@
 
       # Get selected files
+      #my_size=$( size_of_tab_content liste_file[*] ) #gp:added#
+      #startTime_ms=$( getDate_ms ) #gp:added#
       IGCM_sys_Get /l liste_file[*] ${RUN_DIR_PATH}/${comp}
+      #ndTime_ms=$( getDate_ms ) #gp:added#
+      #printInfos_GetList IGCM_sys_Get $my_size $startTime_ms $endTime_ms ${RUN_DIR_PATH}/${comp} ${file_path} #gp:added#
+
       IGCM_debug_Verif_Exit_Post
 

trunk/libIGCM/AA_monitoring

@@ -250 +250 @@
 
 # Dods copy
-IGCM_sys_Put_Dods MONITORING
+if [ X${config_Post_DodsCopy} = XTRUE ]  ; then
+  IGCM_sys_Put_Dods MONITORING
+fi
 
 # Clean RUN_DIR_PATH (necessary for cesium and titane only)

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -139 +139 @@
       IGCM_sys_MkdirWork ${REBUILD_DIR}
     fi
+  fi
+
+  #====================================================
+  # DodsCopy : apply default value if not defined
+  if ( [ X${config_Post_DodsCopy} = X${NULL_STR} ] || [ X${config_Post_DodsCopy} = X ] ) ; then
+    config_Post_DodsCopy=TRUE
   fi