Changeset 326

Timestamp:

05/13/08 17:46:31 (17 years ago)

Author:

jgipsl

Message:

• Updated parameter files, *.card and *.driver as done for configuration IPSLCM4_v2.

Important differences, in orchidee.def : sechiba_qsint, rveg_pft

in gcm.def : cvl_corr, day_step, iphysiq

• Updated variable list for timeseries
• Removed config.card.OldName? : not useful for this config

Location:

CONFIG/trunk/LMDZ4OR_v2/LMDZOR

Files:

• COMP/lmdz.card (modified) (5 diffs)
• COMP/lmdz.driver (modified) (8 diffs)
• COMP/orchidee.card (modified) (5 diffs)
• COMP/orchidee.driver (modified) (7 diffs)
• PARAM/gcm.def_LMD144142 (modified) (1 diff)
• PARAM/gcm.def_LMD14496 (modified) (3 diffs)
• PARAM/gcm.def_LMD9671 (modified) (2 diffs)
• PARAM/orchidee.def (modified) (3 diffs)
• PARAM/physiq.def (modified) (1 diff)
• PARAM/run.def (modified) (2 diffs)
• config.card (modified) (6 diffs)
• config.card.OldName (deleted)

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

@@ +1 @@
+# $Id$
+
 [Compatibility]
 libIGCM=1.0
 
 [UserChoices]
-#You can choose here the name of create_etat0 you want to use
-CREATE=CLIM_EL
-#CREATE=AMIP_EL
-#CREATE=Another
+# 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
+# Par default, adjust=n in run.def
+LMDZ_adjust = n
 
 [InitialStateFiles]
@@ -18 +20 @@
 #       (${R_OUT}/${config_UserChoices_TagName}/${CREATE}/ATM/Restart/${CREATE}_${year}1230_startphy.nc, startphy.nc) 
 
-# Default values for climatological computation without create_etat0_limit step :
-# (${R_INIT}/ATM/climLMDZ4ORv2/start_96x71x19_clim.nc, start.nc) \
-# (${R_INIT}/ATM/climLMDZ4ORv2/startphy_96x71x19_clim.nc, startphy.nc) 
-# or ?
-# (${R_INIT}/ATM/${config_UserChoices_TagName}/amipbc_sic_1x1_clim.nc, amipbc_sic_1x1.nc), \
-# (${R_INIT}/ATM/${config_UserChoices_TagName}/amipbc_sst_1x1_clim.nc, amipbc_sst_1x1.nc)
-
-
 [BoundaryFiles]
 List=   () 
 # AMIP files : list is :
-# (${R_OUT}/${config_UserChoices_TagName}/${CREATE}/ATM/Restart/${CREATE}_${year}1230_limit.nc, limit.nc) \
+# 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) \
-        (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/flux_iceberg, .)
-# Default values for climatological computation without create_etat0_limit step :
-# (${R_INIT}/ATM/climLMDZ4ORv2/limit_amipbc_96x71_clim.nc, limit.nc) \
-# AMIP version :
-#       (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/flux_iceberg, .),\
-#       (${R_BC}/ATM/${config_UserChoices_TagName}/ISCCP/tautab.formatted, .),\
-#       (${R_BC}/ATM/${config_UserChoices_TagName}/ISCCP/invtau.formatted, .)
+ListNonDel= (${R_OUT}/${config_UserChoices_TagName}/${CREATE}/ATM/Restart/${CREATE}_19791230_limit.nc, limit.nc) 
 
 # With sulfates :
@@ -55 +42 @@
 #         (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run2000.cdf, .),\
 #         (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run.nat.cdf, .),\
-
+#
 # With ISSCP engine :
 #         (${R_BC}/ATM/${config_UserChoices_TagName}/ISCCP/tautab.formatted, .),\
@@ -72 +59 @@
 
 [OutputText]
-List=   (gcm.e.prt0, ftrace.out.1.0, physiq.def, gcm.def, run.def, traceur.def, Bands_${BandsResol}_${NUM_PROC_ATM}prc.dat)
+List=   (physiq.def, gcm.def, run.def, traceur.def, Bands_${BandsResol}_${NUM_PROC_ATM}prc.dat)
 
 [OutputFiles]
 List=   (histmth.nc,      ${R_OUT_ATM_O_M}/${PREFIX}_1M_histmth.nc,      Post_1M_histmth), \
+        (histISCCP.nc,    ${R_OUT_ATM_O_M}/${PREFIX}_1M_histISCCP.nc,    NONE), \
+        (histNMC.nc,      ${R_OUT_ATM_O_M}/${PREFIX}_1M_histNMC.nc,      NONE), \
+        (histrac.nc,      ${R_OUT_ATM_O_M}/${PREFIX}_1M_histrac.nc,      NONE), \
+        (dynzon.nc,       ${R_OUT_ATM_O_M}/${PREFIX}_1M_dynzon.nc,       NONE), \
         (histday.nc,      ${R_OUT_ATM_O_D}/${PREFIX}_1D_histday.nc,      NONE), \
