Changeset 746

Timestamp:

09/25/09 14:59:15 (15 years ago)

Author:

mafoipsl

Message:

Delete all Bands files in PARAM directories. Add in lmdz.driver everything concerning Bands. Add in lmdz.card LMDZ_NbPeriod_adjust parameter.

Location:

CONFIG/LMDZOR/branches/LMDZ4OR_v3/LMDZOR

Files:

• COMP/lmdz.card (modified) (3 diffs)
• COMP/lmdz.card_Interannuel (modified) (3 diffs)
• COMP/lmdz.driver (modified) (4 diffs)
• PARAM/Bands_144x142x19_5prc.dat (deleted)
• PARAM/Bands_144x142x19_7prc.dat (deleted)
• PARAM/Bands_144x142x39_16prc.dat (deleted)
• PARAM/Bands_144x142x39_32prc.dat (deleted)
• PARAM/Bands_144x142x39_7prc.dat (deleted)
• PARAM/Bands_144x142x39_8prc.dat (deleted)
• PARAM/Bands_144x96x19_5prc.dat (deleted)
• PARAM/Bands_96x71x19_2prc.dat (deleted)
• PARAM/Bands_96x71x19_3prc.dat (deleted)
• PARAM/Bands_96x71x19_4prc.dat (deleted)
• PARAM/Bands_96x95x19_3prc.dat (deleted)
• PARAM/Bands_96x95x19_4prc.dat (deleted)
• PARAM/Bands_96x95x39_16prc.dat (deleted)
• PARAM/Bands_96x95x39_32prc.dat (deleted)
• PARAM/Bands_96x95x39_3prc.dat (deleted)
• PARAM/Bands_96x95x39_4prc.dat (deleted)

CONFIG/LMDZOR/branches/LMDZ4OR_v3/LMDZOR/COMP/lmdz.card

@@ -9 +9 @@
 CREATE=ELC-${RESOL_ATM_3D}
 
-# Par default, adjust=n in run.def
-LMDZ_adjust = n
+# adjust=y during LMDZ_NbPeriod_adjust Period, adjust=n after LMDZ_NbPeriod_adjust
+LMDZ_NbPeriod_adjust=3
 
 [InitialStateFiles]
@@ -44 +44 @@
         (${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D}, gcm.def), \
         (${SUBMIT_DIR}/PARAM/run.def, .), \
-        (${SUBMIT_DIR}/PARAM/traceur.def, .), \
-        (${SUBMIT_DIR}/PARAM/Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat, .)
+        (${SUBMIT_DIR}/PARAM/traceur.def, .)
 
 [RestartFiles]
@@ -52 +51 @@
 
 [OutputText]
-List=   (physiq.def, gcm.def, run.def, traceur.def, Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat)
+List=   (physiq.def, gcm.def, run.def, traceur.def)
 
 [OutputFiles]

CONFIG/LMDZOR/branches/LMDZ4OR_v3/LMDZOR/COMP/lmdz.card_Interannuel

@@ -9 +9 @@
 CREATE=ELI-${RESOL_ATM_3D}
 
-# Par default, adjust=n in run.def
-LMDZ_adjust = n
+# adjust=y during LMDZ_NbPeriod_adjust Period, adjust=n after LMDZ_NbPeriod_adjust
+LMDZ_NbPeriod_adjust=3
 
 [InitialStateFiles]
@@ -64 +64 @@
         (${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D}, gcm.def), \
         (${SUBMIT_DIR}/PARAM/run.def, .), \
-        (${SUBMIT_DIR}/PARAM/traceur.def, .), \
-        (${SUBMIT_DIR}/PARAM/Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat, .)
+        (${SUBMIT_DIR}/PARAM/traceur.def, .)
 
 [RestartFiles]
@@ -72 +71 @@
 
 [OutputText]
-List=   (physiq.def, gcm.def, run.def, traceur.def, Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat)
+List=   (physiq.def, gcm.def, run.def, traceur.def)
 
 [OutputFiles]

CONFIG/LMDZOR/branches/LMDZ4OR_v3/LMDZOR/COMP/lmdz.driver

@@ -56 +56 @@
     PAT_day_step=$(  grep -v ^# ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D} | grep day_step )
 
-    ## Read LMDZ_adjust option in ${compname}.card --> put adjust=y and save Bands_*.dat in ${SUBMIT_DIR}/PARAM
-    IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/COMP/${compname}.card UserChoices LMDZ_adjust
-    eval LMDZ_adjust=\${${compname}_UserChoices_LMDZ_adjust} > /dev/null 2>&1
+    ## Read LMDZ_NbPeriod_adjust option in ${compname}.card 
+    IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/COMP/${compname}.card UserChoices LMDZ_NbPeriod_adjust
+    eval LMDZ_NbPeriod_adjust=\${${compname}_UserChoices_LMDZ_NbPeriod_adjust} > /dev/null 2>&1
+    
+    ## algo : CumulPeriod=1 ; LMDZ_adjust=y ; save Bands file on file server ;
+    ##        For CumulPeriod=2 to LMDZ_NbPeriod_adjust ; Fetch Bands file from server (CumulPeriod-1) ; LMDZ_adjust=y ; save Bands file on file server ;
+    ##        For CumulPeriod > LMDZ_NbPeriod_adjust ; LMDZ_adjust=n ; Fetch Bands file from server (CumulPeriod=LMDZ_NbPeriod_adjust) ; Use Bands ;
 
     ##-- This could be define in lmdz.card, inside section [UserChoices]
@@ -67 +71 @@
     #(( day_step = 48 * iphysiq ))
     day_step=$( echo ${PAT_day_step} | awk -F= '{print $2}' )
-
-    #[ -f ${SUBMIT_DIR}/PARAM/Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat ] && IGCM_sys_Cp ${SUBMIT_DIR}/PARAM/Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat .
 
     IGCM_debug_PopStack "ATM_Initialize"
@@ -86 +88 @@
         RAZ_DATE=0
     fi
+
+    LMDZ_adjust=n
+    [ ${CumulPeriod} -le ${LMDZ_NbPeriod_adjust} ] && LMDZ_adjust=y
+
+    RefPeriod=${LMDZ_NbPeriod_adjust}
+    [ ${CumulPeriod} -le ${LMDZ_NbPeriod_adjust} ] && (( RefPeriod = ${CumulPeriod} - 1 ))
+
+    [ ${CumulPeriod} -gt 1 ] && IGCM_sys_Get ${R_OUT_ATM_D}/${config_UserChoices_JobName}_Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat_${RefPeriod} Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat
 
     ## Mise en forme du fichier physiq.def
@@ -120 +130 @@
     IGCM_debug_PushStack "ATM_Finalize"
 
-    [ ${LMDZ_adjust} = y ] && IGCM_sys_Cp Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat ${SUBMIT_DIR}/PARAM
+    [ ${CumulPeriod} -le ${LMDZ_NbPeriod_adjust} ] && IGCM_sys_Put_Out Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat ${R_OUT_ATM_D}/${config_UserChoices_JobName}_Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat_${CumulPeriod}
 
     echo FINALIZE ATM !