Changeset 332 for CONFIG/trunk/LMDZ4OR_v2/CREATE/COMP

Timestamp:

05/28/08 16:23:53 (16 years ago)

Author:

jgipsl

Message:

• Added resolution in JobName?
• Modified save location for output files (now in ATM/Output/Boundary and ATM/Output/Restart)

Location:

CONFIG/trunk/LMDZ4OR_v2/CREATE/COMP

Files:

• lmdz.card (modified) (2 diffs)
• lmdz.card_AMIP (modified) (2 diffs)
• lmdz.driver (modified) (4 diffs)

CONFIG/trunk/LMDZ4OR_v2/CREATE/COMP/lmdz.card

@@ -18 +18 @@
 
 [BoundaryFiles]
-List=   () 
+List= () 
 ListNonDel= ()
 
@@ -28 +28 @@
 
 [RestartFiles]
-List=   (start.nc, start.nc, start.nc), \
-        (startphy.nc, startphy.nc,  startphy.nc), \
-        (limit.nc, limit.nc,  limit.nc)
-
+List= (NONE)
+        
 [OutputText]
-List=   ()
+List= ()
 
 [OutputFiles]
-List=   ()
+List=   ( limit.nc,     ${R_OUT_ATM_O}/Boundary/${config_UserChoices_JobName}_clim_limit.nc,   NONE), \
+        ( start.nc,     ${R_OUT_ATM_O}/Restart/${config_UserChoices_JobName}_clim_start.nc,    NONE), \
+        ( startphy.nc,  ${R_OUT_ATM_O}/Restart/${config_UserChoices_JobName}_clim_startphy.nc, NONE)
 
+

CONFIG/trunk/LMDZ4OR_v2/CREATE/COMP/lmdz.card_AMIP

@@ -7 +7 @@
 
 [InitialStateFiles]
-List=   ()
+List= ()
 
 [BoundaryFiles]
 List=   (${R_INIT}/ATM/${config_UserChoices_TagName}/Amip6/amipbc_sst_360x180_${year}.nc, amipbc_sst_1x1.nc), \
         (${R_INIT}/ATM/${config_UserChoices_TagName}/Amip6/amipbc_sic_360x180_${year}.nc, amipbc_sic_1x1.nc)
+
 ListNonDel= (${R_INIT}/ATM/${config_UserChoices_TagName}/Albedo.nc, .), \
         (${R_INIT}/ATM/${config_UserChoices_TagName}/ECDYN.nc, .), \
@@ -26 +27 @@
 
 [RestartFiles]
-List=   (start.nc, start.nc, start.nc), \
-        (startphy.nc, startphy.nc,  startphy.nc), \
-        (limit.nc, limit.nc,  limit.nc)
+List= (NONE)
 
 [OutputText]
-List=   (ftrace.out.1.0)
+List= ()
 
 [OutputFiles]
-List=   ()
+List=   ( limit.nc,     ${R_OUT_ATM_O}/Boundary/${config_UserChoices_JobName}_${year}_limit.nc,   NONE), \
+        ( start.nc,     ${R_OUT_ATM_O}/Restart/${config_UserChoices_JobName}_${year}_start.nc,    NONE), \
+        ( startphy.nc,  ${R_OUT_ATM_O}/Restart/${config_UserChoices_JobName}_${year}_startphy.nc, NONE)
 

CONFIG/trunk/LMDZ4OR_v2/CREATE/COMP/lmdz.driver

@@ -1 +1 @@
 #!/bin/ksh
-
-# MPI Variables
-ATM_PARA=0
-
 #-----------------------------------------------------------------
 function ATM_Initialize
@@ -10 +6 @@
 
     RESOL_ATM=${RESOL}
-
-    ##--Frequency purpose ....
-    ##--  Initialisation  ....
-    OK_instan=n
-    ##-- 
-    OK_journe=n
-    OK_mensuel=n
-
-    case ${config_UserChoices_PeriodLength} in
-        1Y|1y|1M|1m) OK_mensuel=y ;;
-        5D|5d|1D|1d) OK_journe=y ;;
-    esac
-
-    for frequency in ${config_ATM_WriteFrequency} ; do
-        case ${frequency} in
-            5D|5d|1D|1d) OK_journe=y ;;
-        esac
-    done
-
-    ##--Variables used by LMDZ --
-    PAT_INST=$(     grep 'OK_instan'   ${SUBMIT_DIR}/PARAM/physiq.def )
-    PAT_JOUR=$(     grep 'OK_journe'   ${SUBMIT_DIR}/PARAM/physiq.def )
-    PAT_MOIS=$(     grep 'OK_mensuel'  ${SUBMIT_DIR}/PARAM/physiq.def )
-
-    PAT_iphysiq=$(  grep 'iphysiq'     ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL} )
-    PAT_iperiod=$(  grep 'iperiod'     ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL} | tail -1)
-    PAT_day_step=$( grep 'day_step'    ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL} )
-    PAT_ecritphy=$( grep 'ecritphy'    ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL} )
-
-    ##-- This could be define in lmdz.card, inside section [UserChoices]
-    ##-- Otherwise we get the value in *.def
-    iperiod=$(grep iperiod ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL} | awk -F= '{print $2}' | tail -1)
-    iphysiq=$(grep iphysiq ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL} | awk -F= '{print $2}')
-    # day_step : number of steps per day (multiple of iperiod)
-    (( day_step = 48 * iphysiq ))
 
     IGCM_debug_PopStack "ATM_Initialize"
@@ -54 +15 @@
     IGCM_debug_PushStack "ATM_Update"
 
-    ecritphy=${PeriodLengthInDays}
-
     ##-- Remise ou non a zero de la date initiale de LMDZ pour le fichier run.def
     if [ ${CumulPeriod} -eq 1 ] ; then
@@ -62 +21 @@
         RAZ_DATE=0
     fi
-
-    ## Mise en forme du fichier physiq.def
-    sed -e "s/OK_instan=.*/OK_instan=${OK_instan}/"   \
-        -e "s/OK_journe=.*/OK_journe=${OK_journe}/"   \
-        -e "s/OK_mensuel=.*/OK_mensuel=${OK_mensuel}/" \
-        physiq.def > physiq.def.tmp
-    IGCM_sys_Mv physiq.def.tmp physiq.def
-
-    ## Mise en forme du fichier gcm.def
-    sed  -e "s/${PAT_ecritphy}/ecritphy=${ecritphy}/" \
-        -e "s/${PAT_day_step}/day_step=${day_step}/" \
-        -e "s/${PAT_iperiod}/iperiod=${iperiod}/" \
-        -e "s/${PAT_iphysiq}/iphysiq=${iphysiq}/" \
-        gcm.def > gcm.def.tmp
-    IGCM_sys_Mv gcm.def.tmp gcm.def
 
     ## Mise en forme du fichier run.def