Changeset 382 for branches/ORCHIDEE_EXT/ORCHIDEE_OL/OOL_SEC_STO

Timestamp:

2011-08-01T16:11:34+02:00 (13 years ago)

Author:

didier.solyga

Message:

Merge the revisions 373 + 376 to 389 from the trunk in the externalized version

Location:

branches/ORCHIDEE_EXT/ORCHIDEE_OL/OOL_SEC_STO/COMP

Files:

• orchidee_ol.card (modified) (1 diff)
• sechiba.card (modified) (1 diff)
• sechiba.driver (modified) (3 diffs)
• stomate.card (modified) (2 diffs)
• stomate.driver (modified) (2 diffs)

branches/ORCHIDEE_EXT/ORCHIDEE_OL/OOL_SEC_STO/COMP/orchidee_ol.card

@@ -30 +30 @@
 
 [OutputText]
-List=   (used_driver.def, out_orchidee_ol)
+List=   (used_driver.def, used_run.def, out_orchidee_ol)
 # avec la // : out_orchidee_*
 

branches/ORCHIDEE_EXT/ORCHIDEE_OL/OOL_SEC_STO/COMP/sechiba.card

@@ -5 +5 @@
 LAIMAP=n
 IMPOSE_VEG=n
+# if IMPOSE_VEG = n
 LAND_USE=n
+# if LAND_USE=y
 VEGET_UPDATE=1Y
+# if LAND_USE=n and we want to use carteveg5km.nc for maxvegetfrac map.
+# (instead of default PFTmap_1850to2005_AR5_LUHa.rc2 below)
+OLD_VEGET=n
 ROUTING=n
 NEWHYDROL=n

branches/ORCHIDEE_EXT/ORCHIDEE_OL/OOL_SEC_STO/COMP/sechiba.driver

@@ -63 +63 @@
     typeset SECHIBA_WRITE_STEP
 
+    # Get WriteFrenquecies from config.card for SECHIBA
     SRF_WriteFrequency=$( echo ${config_SRF_WriteFrequency} | sed -e 's/\([0-9]*[yYmMdDs]\).*/\1/' ) 
     case ${SRF_WriteFrequency} in
@@ -109 +110 @@
             IGCM_debug_Verif_Exit ;;
     esac
-
-    SECHIBA_sed STOMATE_OK_CO2 ${sechiba_UserChoices_OKCO2}
-
-    SECHIBA_sed RIVER_ROUTING ${sechiba_UserChoices_ROUTING}
-    SECHIBA_sed HYDROL_CWRR ${sechiba_UserChoices_NEWHYDROL}
-
     SECHIBA_sed WRITE_STEP ${SECHIBA_WRITE_STEP}
     SECHIBA_sed SECHIBA_HISTLEVEL ${sechiba_UserChoices_sechiba_LEVEL}
@@ -123 +118 @@
     SECHIBA_sed WRITE_STEP2 10800.0
 
-    if [ X${sechiba_UserChoices_LAND_USE} = Xy ] ; then
-      SECHIBA_sed LAND_USE ${sechiba_UserChoices_LAND_USE}
-      SECHIBA_sed VEGET_UPDATE ${sechiba_UserChoices_VEGET_UPDATE}
+    SECHIBA_sed STOMATE_OK_CO2 ${sechiba_UserChoices_OKCO2}
 
-      ##MM : cutting PFTmaps of ORCHIDEE : for first year without restart, we must use this year map
-      ##     WARNING : the next year map must be avaible and the december month, then this device will
-      ##               only work with PeriodLength scrictly less than 1Y.
-      # If you want to come back to old BIG LAND USE file
-      # (to run on multipple years, just one time with LAND USE activated), 
-      # you must 
-      # comment all next 8 lines and check correct parameters in sechiba.def file
-      # for your LAND USE specific file.
-        SECHIBA_sed VEGET_REINIT y
-        if ( [ ${CumulPeriod} -eq 1 ] && [ "${config_SRF_Restart}" = "n" ] ) ; then
-            SECHIBA_sed VEGET_YEAR 1
-        else
-            SECHIBA_sed VEGET_YEAR 0
-            IGCM_sys_Mv -f PFTmap_IPCC_${year_p1}.nc PFTmap.nc
+    SECHIBA_sed RIVER_ROUTING ${sechiba_UserChoices_ROUTING}
+    SECHIBA_sed HYDROL_CWRR ${sechiba_UserChoices_NEWHYDROL}
+
+    if [ X${sechiba_UserChoices_IMPOSE_VEG} = Xn ] ; then
+        if [ X${sechiba_UserChoices_LAND_USE} = Xy ] ; then
+            SECHIBA_sed VEGET_UPDATE ${sechiba_UserChoices_VEGET_UPDATE}
+
+            ##MM : cutting PFTmaps of ORCHIDEE : for first year without restart, we must use this year map
+            ##     WARNING : the next year map must be avaible and the december month, then this device will
+            ##               only work with PeriodLength scrictly less than 1Y.
+            # If you want to come back to old BIG LAND USE file
+            # (to run on multipple years, just one time with LAND USE activated), 
+            # you must 
+            # comment all next 8 lines and check correct parameters in sechiba.def file
+            # for your LAND USE specific file.
+            SECHIBA_sed VEGET_REINIT y
+            if ( [ ${CumulPeriod} -eq 1 ] && [ "${config_SRF_Restart}" = "n" ] ) ; then
+                SECHIBA_sed VEGET_YEAR 1
+            else
+                SECHIBA_sed VEGET_YEAR 0
+                IGCM_sys_Mv -f PFTmap_IPCC_${year_p1}.nc PFTmap.nc
+            fi
+        elif [ X${sechiba_UserChoices_OLD_VEGET} = Xy ] ; then
+            SECHIBA_sed LAND_USE n
         fi
