Changeset 793 for CONFIG/IPSLCM/IPSLCM5/branches/IPSLCM5_v2/EXP00/COMP

Timestamp:

11/12/09 18:28:39 (15 years ago)

Author:

sdipsl

Message:

• First step towards sechiba+stomate in IPSLCM5_v2
  • add SBG comonent SurfaceBioGeoChemistry? (stomate)
  • merge orchidee.def with the one in EXPBIOS and EXPLAND from IPSLCM5_WORK
  • use ENSEMBLES PFT vegetation map for initialization (new one to come)
• Del svn:executable property for some card and driver

SD, ACa, MM

Location:

CONFIG/IPSLCM/IPSLCM5/branches/IPSLCM5_v2/EXP00/COMP

Files:

• opa9.card (modified) (1 prop)
• opa9.card.noiomput (modified) (1 prop)
• opa9.driver (modified) (1 prop)
• opa9.driver.noiomput (modified) (1 prop)
• orchidee.card (modified) (3 diffs)
• orchidee.driver (modified) (2 diffs)
• stomate.card (added)
• stomate.driver (added)

CONFIG/IPSLCM/IPSLCM5/branches/IPSLCM5_v2/EXP00/COMP/orchidee.card

@@ -3 +3 @@
 
 [UserChoices]
+NEWHYDROL=n
+sechiba_LEVEL=10
 
 [InitialStateFiles]
-List=   (${R_INIT}/SRF/${config_UserChoices_TagName}/carteveg5km.nc, .), \
-        (${R_INIT}/SRF/${config_UserChoices_TagName}/soils_param.nc, .), \
+List=   (${R_INIT}/SRF/${config_UserChoices_TagName}/soils_param.nc, .), \
         (${R_INIT}/SRF/${config_UserChoices_TagName}/routing.nc, .)
-#       (${R_INIT}/SRF/${config_UserChoices_TagName}/PFTmap.1980.nc, pft_new.nc)
 
 [BoundaryFiles]
 List=   ()
-ListNonDel= (${R_BC}/SRF/${config_UserChoices_TagName}/lai2D.nc, .)
+ListNonDel= (${R_BC}/SRF/${config_UserChoices_TagName}/PFTmap.20C3M.nc, PFTmap.nc)
 
 [ParametersFiles]
@@ -18 +18 @@
 
 [RestartFiles]
-List=   (sechiba_rest.nc, sechiba_rest.nc, start_sech.nc)
+# 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)
 
 [OutputText]
@@ -24 +25 @@
 
 [OutputFiles]
-List=   (sechiba_out.nc, ${R_OUT_SRF_O_M}/${PREFIX}_1M_sechiba_history.nc, Post_1M_sechiba_history)
+List=   (sechiba_history.nc, ${R_OUT_SRF_O_M}/${PREFIX}_1M_sechiba_history.nc, Post_1M_sechiba_history) \
+        (sechiba_out_2.nc, ${R_OUT_SRF_O_M}/${PREFIX}_1M_sechiba_out2.nc, NONE) \
+        (watchout.nc, ${R_OUT_SRF_O_M}/${PREFIX}_1M_watchout.nc, NONE)
 
 [Post_1M_sechiba_history]
 Patches = (Patch_20091030_histcom_time_axis)
 GatherWithInternal = (lon, lat, veget, time_counter, Areas)
-TimeSeriesVars = (alb_nir, alb_vis, bqsb, evap, fluxlat, fluxsens, gqsb, netrad, qair, lai, rain, runoff, snow, snowf, snownobio, subli, tair, temp_sol, tsol_max, tsol_min, drainage)
+TimeSeriesVars = (lai, maxvegetfrac, vegetfrac, nobiofrac, alb_nir, alb_vis, bqsb, evap, fluxlat, fluxsens, gqsb, netrad, qair, rain, runoff, snow, snownobio, snowf, subli, tair, temp_sol, tsol_max, tsol_min, drainage, CO2FLUX)

CONFIG/IPSLCM/IPSLCM5/branches/IPSLCM5_v2/EXP00/COMP/orchidee.driver

@@ -67 +67 @@
     esac
 
+    ORCHIDEE_sed HYDROL_CWRR ${orchidee_UserChoices_NEWHYDROL}
+
     ORCHIDEE_sed WRITE_STEP ${SECHIBA_WRITE_STEP}
+    ORCHIDEE_sed SECHIBA_HISTLEVEL ${orchidee_UserChoices_sechiba_LEVEL}
 
 ##    if [ ${year} -eq 1950 ] ; then
@@ -75 +78 @@
 ##    fi
 
-    if ( [ ${CumulPeriod} -eq 1 ] && [ "${config_SRF_Restart}" = "n" ] ) ; then
-        ORCHIDEE_sed SECHIBA_reset_time y
-    else
-        ORCHIDEE_sed SECHIBA_restart_in start_sech.nc
-        ORCHIDEE_sed SECHIBA_reset_time y
+    if ( [ ${CumulPeriod} -ne 1 ] || [ "${config_SRF_Restart}" != "n" ] ) ; then
+        ORCHIDEE_sed SECHIBA_restart_in sechiba_rest_in.nc
     fi