Changeset 7485 for branches/ORCHIDEE_2_2

Timestamp:

2022-02-21T10:06:05+01:00 (3 years ago)

Author:

josefine.ghattas

Message:

Changed keyword PARAM_FILE into PARAM_SPMIP_FILE to more explicit.

Location:

branches/ORCHIDEE_2_2/ORCHIDEE

Files:

• orchidee.default (modified) (1 diff)
• src_sechiba/slowproc.f90 (modified) (3 diffs)

branches/ORCHIDEE_2_2/ORCHIDEE/orchidee.default

@@ -1522 +1522 @@
 SOILCLASS_FILE =  soils_param.nc 
 
-# PARAM_FILE ([FILE]) :  Name of file from which soil parameter  values are read        {params_sp_mip.nc}
-PARAM_FILE =  params_sp_mip.nc 
+# PARAM_SPMIP_FILE ([FILE]) :  Name of file from which soil parameter  values are read  {smipexp='maps'}
+PARAM_SPMIP_FILE =  params_sp_mip.nc 
 
 # SLOPE_NOREINF ([%]) :  Slope over which surface runoff does not reinfiltrate  {}

branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/slowproc.f90

@@ -236 +236 @@
 !!$    ! Get the file name from run.def file and set file attributes accordingly
 !!$    filename = 'params_sp_mip.nc'
-!!$    CALL getin_p('PARAM_FILE',filename)
+!!$    CALL getin_p('PARAM_SPMIP_FILE',filename)
 !!$    name = filename(1:LEN_TRIM(FILENAME)-3)
 !!$    CALL xios_orchidee_set_file_attr("soilparam_file",name=name)
@@ -3549 +3549 @@
               ! Read using IOIPSL and interpolate using aggregate tool in ORCHIDEE
 
-              !Config Key   = PARAM_FILE
+              !Config Key   = PARAM_SPMIP_FILE
               !Config Desc  = Name of file from which soil parameter  values are read
               !Config Def   = params_sp_mip.nc
-              !Config If    = params_sp_mip.nc
+              !Config If    = smipexp='maps'
               !Config Help  = The name of the file to be opened to read values of parameters.
               !Config         The data from this file is then interpolated to the grid of
@@ -3561 +3561 @@
 
               filename = 'params_sp_mip.nc'
-              CALL getin_p('PARAM_FILE',filename)
+              CALL getin_p('PARAM_SPMIP_FILE',filename)
 
               !! Variables for interpweight