Changeset 2757

Timestamp:

02/25/16 15:57:51 (8 years ago)

Author:

jgipsl

Message:

Some update in LMDZOR_v6 configuration: the parameters LAND_USE and LAND_COVER_CHANGE do not exist in ORCHIDEE trunk source code any more.

Location:

CONFIG/UNIFORM/v6/LMDZOR_v6

Files:

• EXPERIMENTS/LMDZ/CREATE_amip/COMP/lmdz.card (modified) (1 diff)
• EXPERIMENTS/LMDZ/CREATE_clim/COMP/lmdz.card (modified) (1 diff)
• EXPERIMENTS/LMDZOR/amip/COMP/orchidee.card (modified) (1 diff)
• EXPERIMENTS/LMDZOR/clim/COMP/orchidee.card (modified) (1 diff)
• GENERAL/DRIVER/orchidee.driver (modified) (1 diff)
• GENERAL/PARAM/orchidee.def_Choi (modified) (2 diffs)

CONFIG/UNIFORM/v6/LMDZOR_v6/EXPERIMENTS/LMDZ/CREATE_amip/COMP/lmdz.card

@@ -33 +33 @@
         (${R_IN}/ATM/Rugos.nc, .), \
         (${R_IN}/ATM/landiceref.nc, .)
-### Please, add the o2a.nc file to fit with the coupled configuration associated
-### Note that this file is different for different versions of the coupled model
+
+### Optional: Add the o2a.nc file to fit with the coupled configuration for the 
+### land-sea mask. This file is different for different versions of the coupled model and
+### the different resolutions. Choose between following to fit with IPSLCM6 coupled model:
+#       (${R_IN}/ATM/IPSLCM6/eORCA1.1xLMD144142/o2a.nc, o2a.nc)
 #       (${R_IN}/ATM/IPSLCM6/ORCA2.3x9695_v1/o2a.nc, o2a.nc)
+
 
 [ParametersFiles]

CONFIG/UNIFORM/v6/LMDZOR_v6/EXPERIMENTS/LMDZ/CREATE_clim/COMP/lmdz.card

@@ -34 +34 @@
         (${R_IN}/ATM/AMIP_2014/sst_bc_clim.nc, amipbc_sst_1x1.nc), \
         (${R_IN}/ATM/AMIP_2014/sic_bc_clim.nc, amipbc_sic_1x1.nc)
-### Please, add the o2a.nc file to fit with the coupled configuration associated
-### Note that this file is different for different versions of the coupled model
+
+### Optional: Add the o2a.nc file to fit with the coupled configuration for the 
+### land-sea mask. This file is different for different versions of the coupled model and
+### the different resolutions. Choose between following to fit with IPSLCM6 coupled model:
+#       (${R_IN}/ATM/IPSLCM6/eORCA1.1xLMD144142/o2a.nc, o2a.nc)
 #       (${R_IN}/ATM/IPSLCM6/ORCA2.3x9695_v1/o2a.nc, o2a.nc)
+
 
 [ParametersFiles]

CONFIG/UNIFORM/v6/LMDZOR_v6/EXPERIMENTS/LMDZOR/amip/COMP/orchidee.card

@@ -10 +10 @@
 
 VEGET_UPDATE=1Y
-LAND_COVER_CHANGE=y
 
 [InitialStateFiles]

CONFIG/UNIFORM/v6/LMDZOR_v6/EXPERIMENTS/LMDZOR/clim/COMP/orchidee.card

@@ -10 +10 @@
 
 VEGET_UPDATE=0Y
-LAND_COVER_CHANGE=n
 
 [InitialStateFiles]

CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL/DRIVER/orchidee.driver

@@ -44 +44 @@
     fi
 
-    # Modify in orchidee.def VEGET_UPDATE and LAND_COVER_CHANGE if they are set in orchidee.card section UserChoices
+    # Modify in orchidee.def VEGET_UPDATE if it is set in orchidee.card section UserChoices
     if [ ! X${orchidee_UserChoices_VEGET_UPDATE} = X ] ; then
         IGCM_comp_modifyDefFile nonblocker orchidee.def VEGET_UPDATE   ${orchidee_UserChoices_VEGET_UPDATE}
     else
         IGCM_comp_modifyDefFile nonblocker orchidee.def VEGET_UPDATE 0Y
-    fi
-    if [ ! X${orchidee_UserChoices_LAND_COVER_CHANGE} = X ] ; then
-        IGCM_comp_modifyDefFile nonblocker orchidee.def LAND_COVER_CHANGE ${orchidee_UserChoices_LAND_COVER_CHANGE}
-    else
-        IGCM_comp_modifyDefFile nonblocker orchidee.def LAND_COVER_CHANGE n
     fi
 

CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL/PARAM/orchidee.def_Choi

@@ -62 +62 @@
 # Parmeters related to vegetation map
 #**************************************************************************
-# Read a land_use vegetation map
-# default = n
-LAND_USE = y
-
 # Year of the land_use vegetation map readed
 # year off the pft map
@@ -83 +79 @@
 VEGET_UPDATE = _AUTO_
 
-# treat land use modifications
-# With this variable, you can use a Land Use map
-# to simulate anthropic modifications such as   
-# deforestation.                                
-# If LAND_USE
-# default = y
-LAND_COVER_CHANGE = _AUTO_
-
 # Do not use default fire module
 FIRE_DISABLE = y