-        (dyn_hist_ave.nc, ${R_OUT_ATM_O_M}/${PREFIX}_1M_dyn_hist_ave.nc, NONE), \
-        (dyn_histv.nc,    ${R_OUT_ATM_O_M}/${PREFIX}_1M_dyn_histv.nc,    NONE)
-
-# Post_1M_dynzon, Post_1D_histday
-
-# Other lmdz files
-# , \
-#       (dynzon.nc,       ${R_OUT_ATM_O_M}/${PREFIX}_1M_dynzon.nc,       NONE), \
-#       (histISCCP.nc,    ${R_OUT_ATM_O_M}/${PREFIX}_1M_histISCCP.nc,    NONE), \
-#       (histNMC.nc,      ${R_OUT_ATM_O_M}/${PREFIX}_1M_histNMC.nc,      NONE), \
-#       (histhf.nc,       ${R_OUT_ATM_O_H}/${PREFIX}_HF_histhf.nc,       NONE), \
-#       (histhf3d.nc,     ${R_OUT_ATM_O_H}/${PREFIX}_HF_histhf3d.nc,     NONE), \
-#       (histins.nc,      ${R_OUT_ATM_O_I}/${PREFIX}_INS_histins.nc,     NONE), \
-#       (histREGDYN.nc,   ${R_OUT_ATM_O_M}/${PREFIX}_1M_histREGDYN.nc,   NONE), \
-#       (histday_seri.nc, ${R_OUT_ATM_O_D}/${PREFIX}_1D_histday_seri.nc, NONE), \
-#       (dyn_hist.nc,     ${R_OUT_ATM_O_M}/${PREFIX}_1M_dyn_hist.nc,     NONE)
+        (histhf.nc,       ${R_OUT_ATM_O_H}/${PREFIX}_HF_histhf.nc,       NONE), \
+        (histhf3d.nc,     ${R_OUT_ATM_O_H}/${PREFIX}_HF_histhf3d.nc,     NONE), \
+        (histins.nc,      ${R_OUT_ATM_O_I}/${PREFIX}_INS_histins.nc,     NONE)
 
 [Post_1M_histmth]
 Patches= (Patch_20070220_histcom_time_axis)
 GatherWithInternal = (lon, lat, presnivs, time_counter)
-MonitoringVars= (bils, nettop, precip, tsol)
-TimeSeriesVars= (bils, cldh, cldl, cldm, cldq, cldt, evap, iwp, lwp, LWdnSFC, LWdnSFCclr, LWupSFCclr, LWdn200, LWdn200clr, LWup200, LWup200clr, precip, prw, pluc, psol, q2m, sens, slp, snowf, soll0, soll, sols0, sols, SWdnSFC, SWupSFC, SWup200, SWup200clr, SWdnTOA, SWupTOA, SWdn200, SWdn200clr, SWdnSFCclr, SWupSFCclr, SWupTOAclr, t2m, taux_ter, taux_sic, taux_lic, taux_oce, tauy_ter, tauy_sic, tauy_lic, tauy_oce, lat_ter, lat_sic, lat_lic, lat_oce, topl0, topl, tops0, tops, tsol, tsol_ter, tsol_lic, tsol_oce, tsol_sic , u10m, u500, v10m, v500, w500, pourc_ter, pourc_oce, pourc_sic)
+TimeSeriesVars= (bils, cldh, cldl, cldm, cldq, cldt, evap, iwp, lwp, LWdnSFC, LWdnSFCclr, LWupSFCclr, LWdn200, LWdn200clr, LWup200, LWup200clr, precip, prw, pluc, psol, q2m, sens, slp, snow, soll0, soll, sols0, sols, SWdnSFC, SWupSFC, SWup200, SWup200clr, SWdnTOA, SWupTOA, SWdn200, SWdn200clr, SWdnSFCclr, SWupSFCclr, SWupTOAclr, t2m, taux_ter, taux_sic, taux_lic, taux_oce, tauy_ter, tauy_sic, tauy_lic, tauy_oce, lat_ter, lat_sic, lat_lic, lat_oce, topl0, topl, tops0, tops, tsol, tsol_ter, tsol_lic, tsol_oce, tsol_sic , u10m, u500, v10m, v500, w500, pourc_ter, pourc_oce, pourc_sic, pourc_lic)
 
 [Post_1M_histISCCP]
 Patches= ()
 GatherWithInternal = (lon, lat, cldtopres, time_counter)
-MonitoringVars=
-TimeSeriesVars=(cldISCCP_tau1, cldISCCP_tau2, cldISCCP_tau3, cldISCCP_tau4, cldISCCP_tau5, cldISCCP_tau6, cldISCCP_tau7)
+TimeSeriesVars=(cldISCCP_tau01, cldISCCP_tau11, cldISCCP_tau21, cldISCCP_tau31, cldISCCP_tau41, cldISCCP_tau51, cldISCCP_tau61, ptop, meantaucld)
 
 [Post_1M_histNMC]
 Patches = ()
 GatherWithInternal = (lon, lat, presnivs, time_counter)
-MonitoringVars =
 TimeSeriesVars= (t1000, t925, t850, t700, t600, t500, t400, t300, t250, t200, t150, t100, t70, t50, t30, t20, t10, u1000, u925, u850, u700, u600, u500, u400, u300, u250, u200, u150, u100, u70, u50, u30, u20, u10, v1000, v925, v850, v700, v600, v500, v400, v300, v250, v200, v150, v100, v70, v50, v30, v20, v10, phi1000, phi925, phi850, phi700, phi600, phi500, phi400, phi300, phi250, phi200, phi150, phi100, phi70, phi50, phi30, phi20, phi10, rh1000, rh925, rh850, rh700, rh600, rh500, rh400, rh300, rh250, rh200, rh150, rh100, rh70, rh50, rh30, rh20, rh10, q1000, q925, q850, q700, q600, q500, q400, q300, q250, q200, q150, q100, q70, q50, q30, q20, q10)
 
@@ -115 +90 @@
 Patches = ()
 GatherWithInternal = (lon, lat, presnivs, time_counter)
-MonitoringVars =
-TimeSeriesVars =
+TimeSeriesVars=()
 
 [Post_1D_histday]
 Patches= (Patch_20070220_histcom_time_axis)
 GatherWithInternal = (lon, lat, presnivs, time_counter)