+    else
+        SECHIBA_sed IMPOSE_VEG y
     fi
 
-    SECHIBA_sed IMPOSE_VEG ${sechiba_UserChoices_IMPOSE_VEG}
-    
     if ( [ ${CumulPeriod} -eq 1 ] && [ "${config_SRF_Restart}" = "n" ] ) ; then
         SECHIBA_sed SECHIBA_reset_time y

branches/ORCHIDEE_EXT/ORCHIDEE_OL/OOL_SEC_STO/COMP/stomate.card

@@ -38 +38 @@
 TimeSeriesVars2D= (T2M_MONTH,CONTFRAC,RESOLUTION_X,RESOLUTION_Y,CONVFLUX,CFLUX_PROD10,CFLUX_PROD100,CO2FLUX_MONTHLY_SUM,HARVEST_ABOVE)
 ChunckJob2D = NONE
-TimeSeriesVars3D = (CO2FLUX,LAI,VEGET,VEGET_MAX,NPP,GPP,HET_RESP,MAINT_RESP,GROWTH_RESP,AGE,HEIGHT,TOTAL_M,TOTAL_BM_LITTER,TOTAL_SOIL_CARB)
+TimeSeriesVars3D= (CO2FLUX,LAI,VEGET,VEGET_MAX,NPP,GPP,HET_RESP,MAINT_RESP,GROWTH_RESP,AGE,HEIGHT,TOTAL_M,TOTAL_BM_LITTER,TOTAL_SOIL_CARB,ADAPTATION,REGENERATION)
 ChunckJob3D = NONE
 Seasonal=ON
@@ -45 +45 @@
 Patches= ()
 GatherWithInternal= (lon, lat, PFT, time_counter, Areas)
-TimeSeriesVars2D=(cVeg, cLitter, cSoil, cProduct, lai, gpp, ra, npp, rh, fFire, fHarvest, fLuc, nbp, fVegLitter, fLitterSoil, cLeaf, cWood, cRoot, cMisc, cLitterAbove, cLitterBelow, cSoilFast, cSoilMedium, cSoilSlow, landCoverFrac, treeFracPrimDec, treeFracPrimEver, c3PftFrac, c4PftFrac, rGrowth, rMaint, nppLeaf, nppWood, nppRoot, nep)
+TimeSeriesVars2D=(cVeg, cLitter, cSoil, cProduct, cMassVariation, lai, gpp, ra, npp, rh, fFire, fHarvest, fLuc, nbp, fVegLitter, fLitterSoil, cLeaf, cWood, cRoot, cMisc, cLitterAbove, cLitterBelow, cSoilFast, cSoilMedium, cSoilSlow, landCoverFrac, treeFracPrimDec, treeFracPrimEver, c3PftFrac, c4PftFrac, rGrowth, rMaint, nppLeaf, nppWood, nppRoot, nep)
 ChunckJob2D = NONE
 TimeSeriesVars3D=()

branches/ORCHIDEE_EXT/ORCHIDEE_OL/OOL_SEC_STO/COMP/stomate.driver

@@ -32 +32 @@
     
     IGCM_debug_PopStack "SBG_Initialize"
+}
+
+#-----------------------------------------------------------------
+function SBG_PeriodStart
+{
+    IGCM_debug_PushStack "SBG_PeriodStart"
+
+    IGCM_debug_PopStack "SBG_PeriodStart"
 }
 
@@ -105 +113 @@
 function SBG_Finalize
 {
-#set -vx
     IGCM_debug_PushStack "SBG_Finalize"