Changeset 7375 for branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba

Timestamp:

2021-12-08T20:11:09+01:00 (3 years ago)

Author:

agnes.ducharne

Message:

Corrects two bugs: default value for nscm after r7337 and r7338; xios_interpolation now working, compared to r7339 (cf ticket #416). Note that xios_interpolation gives different results than "normal interpolation", see ticket #812.

File:

• branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/slowproc.f90 (modified) (2 diffs)

branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/slowproc.f90

@@ -127 +127 @@
        CALL xios_orchidee_set_fieldgroup_attr("soil_text",enabled=.FALSE.)
     END IF
-    
-
+
+    !! See commented part below for the reading of params_sp_mip.nc if spmipexp='maps'
+    !! (with a bug, but helpful)
+    
     !! 2. Prepare for reading of PFTmap file
     filename = 'PFTmap.nc'
@@ -223 +225 @@
     ENDIF
 
-    !Salma
-    !! 6. Prepare for reading of soil parameter files
-
-    ! Get the file name from run.def file and set file attributes accordingly
-    filename = 'params_sp_mip.nc'
-    CALL getin_p('PARAM_FILE',filename)
-    name = filename(1:LEN_TRIM(FILENAME)-3)
-    CALL xios_orchidee_set_file_attr("soilparam_file",name=name)
-    ! Determine if the file will be read by XIOS. If not, deactivate reading of the file.
-    IF (xios_interpolation .AND. restname_in=='NONE' .AND. .NOT. impsoilt) THEN
-       ! Reading will be done with XIOS later
-       IF (printlev>=2) WRITE(numout,*) 'Reading of soil hydraulic parameters file will be done later using XIOS. The filename is ', filename
-    ELSE
-       ! No reading by XIOS, deactivate soilparam_file and related variables declared in context_input_orchidee.xml.
-       ! If this is not done, the model will crash if the file is not available in the run directory.
-       IF (printlev>=2) WRITE(numout,*) 'Reading of soil parameter file will not be done with XIOS.'
-       CALL xios_orchidee_set_file_attr("soilparam_file",enabled=.FALSE.)
-       CALL xios_orchidee_set_field_attr("soilks",enabled=.FALSE.)
-       CALL xios_orchidee_set_field_attr("soilnvan",enabled=.FALSE.)
-       CALL xios_orchidee_set_field_attr("soilavan",enabled=.FALSE.)
-       CALL xios_orchidee_set_field_attr("soilmcr",enabled=.FALSE.)
-       CALL xios_orchidee_set_field_attr("soilmcs",enabled=.FALSE.)
-       CALL xios_orchidee_set_field_attr("soilmcfc",enabled=.FALSE.)
-       CALL xios_orchidee_set_field_attr("soilmcw",enabled=.FALSE.)
-    ENDIF
+    !! This part was introduced to prepare the reading of params_sp_mip.nc if spmipexp='maps'
+    !! but there are mistakes in the IF ELSE ENDIF and we go through ELSE
+    !! each time xios_interpolation = T, even if we don't need to read this file
+    !! and it is not provided by sechiba.card
+    !! The corresponding part in context_input_orchidee.xml is also commented
+    
+!!$    !! 6. Prepare for reading of soil parameter files
+!!$
+!!$    ! Get the file name from run.def file and set file attributes accordingly
+!!$    filename = 'params_sp_mip.nc'
+!!$    CALL getin_p('PARAM_FILE',filename)
+!!$    name = filename(1:LEN_TRIM(FILENAME)-3)
+!!$    CALL xios_orchidee_set_file_attr("soilparam_file",name=name)
+!!$    ! Determine if the file will be read by XIOS. If not, deactivate reading of the file.
+!!$    IF (xios_interpolation .AND. restname_in=='NONE' .AND. .NOT. impsoilt) THEN
+!!$       ! Reading will be done with XIOS later
+!!$       IF (printlev>=2) WRITE(numout,*) 'Reading of soil hydraulic parameters file will be done later using XIOS. The filename is ', filename
+!!$    ELSE
+!!$       ! No reading by XIOS, deactivate soilparam_file and related variables declared in context_input_orchidee.xml.
+!!$       ! If this is not done, the model will crash if the file is not available in the run directory.
+!!$       IF (printlev>=2) WRITE(numout,*) 'Reading of soil parameter file will not be done with XIOS.'
+!!$       CALL xios_orchidee_set_file_attr("soilparam_file",enabled=.FALSE.)
+!!$       CALL xios_orchidee_set_field_attr("soilks",enabled=.FALSE.)
+!!$       CALL xios_orchidee_set_field_attr("soilnvan",enabled=.FALSE.)
+!!$       CALL xios_orchidee_set_field_attr("soilavan",enabled=.FALSE.)
+!!$       CALL xios_orchidee_set_field_attr("soilmcr",enabled=.FALSE.)
+!!$       CALL xios_orchidee_set_field_attr("soilmcs",enabled=.FALSE.)
+!!$       CALL xios_orchidee_set_field_attr("soilmcfc",enabled=.FALSE.)
+!!$       CALL xios_orchidee_set_field_attr("soilmcw",enabled=.FALSE.)
+!!$    ENDIF
 
     IF (printlev_loc>=3) WRITE(numout,*) 'End slowproc_xios_intialize'