-MonitoringVars=
-TimeSeriesVars= (bils, cldh, cldl, cldm, cldq, cldt, evap, flat, phi500, precip, psol, q2m, sens, slp, soll, sols, t2m, t2m_max, t2m_min, topl, tops, tsol, u10m, v10m)
+TimeSeriesVars= (bils, cldh, cldl, cldm, cldq, cldt, evap, flat, iwp, lwp, phi500, precip, pluc, plul, prw, psol, rh2m, q2m, sens, sicf, slp, soll, sols, SWdnSFC, taux, tauy, t2m, t2m_max, t2m_min, topl, tops, tsol, u10m, v10m, wind10m, wind10max)
 
 [Post_HF_histhf]
 Patches= (Patch_20070220_histcom_time_axis)
 GatherWithInternal = (lon, lat, presnivs, time_counter)
-MonitoringVars=
-TimeSeriesVars=(cldt, psol, q2m, slp, t2m, rain, tsol, u10m, u500, v10m, phi500, t500)
+TimeSeriesVars=(cldt, psol, q2m, slp, t2m, rain, tsol, u10m, v10m, t1000, t925, t850, t700, t500, t300, t250, t200, t150, t100, t50, t30, t10, u1000, u925, u850, u700, u500, u300, u250, u200, u150, u100, u50, u30, u10, v1000, v925, v850, v700, v500, v300, v250, v200, v150, v100, v50, v30, v10, phi1000, phi925, phi850, phi700, phi500, phi300, phi250, phi200, phi150, phi100, phi50, phi30, phi10, w1000, w925, w850, w700, w500, w300, w250, w200, w150, w100, w50, w30, w10, q1000, q925, q850, q700, q500, q300, q250, q200, q150, q100, q50, q30, q10)
 
 [Post_HF_histhf3d]
 Patches= ()
 GatherWithInternal = (lon, lat, presnivs, time_counter)
-MonitoringVars =
 TimeSeriesVars=(temp, ovap, vitu, vitv)

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

@@ +1 @@
+# $Id$
+#
 #!/bin/ksh
 #-----------------------------------------------------------------
@@ -5 +7 @@
     IGCM_debug_PushStack "ATM_Initialize"
 
-#D- create_etat0_limit version : CLIM_EL or AMIP_EL
+    ##- Create_etat0_limit version
     IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/COMP/lmdz.card UserChoices CREATE
     CREATE=${lmdz_UserChoices_CREATE}
     echo create_etat0_limit version : ${CREATE}
 
-#D- Default number of processor for lmdz
+    ##- Default number of processor for lmdz
     NUM_PROC_ATM=1
-#D- Number of processors used for lmdz and oasis coupler computed from PBS variable
     if [ X"${BATCH_NUM_PROC_TOT}" != X ] ; then
         NUM_PROC_ATM=${BATCH_NUM_PROC_TOT}
     fi
-    echo BATCH_NUM_PROC_TOT=${BATCH_NUM_PROC_TOT}
-    echo NUM_PROC_ATM=${NUM_PROC_ATM}
-
+ 
     RESOL_ATM=${RESOL}
-
     case ${RESOL_ATM} in
         LMD7245)   BandsResol=72x45x19   ;;
@@ -31 +29 @@
     ##--  Initialisation  ....
     OK_instan=n
-    ##-- 
     OK_journe=n
     OK_mensuel=n
+    ok_hf=n
 
     case ${config_UserChoices_PeriodLength} in
@@ -44 +42 @@
             5D|5d|1D|1d) OK_journe=y ;;
         esac
+        case ${frequency} in
+            HF|hf) ok_hf=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 )
+    ##--Variables used by LMDZ in physiq.def --
+    PAT_INST=$(     grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def  | grep 'OK_instan'  )
+    PAT_JOUR=$(     grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def  | grep 'OK_journe'  )
+    PAT_MOIS=$(     grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def  | grep 'OK_mensuel' )
+    PAT_HFRE=$(     grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def  | grep 'ok_hf'      )
 
