Changeset 7510

Timestamp:

2022-03-07T15:09:04+01:00 (2 years ago)

Author:

josefine.ghattas

Message:

Corrected error in naming axis for nscm into ncsm. Now axis and grid all takes nscm as the name of the parameter.
Added grid_nscm and grid_nscm_out needed for variable interp_diag_soilclass. Corrected variable interp_diag_vegetrefrac
Add new file sechiba_interp_diag containing the variables read from file, after they have been read and interpolated from file with XIOS or with standard method in ORCHIDEE.

Location:

branches/ORCHIDEE_2_2/ORCHIDEE

Files:

• src_parallel/xios_orchidee.f90 (modified) (1 diff)
• src_xml/context_orchidee.xml (modified) (2 diffs)
• src_xml/field_def_orchidee.xml (modified) (1 diff)
• src_xml/file_def_orchidee.xml (modified) (1 diff)

branches/ORCHIDEE_2_2/ORCHIDEE/src_parallel/xios_orchidee.f90

@@ -358 +358 @@
        CALL xios_set_axis_attr("ngrnd",n_glo=ngrnd ,VALUE=znt(:))
        CALL xios_set_axis_attr("nstm", n_glo=nstm,VALUE=(/(REAL(i,r_std),i=1,nstm)/))
-       CALL xios_set_axis_attr("ncsm", n_glo=nscm,VALUE=(/(REAL(i,r_std),i=1,nscm)/))
+       CALL xios_set_axis_attr("nscm", n_glo=nscm,VALUE=(/(REAL(i,r_std),i=1,nscm)/))
        CALL xios_set_axis_attr("nnobio", n_glo=nnobio,VALUE=(/(REAL(i,r_std),i=1,nnobio)/))
        CALL xios_set_axis_attr("albtyp", n_glo=2,VALUE=(/(REAL(i,r_std),i=1,2)/))

branches/ORCHIDEE_2_2/ORCHIDEE/src_xml/context_orchidee.xml

@@ -70 +70 @@
     <axis id="albtyp" standard_name="model_level_number" long_name="Albedo types" unit="1"/>
     <axis id="nslm" name="solay" standard_name="model_level_number" long_name="Hydrological soil levels" unit="1"/>
-    <axis id="ncsm" name="ncsm"    standard_name="model_level_number" long_name="Soil type" unit="1"/>
+    <axis id="nscm" name="nscm" standard_name="model_level_number" long_name="Soil type" unit="1"/>
     <axis id="nsnow" name="snowlev" standard_name="model_level_number" long_name="Snow levels" unit="1"/>
     <axis id="P10" standard_name="model_level_number" long_name="Pool 10 years" unit="1"/>
@@ -145 +145 @@
     </grid>
 
+    <grid id="grid_nscm">
+      <domain domain_ref="domain_landpoints" />
+      <axis axis_ref="nscm" />
+    </grid>
+    <grid id="grid_nscm_out">
+      <domain domain_ref="domain_landpoints_out" />
+      <axis axis_ref="nscm" />
+    </grid>
+
     <grid id="grid_ngrnd">
       <domain domain_ref="domain_landpoints" />

branches/ORCHIDEE_2_2/ORCHIDEE/src_xml/field_def_orchidee.xml

@@ -360 +360 @@
     <field id="gpplut" name="gppLut" long_name="Gross primary productivity on Landuse tiles" unit="kgC m-2 s-1" grid_ref="grid_nlut" />
     <field id="interp_diag_aveget" name="interp_diag_aveget" long_name="aveget read from file" operation="once" freq_offset="0ts"/>
-    <field id="interp_diag_vegetrefrac" name="interp_diag_vegetrefrac" axis_ref="nvm" long_name="vegetfrac read from file" operation="once" freq_offset="0ts"/>
+    <field id="interp_diag_vegetrefrac" name="interp_diag_vegetrefrac" grid_ref="grid_nvm" long_name="vegetfrac read from file" operation="once" freq_offset="0ts"/>
     <field id="interp_diag_atext" name="interp_diag_atext" long_name="axtext read from file" operation="once" freq_offset="0ts"/>
-    <field id="interp_diag_soilclass" name="interp_diag_soilclass"     axis_ref="ncsm" long_name="soilclass read from file" operation="once" freq_offset="0ts"/>
+    <field id="interp_diag_soilclass" name="interp_diag_soilclass"     grid_ref="grid_nscm" long_name="soilclass read from file" operation="once" freq_offset="0ts"/>
     <field id="interp_diag_clayfraction" name="interp_diag_clayfraction" long_name="clayfraction read from file" operation="once" freq_offset="0ts" />
     <field id="interp_diag_aslope" name="interp_diag_aslope" long_name="aslope read from file" operation="once" freq_offset="0ts"   />

branches/ORCHIDEE_2_2/ORCHIDEE/src_xml/file_def_orchidee.xml

@@ -727 +727 @@
   </file>
 
+  <!-- Sechiba file 4 for checking interpolation of input files -->
+  <file id="sechiba4" name="sechiba_interp_diag" output_level="1" output_freq="1d" enabled=".TRUE.">
+   <field_group group_ref="remap_1mo" grid_ref="grid_landpoints_out" >
+
+      <field field_ref="interp_diag_aveget"  level="1"/>
+      <field field_ref="interp_diag_vegetrefrac" grid_ref="grid_nvm_out" level="1"/>
+      <field field_ref="interp_diag_atext"  level="1"/>
+      <field field_ref="interp_diag_soilclass" grid_ref="grid_nscm_out" level="1"/>
+      <field field_ref="interp_diag_clayfraction"  level="1"/>
+      <field field_ref="interp_diag_aslope"  level="1"/>
+      <field field_ref="interp_diag_reinf_slope"  level="1"/>
+      <field field_ref="interp_diag_alb_vis"  level="1"/>
+      <field field_ref="interp_diag_alb_nir"  level="1"/>
+      <field field_ref="interp_diag_N_qt_WRICE_year" level="1"/>
+      <field field_ref="interp_diag_N_qt_OTHER_year" level="1"/>
+      <field field_ref="interp_diag_flx_co2_bbg_year" level="1"/>
+<!--      <field field_ref="interp_diag_lai" grid_ref="grid_from_lai" level="1"/> -->
+      <field field_ref="interp_diag_reftemp" level="1"/>
+
+   </field_group>
+  </file>
+
+
   <!-- Definition of files with stomate diagnostics -->
   <!-- Stomate file 1 -->