Changeset 7375 for branches/ORCHIDEE_2_2
- Timestamp:
- 2021-12-08T20:11:09+01:00 (3 years ago)
- Location:
- branches/ORCHIDEE_2_2/ORCHIDEE
- Files:
-
- 3 edited
-
src_parameters/constantes_soil_var.f90 (modified) (1 diff)
-
src_sechiba/slowproc.f90 (modified) (2 diffs)
-
src_xml/context_input_orchidee.xml (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/ORCHIDEE_2_2/ORCHIDEE/src_parameters/constantes_soil_var.f90
r7338 r7375 71 71 INTEGER(i_std), PARAMETER :: nscm_fao=3 !! For FAO Classification (unitless) 72 72 INTEGER(i_std), PARAMETER :: nscm_usda=13 !! For USDA Classification (unitless) 73 INTEGER(i_std), SAVE :: nscm=nscm_ fao!! Default value for nscm73 INTEGER(i_std), SAVE :: nscm=nscm_usda !! Default value for nscm 74 74 !$OMP THREADPRIVATE(nscm) 75 75 -
branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/slowproc.f90
r7339 r7375 127 127 CALL xios_orchidee_set_fieldgroup_attr("soil_text",enabled=.FALSE.) 128 128 END IF 129 130 129 130 !! See commented part below for the reading of params_sp_mip.nc if spmipexp='maps' 131 !! (with a bug, but helpful) 132 131 133 !! 2. Prepare for reading of PFTmap file 132 134 filename = 'PFTmap.nc' … … 223 225 ENDIF 224 226 225 !Salma 226 !! 6. Prepare for reading of soil parameter files 227 228 ! Get the file name from run.def file and set file attributes accordingly 229 filename = 'params_sp_mip.nc' 230 CALL getin_p('PARAM_FILE',filename) 231 name = filename(1:LEN_TRIM(FILENAME)-3) 232 CALL xios_orchidee_set_file_attr("soilparam_file",name=name) 233 ! Determine if the file will be read by XIOS. If not, deactivate reading of the file. 234 IF (xios_interpolation .AND. restname_in=='NONE' .AND. .NOT. impsoilt) THEN 235 ! Reading will be done with XIOS later 236 IF (printlev>=2) WRITE(numout,*) 'Reading of soil hydraulic parameters file will be done later using XIOS. The filename is ', filename 237 ELSE 238 ! No reading by XIOS, deactivate soilparam_file and related variables declared in context_input_orchidee.xml. 239 ! If this is not done, the model will crash if the file is not available in the run directory. 240 IF (printlev>=2) WRITE(numout,*) 'Reading of soil parameter file will not be done with XIOS.' 241 CALL xios_orchidee_set_file_attr("soilparam_file",enabled=.FALSE.) 242 CALL xios_orchidee_set_field_attr("soilks",enabled=.FALSE.) 243 CALL xios_orchidee_set_field_attr("soilnvan",enabled=.FALSE.) 244 CALL xios_orchidee_set_field_attr("soilavan",enabled=.FALSE.) 245 CALL xios_orchidee_set_field_attr("soilmcr",enabled=.FALSE.) 246 CALL xios_orchidee_set_field_attr("soilmcs",enabled=.FALSE.) 247 CALL xios_orchidee_set_field_attr("soilmcfc",enabled=.FALSE.) 248 CALL xios_orchidee_set_field_attr("soilmcw",enabled=.FALSE.) 249 ENDIF 227 !! This part was introduced to prepare the reading of params_sp_mip.nc if spmipexp='maps' 228 !! but there are mistakes in the IF ELSE ENDIF and we go through ELSE 229 !! each time xios_interpolation = T, even if we don't need to read this file 230 !! and it is not provided by sechiba.card 231 !! The corresponding part in context_input_orchidee.xml is also commented 232 233 !!$ !! 6. Prepare for reading of soil parameter files 234 !!$ 235 !!$ ! Get the file name from run.def file and set file attributes accordingly 236 !!$ filename = 'params_sp_mip.nc' 237 !!$ CALL getin_p('PARAM_FILE',filename) 238 !!$ name = filename(1:LEN_TRIM(FILENAME)-3) 239 !!$ CALL xios_orchidee_set_file_attr("soilparam_file",name=name) 240 !!$ ! Determine if the file will be read by XIOS. If not, deactivate reading of the file. 241 !!$ IF (xios_interpolation .AND. restname_in=='NONE' .AND. .NOT. impsoilt) THEN 242 !!$ ! Reading will be done with XIOS later 243 !!$ IF (printlev>=2) WRITE(numout,*) 'Reading of soil hydraulic parameters file will be done later using XIOS. The filename is ', filename 244 !!$ ELSE 245 !!$ ! No reading by XIOS, deactivate soilparam_file and related variables declared in context_input_orchidee.xml. 246 !!$ ! If this is not done, the model will crash if the file is not available in the run directory. 247 !!$ IF (printlev>=2) WRITE(numout,*) 'Reading of soil parameter file will not be done with XIOS.' 248 !!$ CALL xios_orchidee_set_file_attr("soilparam_file",enabled=.FALSE.) 249 !!$ CALL xios_orchidee_set_field_attr("soilks",enabled=.FALSE.) 250 !!$ CALL xios_orchidee_set_field_attr("soilnvan",enabled=.FALSE.) 251 !!$ CALL xios_orchidee_set_field_attr("soilavan",enabled=.FALSE.) 252 !!$ CALL xios_orchidee_set_field_attr("soilmcr",enabled=.FALSE.) 253 !!$ CALL xios_orchidee_set_field_attr("soilmcs",enabled=.FALSE.) 254 !!$ CALL xios_orchidee_set_field_attr("soilmcfc",enabled=.FALSE.) 255 !!$ CALL xios_orchidee_set_field_attr("soilmcw",enabled=.FALSE.) 256 !!$ ENDIF 250 257 251 258 IF (printlev_loc>=3) WRITE(numout,*) 'End slowproc_xios_intialize' -
branches/ORCHIDEE_2_2/ORCHIDEE/src_xml/context_input_orchidee.xml
r7260 r7375 33 33 34 34 <!-- Default file name: params_sp_mip.nc for both all soil hydraulic parameters. --> 35 <file id="soilparam_file" mode="read" output_freq="1y" enabled="true"> 36 <field id="soilks" name="soilks" domain_ref="dom_file_soil" operation="instant" freq_offset="1ts" > this > $min_sechiba ? 1e10 : 0 </field> 37 <field id="soilnvan" name="soilnvan" domain_ref="dom_file_soil" operation="instant" freq_offset="1ts" > this > $min_sechiba ? 1e10 : 0 </field> 38 <field id="soilavan" name="soilavan" domain_ref="dom_file_soil" operation="instant" freq_offset="1ts" > this > $min_sechiba ? 1e10 : 0 </field> 39 <field id="soilmcr" name="soilmcr" domain_ref="dom_file_soil" operation="instant" freq_offset="1ts" > this > $min_sechiba ? 1e10 : 0 </field> 40 <field id="soilmcs" name="soilmcs" domain_ref="dom_file_soil" operation="instant" freq_offset="1ts" > this > $min_sechiba ? 1e10 : 0 </field> 41 <field id="soilmcfc" name="soilmcfc" domain_ref="dom_file_soil" operation="instant" freq_offset="1ts" > this > $min_sechiba ? 1e10 : 0 </field> 42 <field id="soilmcw" name="soilmcw" domain_ref="dom_file_soil" operation="instant" freq_offset="1ts" > this > $min_sechiba ? 1e10 : 0 </field> 43 </file> 44 45 35 <!--file id="soilparam_file" mode="read" output_freq="1y" enabled="true"--> 36 <!--field id="soilks" name="soilks" domain_ref="dom_file_soil" operation="instant" freq_offset="1ts" > this > $min_sechiba ? 1e10 : 0 </field--> 37 <!--field id="soilnvan" name="soilnvan" domain_ref="dom_file_soil" operation="instant" freq_offset="1ts" > this > $min_sechiba ? 1e10 : 0 </field--> 38 <!--field id="soilavan" name="soilavan" domain_ref="dom_file_soil" operation="instant" freq_offset="1ts" > this > $min_sechiba ? 1e10 : 0 </field--> 39 <!--field id="soilmcr" name="soilmcr" domain_ref="dom_file_soil" operation="instant" freq_offset="1ts" > this > $min_sechiba ? 1e10 : 0 </field--> 40 <!--field id="soilmcs" name="soilmcs" domain_ref="dom_file_soil" operation="instant" freq_offset="1ts" > this > $min_sechiba ? 1e10 : 0 </field--> 41 <!--field id="soilmcfc" name="soilmcfc" domain_ref="dom_file_soil" operation="instant" freq_offset="1ts" > this > $min_sechiba ? 1e10 : 0 </field--> 42 <!--field id="soilmcw" name="soilmcw" domain_ref="dom_file_soil" operation="instant" freq_offset="1ts" > this > $min_sechiba ? 1e10 : 0 </field--> 43 <!--/file--> 44 46 45 <file id="PFTmap_file" mode="read" output_freq="1y"> 47 46 <field id="maxvegetfrac_read" name="maxvegetfrac" domain_ref="dom_file_pft" axis_ref="nvm" operation="instant" freq_offset="1ts"> this < 1e10 ? this : 0 </field>
Note: See TracChangeset
for help on using the changeset viewer.
