Changeset 2859 for CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL

Timestamp:

05/19/16 13:35:11 (8 years ago)

Author:

jgipsl

Message:

Removed specific treatment of Bands_ file and option adjust in lmdz. See ticket #74

Location:

CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL

Files:

• DRIVER/lmdz.driver (modified) (4 diffs)
• PARAM/run.def (modified) (1 diff)

CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL/DRIVER/lmdz.driver

@@ -80 +80 @@
     done
 
-    ## Read LMDZ_NbPeriod_adjust option in lmdz.card 
-    if [ X"${lmdz_UserChoices_LMDZ_NbPeriod_adjust}" = X"" ] ; then
-        # The variable is not in lmdz.card, set default value
-        LMDZ_NbPeriod_adjust=0
-    else        
-        LMDZ_NbPeriod_adjust=${lmdz_UserChoices_LMDZ_NbPeriod_adjust}
-    fi
-
-    if [ ${LMDZ_NbPeriod_adjust} -eq 0 ] ; then
-        LMDZ_Bands_file_name=${lmdz_UserChoices_LMDZ_Bands_file_name}
-    fi
-
-
     ##  Read LMDZ_COSP_OK in lmdz.card
     if [ X${lmdz_UserChoices_LMDZ_COSP_OK} = Xy ] ; then
@@ -150 +137 @@
 {
     IGCM_debug_PushStack "ATM_Update"
-
-
-    ## Algorithme for special treatment for Bands_xxx file
-    ## For CumulPeriod=1 ; 
-    ##        IF NbPeriod_Adjust = 0 ; set LMDZ_adjust=n
-    ##                                IF LMDZ_Bands_file_name was given in lmdz.card THEN Get Bands file directly from server. Store it later with _0 suffix.
-    ##                                IF no LMDZ_Bands_file_name was given, start without Bands file. Store it later with _0 suffix.
-    ##        ELSE set LMDZ_adjust=y ; start without Bands file ; Store it later in PARAM/ directory in submit directory with suffix _1 ;
-    ##
-    ## For CumulPeriod=2 to LMDZ_NbPeriod_adjust ; 
-    ##       Get Bands file from PARAM/ in submit directory (CumulPeriod-1) ; set LMDZ_adjust=y ; Store Bands file in PARAM/ ;
-    ##
-    ## For CumulPeriod > LMDZ_NbPeriod_adjust ; LMDZ_adjust=n ; Get Bands file from PARAM/ ; Do not store ;
-
-    if [ ${CumulPeriod} -eq 1 ] ; then
-        if [ ${LMDZ_NbPeriod_adjust} -eq 0 ] ; then
-            if [ ! X${LMDZ_Bands_file_name} = X ] ; then
-                IGCM_sys_Get ${LMDZ_Bands_file_name} Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat 
-                IGCM_sys_Chmod u+w Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat
-                IGCM_debug_Print 1 "Bands file forced to ${LMDZ_Bands_file_name} and stored in ${config_UserChoices_JobName}_Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat_0"
-            fi
-        fi
-    fi
-
-    LMDZ_adjust=n
-    [ ${CumulPeriod} -le ${LMDZ_NbPeriod_adjust} ] && LMDZ_adjust=y
-
-    RefPeriod=${LMDZ_NbPeriod_adjust} #0 to use a Bands file from Restart
-    [ ${CumulPeriod} -le ${LMDZ_NbPeriod_adjust} ] && (( RefPeriod = ${CumulPeriod} - 1 )) 
-
-    # Get Bands file from PARAM directory if file exist
-    if ( [ ${CumulPeriod} -gt 1 ] && [ -f ${SUBMIT_DIR}/PARAM/${config_UserChoices_JobName}_Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat_${RefPeriod} ] ) ; then
-        IGCM_sys_Cp ${SUBMIT_DIR}/PARAM/${config_UserChoices_JobName}_Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat_${RefPeriod} Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat
-        IGCM_sys_Chmod u+w Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat
-    fi
 
     ##-- GHG forcing :
@@ -390 +342 @@
     IGCM_comp_modifyDefFile blocker run.def dayref    ${InitDay}
     IGCM_comp_modifyDefFile blocker run.def nday      ${PeriodLengthInDays}
-    IGCM_comp_modifyDefFile nonblocker run.def adjust ${LMDZ_adjust}
 
     # Set anneeref different for gcm and ce0l
@@ -554 +505 @@
 {
     IGCM_debug_PushStack "ATM_Finalize"
-
-    # If the file exist, copy Bands_ file to PARAM/ in submit directory. This file will be used for the simulation.
-    # Copy also the same file into ATM/Restart at ARCHIVE directory for backup.
-    if [ -f Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat ] ; then 
-      if [ ${CumulPeriod} -le ${LMDZ_NbPeriod_adjust} ] ; then
-        IGCM_sys_Cp Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat ${SUBMIT_DIR}/PARAM/${config_UserChoices_JobName}_Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat_${CumulPeriod}
-        IGCM_sys_Put_Out Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat ${R_OUT_ATM_R}/${config_UserChoices_JobName}_Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat_${CumulPeriod}
-      elif [ ${CumulPeriod} -eq 1 ] && [ ${LMDZ_NbPeriod_adjust} -eq 0 ] ; then
-        # Special case : first period and no adjust => Save bands file with suffix _0
-        IGCM_sys_Cp Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat ${SUBMIT_DIR}/PARAM/${config_UserChoices_JobName}_Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat_0
-        IGCM_sys_Put_Out Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat ${R_OUT_ATM_R}/${config_UserChoices_JobName}_Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat_0
-      fi
-    fi
 
     # Add special treatement for CARBON CYCLE

CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL/PARAM/run.def

@@ -27 +27 @@
 ok_dynzon=n
 ## activation du calcul d equilibrage de charge
-adjust= _AUTO_
+adjust= n
 ## activation du filtre fft
 use_filtre_fft=y