-    PAT_iphysiq=$(  grep 'iphysiq'     ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM} )
-    PAT_iperiod=$(  grep 'iperiod'     ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM} | tail -1)
-    PAT_day_step=$( grep 'day_step'    ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM} )
-    PAT_ecritphy=$( grep 'ecritphy'    ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM} )
+    ##--Variables used by LMDZ in gcm.def --
+    PAT_iphysiq=$(  grep -v ^# ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM} | grep iphysiq  )
+    PAT_iperiod=$(  grep -v ^# ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM} | grep iperiod  )
+    PAT_day_step=$( grep -v ^# ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM} | grep day_step )
+    PAT_ecritphy=$( grep -v ^# ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM} | grep ecritphy )
+
+    ## 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
 
     ##-- 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_ATM} | awk -F= '{print $2}' | tail -1)
-    iphysiq=$(grep iphysiq ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM} | awk -F= '{print $2}')
+    iperiod=$( echo ${PAT_iperiod} | awk -F= '{print $2}' )
+    iphysiq=$( echo ${PAT_iphysiq} | awk -F= '{print $2}' )
+
     # day_step : number of steps per day (multiple of iperiod)
     (( day_step = 48 * iphysiq ))
@@ -73 +81 @@
 # 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
@@ -85 +93 @@
 #       fi
 #    fi
-
+#
 # fi 
-
 
     ecritphy=${PeriodLengthInDays}
@@ -99 +106 @@
 
     ## 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}/" \
+    sed -e "s/${PAT_INST}/OK_instan=${OK_instan}/"    \
+        -e "s/${PAT_JOUR}/OK_journe=${OK_journe}/"    \
+        -e "s/${PAT_MOIS}/OK_mensuel=${OK_mensuel}/"  \
+        -e "s/${PAT_HFRE}/ok_hf=${ok_hf}/"            \
         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}/" \
+    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
-    sed -e "s/_dayref_/${InitDay}/" \
-        -e "s/_anneeref_/${InitYear}/" \
-        -e "s/_nday_/${PeriodLengthInDays}/" \
-        -e "s/_raz_date_/${RAZ_DATE}/" \
+    sed -e "s/_dayref_/${InitDay}/"                    \
+        -e "s/_anneeref_/${InitYear}/"                 \
+        -e "s/_nday_/${PeriodLengthInDays}/"           \
+        -e "s/_raz_date_/${RAZ_DATE}/"                 \
+        -e "s/_adjust_/${LMDZ_adjust}/"                \
         run.def > run.def.tmp
     IGCM_sys_Mv run.def.tmp run.def
@@ -129 +138 @@
     IGCM_debug_PushStack "ATM_Finalize"
 
-    IGCM_sys_Put_Out ${RUN_DIR}/used_run.def ${R_SAVE}/${PREFIX}_used_run.def
+    [ ${LMDZ_adjust} = y ] && IGCM_sys_Cp Bands_${BandsResol}_${NUM_PROC_ATM}prc.dat ${SUBMIT_DIR}/PARAM
 
     echo FINALIZE ATM !

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

@@ +1 @@
+# $Id$
+
 [Compatibility]
 libIGCM=1.0
@@ -6 +8 @@
 [InitialStateFiles]
 List=   (${R_INIT}/SRF/${config_UserChoices_TagName}/carteveg5km.nc, .), \
-        (${R_INIT}/SRF/${config_UserChoices_TagName}/irrigated.nc, .)
+        (${R_INIT}/SRF/${config_UserChoices_TagName}/soils_param.nc, .), \
+        (${R_INIT}/SRF/${config_UserChoices_TagName}/routing.nc, .)
 
 [BoundaryFiles]
 List=   ()
-ListNonDel= (${R_INIT}/SRF/${config_UserChoices_TagName}/routing.nc, .),     \
-            (${R_INIT}/SRF/${config_UserChoices_TagName}/soils_param.nc, .), \
-            (${R_BC}/SRF/${config_UserChoices_TagName}/lai2D.nc, .)
+ListNonDel= (${R_BC}/SRF/${config_UserChoices_TagName}/lai2D.nc, .)
 # For STOMATE : suppress unused lai file and add reftemp file
 #            (${R_BC}/SRF/${config_UserChoices_TagName}/reftemp.nc, .)
@@ -21 +22 @@
 
 [RestartFiles]
-# List restart that have to be saved/restored each loop (file out, saved, and in) :
-List=   (sechiba_rest_out.nc, sechiba_rest.nc, sechiba_rest_in.nc)
+List=   (sechiba_rest.nc, sechiba_rest.nc, start_sech.nc)
 # For STOMATE : 
 #  \
@@ -32 +32 @@
 
 [OutputFiles]
-List=   (sechiba_history.nc, ${R_OUT_SRF_O_M}/${PREFIX}_1M_sechiba_history.nc, Post_1M_sechiba_history)
+List=   (sechiba_out.nc, ${R_OUT_SRF_O_M}/${PREFIX}_1M_sechiba_history.nc, Post_1M_sechiba_history)
 # For STOMATE : 
 #  \
@@ -44 +44 @@
 Patches = (Patch_20070220_histcom_time_axis)
 GatherWithInternal = (lon, lat, veget, time_counter)
-MonitoringVars =
-TimeSeriesVars = (lai, maxvegetfrac, vegetfrac, nobiofrac, alb_nir, alb_vis, bqsb, evap, fluxlat, fluxsens, gqsb, netrad, qair, rain, runoff, snow, subli, tair, temp_sol, tsol_max, tsol_min, drainage, CO2FLUX)
+TimeSeriesVars = (alb_nir, alb_vis, bqsb, evap, fluxlat, fluxsens, gqsb, netrad, qair, rain, runoff, snow, snowf, subli, tair, tsol_max, tsol_min, drainage)
 
 [Post_1M_stomate_history]
 Patches = ()
 GatherWithInternal = (lon, lat, PFT, time_counter)
-MonitoringVars =
 TimeSeriesVars = (SPACE_NAT, CO2FLUX_MONTHLY, LAI, VEGET, VEGET_MAX, NPP, GPP, MAINT_RESP, GROWTH_RESP, AGE, HEIGHT, T2M_MONTH, CONTFRAC, RESOLUTION_X, RESOLUTION_Y)

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

@@ +1 @@
+# $Id$
+#
 #!/bin/ksh
 
@@ -15 +17 @@
 {
     IGCM_debug_PushStack "SRF_Update"
-
-    typeset SECHIBA_WRITE_STEP STOMATE_WRITE_STEP
 
     case ${config_SRF_WriteFrequency} in
@@ -41 +41 @@
     esac
 
+
     if ( [ ${CumulPeriod} -eq 1 ] && [ "${config_SRF_Restart}" = "n" ] ) ; then
-        sed -e "s/WRITE_STEP= 86400.0/WRITE_STEP=${SECHIBA_WRITE_STEP}/" \
-            orchidee.def > orchidee.def.tmp
+        sed -e "s/_start_sech_/default/" \
+            -e "s/_write_step_/${SECHIBA_WRITE_STEP}/" \
+            orchidee.def > orchidee.def.tmp
 ## For STOMATE
 #           -e "s/STOMATE_HIST_DT= 10./STOMATE_HIST_DT = ${STOMATE_WRITE_STEP}/" \
@@ -51 +53 @@
 #            -e "s/DT_WATCHOUT= 1800/DT_WATCHOUT= 3600/" \
     else
-        sed -e "s/SECHIBA_restart_in= NONE/SECHIBA_restart_in= sechiba_rest_in.nc/" \
-            -e "s/WRITE_STEP = 86400.0/WRITE_STEP=${SECHIBA_WRITE_STEP}/" \
-            orchidee.def > orchidee.def.tmp
+        sed -e "s/_start_sech_/start_sech.nc/" \
+            -e "s/_write_step_/${SECHIBA_WRITE_STEP}/" \
+            orchidee.def > orchidee.def.tmp
 ## For STOMATE
 #            -e "s/STOMATE_RESTART_FILEIN= NONE/STOMATE_RESTART_FILEIN = stomate_rest_in.nc/" \
@@ -61 +63 @@
 #            -e "s/ORCHIDEE_WATCHOUT= n/ORCHIDEE_WATCHOUT= y/" \
 #            -e "s/DT_WATCHOUT= 1800/DT_WATCHOUT= 3600/" \
-
     fi
     IGCM_sys_Mv orchidee.def.tmp orchidee.def
@@ -73 +74 @@
     IGCM_debug_PushStack "SRF_Finalize"
 
-    echo FINALIZE SRF !!!
-
 # For STOMATE :
 #     if [ $( IGCM_date_DaysBetweenGregorianDate ${PeriodDateEnd} ${year}1230 ) -ge 0 ] ; then
@@ -81 +80 @@
 #     fi
 
+    echo FINALIZE SRF !!!
+
     IGCM_debug_PopStack "SRF_Finalize"
 }

CONFIG/trunk/LMDZ4OR_v2/LMDZOR/PARAM/gcm.def_LMD144142

@@ -47 +47 @@
 iflag_con=3
 ##  Facteur multiplication des precip convectives dans KE
-cvl_corr=1.019
+cvl_corr=1.002
+##  Facteur additif pour l'albedo
+pmagic=0.02
 ## longitude en degres du centre du zoom                                 
 clon=0.

CONFIG/trunk/LMDZ4OR_v2/LMDZOR/PARAM/gcm.def_LMD14496

@@ -1 +1 @@
 ## $Id$
 ## nombre de pas par jour (multiple de iperiod) ( ici pour  dt = 1 min )      
-day_step=960
+day_step=720
 ## periode pour le pas Matsuno (en pas)
 iperiod=5
@@ -27 +27 @@
 physic=y
 ## periode de la physique (en pas)                                       
-iphysiq=20
+iphysiq=15
 ## frequence (en  jours ) de l'ecriture du fichier histphy               
 ecritphy=30
@@ -47 +47 @@
 iflag_con=3
 ## Facteur multiplication des precip convectives dans KE
-cvl_corr=1.02
+cvl_corr=1.0
 ## longitude en degres du centre du zoom                                 
 clon=0.

CONFIG/trunk/LMDZ4OR_v2/LMDZOR/PARAM/gcm.def_LMD9671

@@ -26 +26 @@
 ## avec ou sans physique                                                 
 physic=y
-##iflag_phys=1
 ## periode de la physique (en pas)                                       
 iphysiq=10
@@ -47 +46 @@
 ##  Flag  pour la convection (1 pour LMD, 2 pour Tiedtke, 3 KE, 4 KE vect)
 iflag_con=3
-##  Facteur multiplication des precip convectives dans KE
+## Facteur multiplication des precip convectives dans KE
 cvl_corr=1.0
 ## longitude en degres du centre du zoom                                 

CONFIG/trunk/LMDZ4OR_v2/LMDZOR/PARAM/orchidee.def

@@ -1 +1 @@
 #
 #
-# Parameter file for LMDz4OR_v2 configuration
-# See a complete french and english comment file on : 
-#  http://forge.ipsl.jussieu.fr/orchidee/
+# Parameter file for LMDZ4OR_v2 configuration
+# See comments : http://forge.ipsl.jussieu.fr/orchidee/
 #
-
-SECHIBA_restart_in= NONE
-SECHIBA_rest_out= sechiba_rest_out.nc
-SECHIBA_reset_time= y
-OUTPUT_FILE= sechiba_history.nc
-WRITE_STEP= 86400.0
-SECHIBA_HISTLEVEL= 6
-
-STOMATE_OK_CO2 = TRUE
-# For STOMATE :
+STOMATE_OK_CO2=TRUE
 # STOMATE_OK_STOMATE is not set
 # STOMATE_OK_DGVM is not set
 # STOMATE_WATCHOUT is not set
-#STOMATE_RESTART_FILEIN= stomate_rest_in.nc
-#STOMATE_FORCING_NAME= stomate_forcing.nc/" \
-#STOMATE_CFORCING_NAME= stomate_Cforcing.nc/" \
-#STOMATE_OUTPUT_FILE= stomate_history.nc
-#STOMATE_HIST_DT= 10.
-#STOMATE_HISTLEVEL= 5
-
+SECHIBA_restart_in=_start_sech_
+SECHIBA_rest_out=sechiba_rest.nc
+SECHIBA_reset_time=y
+# SECHIBA_reset_time is not set
+OUTPUT_FILE=sechiba_out.nc
+WRITE_STEP=_write_step_
+SECHIBA_HISTLEVEL=6
+STOMATE_OUTPUT_FILE=stomate_history.nc
+STOMATE_HIST_DT=10.
+STOMATE_HISTLEVEL=0
 SECHIBA_DAY=0.0
 SECHIBA_ZCANOP=0.5
@@ -38 +31 @@
 HYDROL_SNOW=0.0
 HYDROL_SNOWAGE=0.0
-# OLD MODEL HYDROL_HDRY= 1.0
 HYDROL_HUMR=1.0
-HYDROL_SOIL_DEPTH=2.
 HYDROL_BQSB=default
 HYDROL_GQSB=0.0
@@ -53 +44 @@
 LAI_MAP=y
 LAI_FILE=lai2D.nc
-SECHIBA_QSINT= 0.1
-ALB_BARE_MODEL=FALSE
-PERCENT_THROUGHFALL_PFT=30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30.
-RVEG_PFT= 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1., 1.
-CDRAG_FROM_GCM=.TRUE.
+SECHIBA_QSINT=0.02
+ALB_BARE_MODEL = FALSE
+PERCENT_THROUGHFALL_PFT = 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30., 30.
+RVEG_PFT = .5, .5, .5, .5, .5, .5, .5, .5, .5, .5, .5, .5, .5
+CDRAG_FROM_GCM = .TRUE.

CONFIG/trunk/LMDZ4OR_v2/LMDZOR/PARAM/physiq.def

@@ +1 @@
+# $Id$
 #
-## $Id$
+### OCEAN = force / slab  /couple
+OCEAN=force
+### VEGET= y si ORCHIDEE, =n si bucket
+VEGET=y
 #
-
-OCEAN=force
-VEGET=y
+# Parametres fichiers de sortie
+#
+### type_run = type run par rapport aux fichiers et variables de sortie
+# - type_run = CLIM/ENSP (=1)
+# - type_run = AMIP/CFMI (=2)
+type_run=AMIP
+### OK_journe= y sortir fichier journalier histday.nc, =n pas de fichier histday.nc
 OK_journe=n
+### OK_mensuel= y sortir fichier mensuel histmth.nc, =n pas de fichier histmth.nc
 OK_mensuel=y
+### OK_instan=y, ecrire sorties "instantannees" (chaque pas de temps de la  physique)
 OK_instan=n
+### OK_hf=y, ecrire sorties hautes frequence histhf.nc, =n pas de fichier histhf.nc
+ok_hf=n
+#
+# Parametres niveau de sorties differents fichiers 
+#
+### lev_histhf=0-4, niveau de sortie fichier "histhf.nc" 
+# - lev_histhf=0 => pas de sorties histhf.nc
+# - lev_histhf=2 => defaut
+# - lev_histhf=3 => variables sur niveaux standards
+# - lev_histhf=4 => histhf3d.nc champs 3d niveaux modele => fichier. histhf3d.nc
+lev_histhf=2
+### lev_histday=0-5, niveau de sortie fichier "histday.nc"
+# - lev_histday=0 => pas de sorties lev_histday.nc
+# - lev_histday=2 => defaut
+# - lev_histday=3 => + champs 3D => F. Lott
+# - lev_histday=4 => + champs sous-surfaces
+# - lev_histday=5 => + champs F. Aires
+lev_histday=2
+### lev_histmth=0-4, niveau de sortie fichier "histmth.nc"
+# - lev_histmth=0 => pas de sorties lev_histmth.nc
+# - lev_histmth=2 => defaut
+# - lev_histmth=3 => albedo, rugosite sous-surfaces
+# - lev_histmth=4 => champs tendances 3d
+lev_histmth=2
+### ecrit_hf = frequence ecriture fichier histhf.nc en jours
+ecrit_hf=0.250
+### ecrit_day = frequence ecriture fichier histday.nc en jours
+ecrit_day=1.
+### ecrit_mth = frequence ecriture fichier histmth.nc en jours
+ecrit_mth=30.
+### freqin_isccp = frequence input en secondes du simulateur ISCCP
+freq_ISCCP=10800.
+### freqout_isccp = frequence output en jours du simulateur ISCCP
+ecrit_ISCCP=30.
+### niveau du diagnostique de conservation d energie
 if_ebil=0
 #
 # parametres KE
 #
+### epmax = Efficacite precipitation maximale
 epmax = .99
+### ok_adj_ema = ?? pas utilise
 ok_adj_ema = n
+### iflag_clw Flag calcul eau liquide
+# - iflag_clw=0 : qcond_incld(i,l) = em_qcondc(l)
+# - iflag_clw=1 : qcond_incld(i,l) = em_qcond(l)
+# - iflag_clw=2 : eau liquide diagnostique en fonction de la Precip
 iflag_clw = 1
 # 
 # parametres nuages
 #
+### cld_lc_lsc  contenu en eau liquide des nuages large-scale (fisrtilp) 
 cld_lc_lsc = 2.6e-4
+### cld_lc_con  contenu en eau liquide des nuages convectifs (fisrtilp) 
 cld_lc_con = 2.6e-4
+### cld_tau_lsc  cte de temps utilisee pour eliminer l eau large-scale (fisrtilp) 
 cld_tau_lsc = 3600.
+### cld_tau_con  cte de temps utilisee pour eliminer l eau convective (fisrtilp) 
 cld_tau_con = 3600.
+### ffallv_lsc  cte utilisee dans calcul vitesse de chute cristaux de glace large-scale (fisrtilp) 
 ffallv_lsc = 1.
+### ffallv_lsc  cte utilisee dans calcul vitesse de chute cristaux de glace convectifs (fisrtilp) 
 ffallv_con = 1.
+### coef_eva  coef evaporation precips eau/glace (fisrtilp/fisrtilp_tr?/conlmd?) 
 coef_eva = 2.e-5
+### reevap_ice  reevaporation de toute la precip dans la couche du dessous pour la glace (fisrtilp) 
 reevap_ice = y
+### iflag_cldcon  flag pour calculer ratqsc=F(ratqsbas,fact_cldcon,q_seri) (physiq) 
+# - iflag_cldcon<=-1 diag. rain_Tiedtke 
+# - iflag_cldcon=1, ratqsc=ratqsbas+fact_cldcon*(q_seri(1)-q_seri(k))/q_seri(k)
+# - iflag_cldcon=1/2, ratqs=max(ratqs,ratqsc)
+# - iflag_cldcon=3,   ratqs=ratqss
 iflag_cldcon = 3
+### iflag_pdf :  flag calcul distribution sous-maille de l eau et des nuages 
+# - iflag_pdf=0, version ratqs, 
+# - iflag_pdf=1, calcul eau condensee, fraction nuageuse, eau nuageuse a partir
+# -              des PDFS de Sandrine Bony 
 iflag_pdf = 1
+### fact_cldcon  constante calcul ratqsc (voir iflag_cldcon) et proprietes nuages convectifs, clwcon0 (physiq.F) 
 fact_cldcon = 1.
+### facttemps=   facteur de relaxation de ratqs (iflag_cldcon=1/2) et rnebcon (iflag_cldcon=3)
 facttemps = 1.e-4
+## ok_newmicro   =y appel newmicro , =n appel nuage (calcul epaisseur optique et emmissivite des nuages) 
 ok_newmicro = y
+### ratqsbas     ratqs en bas si iflag_cldcon=1 
 ratqsbas = 0.005
+### ratqshaut    ratqs en haut pour ratqss "stables"  
 ratqshaut = 0.33
+### rad_froid    rayon cristaux des nuages de glace "froids" 
 rad_froid = 35
+### rad_chau1    rayon goutelettes d eau chauds", en haut: k=4-klev 
 rad_chau1=12
+### rad_chau2    rayon goutelettes d eau chauds", en bas: k=1-3  
 rad_chau2=11
+## ksta_ter      coef.diffusion minimale sur terre/sic/lic 
 ksta_ter=1.e-7
+### cdmmax =     cdrag maximum pour le moment
+cdmmax = 2.5E-3
+### cdhmax =     cdrag maximum pour l energie
+cdhmax = 2.0E-3
 #
-# parametres outputs
+# Parametres "orbitaux/ ere geologique"
 #
-# Flag pour hf : ok_hf=y/n
-ok_hf=n
-# Flag pour les variables de sorties : type_run=CLIM/AMIP
-# Pour ENSEMBLES mettre type_run=CLIM
-type_run=AMIP
-#niveau de sortie "hf" lev_histhf avec
-# - lev_histhf=3 => defaut
-# - lev_histhf=4 => histhf3d.nc champs 3d niveaux modele
-lev_histhf=3
-#niveau de sortie "day" lev_histday
-# - lev_histday=2 => defaut
-# - lev_histday=3 => + champs 3D => F. Lott
-# - lev_histday=4 => + champs sous-surfaces
-lev_histday=2
-#niveau de sortie "mth" lev_histmth avec
-# - lev_histmth=2 => defaut
-# - lev_histmth=3 => albedo, rugosite sous-surfaces
-# - lev_histmth=4 => champs tendances 3d
-lev_histmth=2
+### R_ecc =      Excentricite
+R_ecc = 0.016715
+### R_peri =     Equinoxe
+R_peri = 102.7
+### R_incl =     Inclinaison
+R_incl = 23.441
+### solaire =    Constante solaire
+solaire = 1365.
 #
-# parametres climatique
+# Taux gaz a effet de serre
 #
-R_ecc = 0.016715
-R_peri = 102.7
-R_incl = 23.441
-solaire = 1365.
+### co2_ppm =    taux CO2 en ppm
 co2_ppm = 348.
-#RCO2 = co2_ppm * 1.0e-06  * 44.011/28.97
-#RCO2 = 348. * 1.0e-06  * 44.011/28.97
-#RCO2 =   5.286789092164308E-04
-#RCO2 = 425.43e-06
+### CH4_ppb =    taux CH4 en ppb
 CH4_ppb = 1650.
-#RCH4 = 1.65E-06* 16.043/28.97
-#RCH4 =   9.137366240938903E-07
+### N2O_ppb =    taux N2O en ppb
 N2O_ppb = 306.
-#RN2O = 306.E-09* 44.013/28.97
-#RN2O =    4.648939592682085E-07
+### CFC11_ppt =  taux CFC11 en ppt
 CFC11_ppt = 280.
-#RCFC11 = 280.E-12* 137.3686/28.97
-#RCFC11 =    1.327690990680013E-09
+### CFC12_ppt =  taux CFC12 en ppt
 CFC12_ppt = 484.
-#RCFC12 = 484.E-12* 120.9140/28.97
-#RCFC12 =    2.020102726958923E-09
 #
-# parametres simulateur ISCCP
+# Parametres effets directs/indirects des "aerosols"
 #
+### ok_ade=y/n   flag Aerosol direct effect
+ok_ade=n
+### ok_aie=y/n   flag Aerosol indirect effect
+ok_aie=n
+### aer_type =   Aerosol variation type : actuel / preind / scenario
+aer_type=actuel
+### bl95_b0 =    Parameter in CDNC-maer link (Boucher&Lohmann 1995)
+bl95_b0=1.7
+### bl95_b1 =    Parameter in CDNC-maer link (Boucher&Lohmann 1995)
+bl95_b1=0.2
+#
+# Parametres simulateur ISCCP
+#
+### ok_isccp=y/n flag simulateur ISCCP
 ok_isccp=n
-#ok_regdyn : y/n calcul/non des regymes dynamiques sur regions pre-definies
-ok_regdyn=n
-#IM 310804 END
-#top_height = 1 ou 3
-top_height = 3
-#overlap = 1, 2 ou 3
+### top_height = flag choix calcul nuages par le simulateur en utilisant 
+# -              les donnees IR et/ou VIS et l algorithme ISCCP-D1
+# - top_height = 1 -> algo IR-VIS
+# - top_height = 2 -> identique a 1, mais "ptop(ibox)=pfull(ilev)"
+# - top_height = 3 -> algo IR
+top_height = 1
+### overlap =    Hypothese de Recouvrement (HR) utilisee pour le simulateur ISCCP
+# - overlap=1    Max overlap
+# - overlap=2    Random overlap
+# - overlap=3    Max/Random overlap
 overlap = 3
-#cdmmax
-cdmmax = 2.5E-3
-#cdhmax
-cdhmax = 2.0E-3
-# effets direct et indirect des aérosols
-ok_ade=n
-ok_aie=n
-aer_type=actuel
-bl95_b0=1.7
-bl95_b1=0.2

CONFIG/trunk/LMDZ4OR_v2/LMDZOR/PARAM/run.def

@@ -1 @@
-#
-# $Header: /home/ioipsl/CVSROOT/LMDZ4OR/CLIM_LMDZOR/PARAM/run.def,v 1.1 2006/12/21 10:17:36 adm Exp $
+# $Id$
 #
 INCLUDEDEF=physiq.def
@@ -17 +16 @@
 ## periode d'ecriture du fichier histoire (en jour)
 iecri=1
-## periode de stockage fichier histmoy (en jour)
-periodav=1.
+## flag de sortie dynzon
+ok_dynzon=n
+## periode de stockage fichier dynzon (en jour)
+periodav=30.
 ## activation du calcul d equilibrage de charge
-adjust=y
-## unite de sortie des impressions
-lunout=6
+adjust=_adjust_

CONFIG/trunk/LMDZ4OR_v2/LMDZOR/config.card

@@ +1 @@
+# $Id$
+# This is config.card file for restart with an NEW libIGCM simulation tree.
+#
 #========================================================================
 #D-- Compatibility -
 [Compatibility]
 libIGCM=1.0
-
-#========================================================================
 #D-- UserChoices -
 [UserChoices]
 #============================
-#D-- (<8 chars MAX for JobName)
-JobName=Lmd4Or1.9
-LongName='LMDz4OR with New scripts'
+#-- (<8 chars MAX for JobName)
+JobName=LMDZOR01
+LongName="Configuration de LMDZ4OR qui corresponde au version force de IPSLCM4_v2"
 TagName=LMDz4OR_v2
 #============================
-#D-- leap, noleap, 360d
+#-- leap, noleap, 360d
 CalendarType=360d
-#D-- Début et fin de Job
-#D-- "YYYY-MM-DD"
-DateBegin=1860-01-01
-DateEnd=1870-02-15
-#Job AMIP
-#DateBegin=1956-01-01
-#DateEnd=2005-12-30
+#-- Début et fin de Job
+#-- "YYYY-MM-DD"
+DateBegin=1980-01-01
+DateEnd=1989-12-30
 #============================
-#D-- 1Y, 1M, 5D, 1D
+#-- 1Y, 1M, 5D, 1D
 PeriodLength=1M
 #============================
@@ -30 +28 @@
 JobClass=multi
 #============================
-#-- Total Number of Processors (minimum is 2 for a coupled configuration)
-#JobNumProcTot=2
+#-- Total Number of Processors
 JobNumProcTot=4
 #============================
 #-- Run Options : here for oasis coupling
 JobRunOptions='"-np "${NUM_PROC_ATM}" -max_np "${NUM_PROC_ATM}'
-#============================
-PeriodNb=48
-
 #========================================================================
 #D-- ListOfComponents -
 [ListOfComponents]
 #D- For each component, Name of component, Tag of component
-ATM= (lmdz, LMDZ4_V3_1)
-SRF= (orchidee, orchidee_1_9_1)
+ATM= (lmdz, LMDZ4_V3_4)
+SRF= (orchidee, orchidee_1_9_2)
 
 #========================================================================
 #D-- Executable -
 [Executable]
-Name=gcm.e
+Name=lmdz.x
 #D- For each component, Real name of executable, Name of executable for oasis
-ATM= (gcm.e, gcm.e)
+ATM= (gcm.e, lmdz.x)
 SRF= ("", "")
 
@@ -61 +55 @@
 #D- Last day of the experience used as restart
 RestartDate=1869-12-30
-#D- Define restart simulation name (=> JOB_OS)
+#D- Define restart simulation name
 RestartJobName=CD1
-#D- Path Server Group Login (=> PSGL)
+#D- Path Server Group Login
 RestartPath=${ARCHIVE}/IGCM_OUT/LMDz4OR_v2
 # Attention login depend de la machine
@@ -73 +67 @@
 #D- frequency of rebuild submission
 RebuildFrequency=NONE
-#D- If you want to monitor variables, this flag determines
-#D- frequency of post-processing submission
-MonitoringFrequency=NONE
 #D- If you want to produce time series, this flag determines
 #D- frequency of post-processing submission
@@ -88 +79 @@
 #
 WriteFrequency="1M 1D HF"
-#D-- If config_Restarts_OverRule == 'n' all params are read
+# If config_Restarts_OverRule == 'n' all params are read
 Restart= n
-#D-- Last day of the experience used as restart
+# Last day of the experience used as restart
 RestartDate=1999-12-30
-#D-- Define restart simulation name
+# Define restart simulation name
 RestartJobName=2L18
 RestartPath=${ARCHIVE}/IGCM_OUT/LMDz4OR_v2
-#D-- Old component name for restart (if empty, use new name)
+# Old component name for restart (if empty, use new name)
 OldName=
 
@@ -103 +94 @@
 WriteFrequency="1M"
 Restart=n
-#D-- Last day of the experience used as restart
+##-- Last day of the experience used as restart
 RestartDate=1999-12-30
-#D-- Define restart simulation name
+# Define restart simulation name
 RestartJobName=2L18
 RestartPath=${ARCHIVE}/IGCM_OUT/LMDz4OR_v2
-#D-- Old component name for restart (if empty, use new name)
+#-- Old component name for restart (if empty, use new name)
 OldName=