Changeset 334

Timestamp:

05/28/08 16:39:26 (17 years ago)

Author:

jgipsl

Message:

• Adapted to changes in CREATE job
• Added lmdz.card_Interannuel for interannuel run (before as comments in lmdz.card)

Location:

CONFIG/trunk/LMDZ4OR_v2/LMDZOR/COMP

Files:

• lmdz.card (modified) (1 diff)
• lmdz.card_Interannuel (added)
• lmdz.driver (modified) (3 diffs)

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

@@ -7 +7 @@
 # You can choose here the name of create_etat0 you want to use
 # If noting is defined here, the job will get the JobName in the file  ../CREATE/config.card
-CREATE=ETAT0
+CREATE=ELC-${RESOL_ATM}
+
 # Par default, adjust=n in run.def
 LMDZ_adjust = n
 
 [InitialStateFiles]
-# start and startphy are the clim files computed with CREATE (create_etat0_limit) job
-# CLIM version
-List=   (${R_OUT}/${config_UserChoices_TagName}/${CREATE}/ATM/Restart/${CREATE}_19791230_start.nc, start.nc) \
-        (${R_OUT}/${config_UserChoices_TagName}/${CREATE}/ATM/Restart/${CREATE}_19791230_startphy.nc, startphy.nc) 
-# AMIP files : replace this list by 
-#List=  (${R_OUT}/${config_UserChoices_TagName}/${CREATE}/ATM/Restart/${CREATE}_${year}1230_start.nc, start.nc) \
-#       (${R_OUT}/${config_UserChoices_TagName}/${CREATE}/ATM/Restart/${CREATE}_${year}1230_startphy.nc, startphy.nc) 
+List= (${R_OUT}/${config_UserChoices_TagName}/${CREATE}/ATM/Output/Restart/${CREATE}_clim_start.nc,    start.nc) \
+      (${R_OUT}/${config_UserChoices_TagName}/${CREATE}/ATM/Output/Restart/${CREATE}_clim_startphy.nc, startphy.nc) 
 
 [BoundaryFiles]
-List=   () 
-# AMIP files : list is :
-# List= (${R_OUT}/${config_UserChoices_TagName}/${CREATE}/ATM/Restart/${CREATE}_${year}1230_limit.nc, limit.nc)
-
-# The first one is the limit.nc computed with CREATE job
-# CLIM version
-ListNonDel= (${R_OUT}/${config_UserChoices_TagName}/${CREATE}/ATM/Restart/${CREATE}_19791230_limit.nc, limit.nc) 
+List= () 
+ListNonDel= (${R_OUT}/${config_UserChoices_TagName}/${CREATE}/ATM/Output/Boundary/${CREATE}_clim_limit.nc, limit.nc) 
 
 # With sulfates :

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

@@ -6 +6 @@
 {
     IGCM_debug_PushStack "ATM_Initialize"
+
+    RESOL_ATM=${RESOL}
+    case ${RESOL_ATM} in
+        LMD7245)   BandsResol=72x45x19   ;;
+        LMD9671)   BandsResol=96x71x19   ;;
+        LMD14496)  BandsResol=144x96x19  ;;
+        LMD144142) BandsResol=144x142x19 ;;
+    esac
 
     ##- Create_etat0_limit version
@@ -18 +26 @@
     fi
  
-    RESOL_ATM=${RESOL}
-    case ${RESOL_ATM} in
-        LMD7245)   BandsResol=72x45x19   ;;
-        LMD9671)   BandsResol=96x71x19   ;;
-        LMD14496)  BandsResol=144x96x19  ;;
-        LMD144142) BandsResol=144x142x19 ;;
-    esac
-
     ##--Frequency purpose ....
     ##--  Initialisation  ....
@@ -79 +79 @@
     IGCM_debug_PushStack "ATM_Update"
 
-# Another solution to make start.nc/startphy.nc/limit.nc for a CLIM run :
-# if ( ${FirstInitialize} ) ; then
-#
-#    if ( [ "${config_Restarts_OverRule}" = "n" ] && [ "${config_ATM_Restart}" = "n" ] ); then
-#       if [ ${DRYRUN} -le 2 ] ; then
-#            IGCM_sys_Cp ${R_EXE}/create_etat0_limit.e ${RUN_DIR}/.
-#          if [ ${DRYRUN} -le 1 ] ; then
-#            ./create_etat0_limit.e
-#          fi
-#       else
-#          echo "EXECUTION of ./create_etat0_limit.e simulated"
-#          echo "EXECUTION of ./create_etat0_limit.e simulated for DRYRUN = " $DRYRUN >> stack
-#       fi
-#    fi
-#
-# fi 
-
     ecritphy=${PeriodLengthInDays}