Changeset 1592

Timestamp:

11/23/11 16:23:47 (13 years ago)

Author:

jgipsl

Message:

Changed to use PFTmap from annual files (instead of a big file with all years of PFTmap).
If simulation outside the year interval 1850-2005, then orchidee.card must be edited.

Location:

CONFIG/LMDZOR/branches/LMDZOR_v4/LMDZOR/COMP

Files:

• orchidee.card_AMIP (modified) (1 diff)
• orchidee.driver (modified) (2 diffs)

CONFIG/LMDZOR/branches/LMDZOR_v4/LMDZOR/COMP/orchidee.card_AMIP

@@ -10 +10 @@
 [InitialStateFiles]
 List=   (${R_INIT}/SRF/${config_UserChoices_TagName}/soils_param.nc,      . ), \
-        (${R_INIT}/SRF/${config_UserChoices_TagName}/routing.nc,          . )
+        (${R_INIT}/SRF/${config_UserChoices_TagName}/routing.nc,          . ), \
+        (${R_BC}/SRF/${config_UserChoices_TagName}/PFTmap_1850to2005_AR5_LUHa.rc2/PFTmap_IPCC_${year}.nc, PFTmap.nc)
 
 [BoundaryFiles]
-List= (${BC_SRF_PFTmap}, PFTmap.nc)
+List= ()
 ListNonDel= ()
-#Tous les 5 ans :
-#ListNonDel= (${BC_SRF_PFTmap}, PFTmap.nc)
 
 [SmoothFiles]
-List=()
+List=(${R_BC}/SRF/${config_UserChoices_TagName}/PFTmap_1850to2005_AR5_LUHa.rc2/PFTmap_IPCC_${year_p1}.nc, PFTmap.nc, 12:12:)
+
 
 [ParametersFiles]

CONFIG/LMDZOR/branches/LMDZOR_v4/LMDZOR/COMP/orchidee.driver

@@ -31 +31 @@
 
     IGCM_debug_PopStack "SRF_Initialize"
-}
-
-#-----------------------------------------------------------------
-function SRF_PeriodStart
-{
-
-    IGCM_debug_PushStack "SRF_PeriodStart"
-    if [ ${year} -gt 2004 ] ; then
-
-        PFTmap="${R_BC}/SRF/${config_UserChoices_TagName}/ORCHIDEE_PFTmap_2006to2100_AR5_RCP8.5_MESSAGE.nc"
-        if [ ${year} -eq 2005 ] ; then
-            IGCM_sys_Rm -f PFTmap.nc
-        fi
-
-    else
-        PFTmap="${R_BC}/SRF/${config_UserChoices_TagName}/PFTmap_1850to2005_AR5_LUHa.rc2.nc"
-    fi
-
-    BC_SRF_PFTmap=${PFTmap}
-
-    IGCM_debug_PopStack "SRF_PeriodStart"
-
 }
 
@@ -109 +87 @@
     esac
 
-    # Dans le cas de test :
-#    if [ ${year} -eq 1979 ] ; then
-#       ORCHIDEE_sed VEGET_REINIT y
-#       ORCHIDEE_sed VEGET_YEAR 131
-#    fi
-#    
-#    # Dans le cas historique :
-#    if [ ${year} -eq 2005 ] ; then
-#       ORCHIDEE_sed VEGET_REINIT y
-#       ORCHIDEE_sed VEGET_YEAR 1
-##      ORCHIDEE_sed VEGET_UPDATE '0Y'
-#    fi
-
-#     # Dans le cas sans changement de carte aprÚs 2005 
-#     if [ ${year} -gt 2005 ] ; then
-#       ORCHIDEE_sed VEGET_UPDATE '0Y'
-#     fi
- 
     ORCHIDEE_sed HYDROL_CWRR ${orchidee_UserChoices_NEWHYDROL}