Changeset 7515 for branches


Ignore:
Timestamp:
2022-03-10T16:32:09+01:00 (3 years ago)
Author:
josefine.ghattas
Message:

Reorganizing in output variables related to validation of interpolation, see ticket #812

  • Regrouped all output variables after interpolation into the new file sechiba_inter_diag
  • Renamed output variables axxx for availabilty for interpolation into interp_avail_axxx
  • Added some more variables needed to validate interpolation for pftmap and soils_param files
  • Set level to only output the final variables after interpolation
  • Removed variable "aveget5k" from field_def not sent from fortran code anymore
Location:
branches/ORCHIDEE_2_2/ORCHIDEE
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/condveg.f90

    r7266 r7515  
    10481048  !! 1. Open file and allocate memory 
    10491049 
     1050  IF (grid_type==unstructured) THEN 
     1051     CALL ipslerr_p(3,'condveg_soilalb','Reading of SOILALB_FILE must be implemented with XIOS to be used for unstructured grid.', & 
     1052             'Use option alb_bg_modis for unstructured grid for now.','') 
     1053  END IF 
     1054 
     1055 
    10501056  ! Open file with soil colours  
    10511057 
    … …  
    11841190 
    11851191  ! Write diagnostics 
    1186   CALL xios_orchidee_send_field("asoilcol",asoilcol) 
     1192  CALL xios_orchidee_send_field("interp_avail_asoilcol",asoilcol) 
    11871193 
    11881194 
    … …  
    13521358    CALL xios_orchidee_send_field("interp_diag_alb_vis",soilalb_bg(:,ivis)) 
    13531359    CALL xios_orchidee_send_field("interp_diag_alb_nir",soilalb_bg(:,inir)) 
    1354     CALL xios_orchidee_send_field("aalb_bg",aalb_bg) 
     1360    CALL xios_orchidee_send_field("interp_avail_aalb_bg",aalb_bg) 
    13551361     
    13561362  END SUBROUTINE condveg_background_soilalb 

  • branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/slowproc.f90

    r7511 r7515  
    24262426 
    24272427    ! Write diagnostics 
    2428     CALL xios_orchidee_send_field("alaimap",alaimap) 
     2428    CALL xios_orchidee_send_field("interp_avail_alaimap",alaimap) 
    24292429    CALL xios_orchidee_send_field("interp_diag_lai",laimap) 
    24302430    
    … …  
    26002600 
    26012601    IF ( .NOT. partial_update ) THEN 
     2602       ! Case for not DGVM or (DGVM and init) 
    26022603       veget_next(:,:)=zero 
    26032604        
    … …  
    27772778 
    27782779    ! Write diagnostics 
    2779     CALL xios_orchidee_send_field("aveget",aveget) 
    2780     CALL xios_orchidee_send_field("interp_diag_aveget",aveget) 
     2780    CALL xios_orchidee_send_field("interp_avail_aveget",aveget) 
    27812781    CALL xios_orchidee_send_field("interp_diag_vegetrefrac",vegetrefrac) 
     2782    CALL xios_orchidee_send_field("interp_diag_veget_next",veget_next) 
    27822783 
    27832784    IF (printlev_loc >= 3) WRITE(numout,*) '  slowproc_readvegetmax ended' 
    … …  
    30963097 
    30973098    ELSE ! spmipexp is either exp1=maps, or texture for exp2 or exp3 (or typing error!) 
    3098         
     3099         
    30993100       ! In these cases (maps or texture), we need to read the soil texture map 
    31003101        
    … …  
    36713672         ENDIF 
    36723673       ENDIF 
    3673    ENDIF ! SPMIPEXP  
    3674               
     3674   ENDIF ! SPMIPEXP 
     3675    
    36753676    ! Write diagnostics 
    3676     CALL xios_orchidee_send_field("atext",atext) 
    3677     CALL xios_orchidee_send_field("interp_diag_atext",atext) 
     3677    CALL xios_orchidee_send_field("interp_avail_atext",atext) 
    36783678    CALL xios_orchidee_send_field("interp_diag_soilclass",soilclass) 
     3679    CALL xios_orchidee_send_field("interp_diag_njsc",REAL(njsc, r_std)) 
    36793680    CALL xios_orchidee_send_field("interp_diag_clayfraction",clayfraction) 
     3681    CALL xios_orchidee_send_field("interp_diag_sandfraction",sandfraction) 
     3682    CALL xios_orchidee_send_field("interp_diag_siltfraction",siltfraction) 
    36803683     
    36813684    IF (printlev_loc >= 3) WRITE(numout,*) '  slowproc_soilt ended' 
    … …  
    38193822     
    38203823      ! Write diagnostics 
    3821     CALL xios_orchidee_send_field("aslope",aslope) 
    3822     CALL xios_orchidee_send_field("interp_diag_aslope",aslope) 
    3823  
     3824    CALL xios_orchidee_send_field("interp_avail_aslope",aslope) 
    38243825    CALL xios_orchidee_send_field("interp_diag_reinf_slope",reinf_slope) 
    38253826 

  • branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/thermosoil.f90

    r7509 r7515  
    19321932 
    19331933    ! Write diagnostics 
    1934     CALL xios_orchidee_send_field("areftemp",areftemp) 
     1934    CALL xios_orchidee_send_field("interp_avail_areftemp",areftemp) 
    19351935    CALL xios_orchidee_send_field("interp_diag_reftemp",reftemp_file) 
    19361936     

  • branches/ORCHIDEE_2_2/ORCHIDEE/src_xml/field_def_orchidee.xml

    r7511 r7515  
    5151    <field id="albedo_nir" name="alb_nir" long_name="Albedo near infrared" unit="1"/> 
    5252    <field id="albedo_glob" name="albedo_glob" long_name="Mean albedo" unit="1"> (albedo_vis + albedo_nir)*0.5 </field> 
    53     <field id="asoilcol" name="asoilcol" long_name="Availability of data for the soil color interpolation (negative values if no data found)" unit="1"  operation="once" freq_offset="0ts"/> 
    54     <field id="aalb_bg" name="aalb_bg" long_name="Availability of data for the albedo interpolation from MODIS related data-set (negative values if no data found)" unit="1"  operation="once" freq_offset="0ts"/> 
    55     <field id="atext" name="atext" long_name="Availability of data for the soil texture interpolation (negative values if no data found)" unit="1"  operation="once" freq_offset="0ts"/> 
    56     <field id="areftemp" name="areftemp" long_name="Availability of data for the reftemp interpolation (negative values if no data found)" unit="1"  operation="once" freq_offset="0ts"/> 
    5753    <field id="vevapp" name="evap_sec" long_name="Total Evaporation" unit="kg/m^2/s"/> 
    5854    <field id="vevapp_day" name="evap" field_ref="vevapp" long_name="Evaporation per day" unit="mm/d" > vevapp*86400  </field> 
    … …  
    7167    <field id="netrad" name="netrad" long_name="Net radiation" unit="W/m^2"/> 
    7268    <field id="lai" name="lai" long_name="Leaf Area Index per PFT" unit="1" grid_ref="grid_nvm"/> 
    73     <field id="alaimap" name="alaimap" long_name="Availability of data for the lai interpolation (negative values if no data found)" unit="1"  operation="once" freq_offset="0ts"/> 
    7469    <field id="reinf_slope" name="reinf_slope" long_name="Slope index for each grid box" unit="1" operation="once" freq_offset="0ts"/> 
    75     <field id="aslope" name="aslope" long_name="Availability of data for the slope interpolation (negative values if no data found)" unit="1"  operation="once" freq_offset="0ts"/> 
    7670    <field id="njsc" name="soilindex" long_name="Index of soil texture" unit="1" operation="once" freq_offset="0ts"/> 
    7771    <field id="clayfraction" name="clayfraction" long_name="Fraction of clay particles in soil (grid-cell mean)" unit="1" grid_ref="grid_nslm" operation="once" freq_offset="0ts"/> 
    … …  
    110104    <field id="vegetfrac" name="vegetfrac" long_name="Fraction of vegetation" unit="1" grid_ref="grid_nvm"/> 
    111105    <field id="maxvegetfrac" name="maxvegetfrac" long_name="Maximum fraction of vegetation" unit="1" grid_ref="grid_nvm"/> 
    112     <field id="aveget" name="aveget" long_name="Availability of data for the vegetation fraction interpolation (negative values if no data found)" unit="1"  operation="once"  freq_offset="0ts"/> 
    113     <field id="aveget5k" name="aveget5k" long_name="Availability of data for the Olson vegetation fraction interpolation (negative values if no data found)" unit="1"  operation="once" freq_offset="0ts"/> 
    114106    <field id="tot_bare_soil" name="tot_bare_soil" long_name="Total Bare Soil Fraction" unit="%"/> 
    115107    <field id="nobiofrac" name="nobiofrac" long_name="Fraction of other surface types" unit="1" grid_ref="grid_nnobio"/> 
    … …  
    198190    <field id="N_qt_WRICE_year" name="N_qt_WRICE_year" long_name="N fertilizers applied on wetland rice - Read in an input file" unit="kgN/yr" operation="once" freq_offset="0ts"/> 
    199191    <field id="N_qt_OTHER_year" name="N_qt_OTHER_year" long_name="N fertilizers applied on other crops and grasses - Read in an input file" unit="kgN/yr" operation="once" freq_offset="0ts"/> 
    200     <field id="achem_wrice" name="achem_wrice" long_name="Availability of data for the rice fertilizers interpolation (negative values if no data found)" unit="1"  operation="once" freq_offset="0ts"/> 
    201     <field id="achem_other" name="achem_other" long_name="Availability of data for the other crops fertilizers interpolation (negative values if no data found)" unit="1"  operation="once" freq_offset="0ts"/> 
    202     <field id="achem_co2" name="achem_co2" long_name="Availability of data for the co2 bbg interpolation (negative values if no data found)" unit="1"  operation="once" freq_offset="0ts"/> 
    203192    <field id="flx_iso" name="flx_iso" long_name="Isoprene emissions from vegetation" unit="kgC/m^2/s" grid_ref="grid_nvm"/> 
    204193    <field id="flx_mono" name="flx_mono" long_name="Monoterpene emissions from vegetation" unit="kgC/m^2/s" grid_ref="grid_nvm"/> 
    … …  
    359348    <field id="mrro_lut" name="mrroLut" long_name="Total runoff from land use tile" unit="kg m-2 s-1" grid_ref="grid_nlut"/> 
    360349    <field id="gpplut" name="gppLut" long_name="Gross primary productivity on Landuse tiles" unit="kgC m-2 s-1" grid_ref="grid_nlut" /> 
    361     <field id="interp_diag_aveget" name="interp_diag_aveget" long_name="aveget read from file" operation="once" freq_offset="0ts"/> 
    362     <field id="interp_diag_vegetrefrac" name="interp_diag_vegetrefrac" grid_ref="grid_nvm" long_name="vegetfrac read from file" operation="once" freq_offset="0ts"/> 
    363     <field id="interp_diag_atext" name="interp_diag_atext" long_name="axtext read from file" operation="once" freq_offset="0ts"/> 
    364     <field id="interp_diag_soilclass" name="interp_diag_soilclass"     grid_ref="grid_nscm" long_name="soilclass read from file" operation="once" freq_offset="0ts"/> 
    365     <field id="interp_diag_clayfraction" name="interp_diag_clayfraction" long_name="clayfraction read from file" operation="once" freq_offset="0ts" /> 
    366     <field id="interp_diag_aslope" name="interp_diag_aslope" long_name="aslope read from file" operation="once" freq_offset="0ts"   /> 
    367     <field id="interp_diag_reinf_slope" name="interp_diag_reinf_slope" long_name="reinf_slope read from file" operation="once" freq_offset="0ts" /> 
     350 
     351    <!-- Varaibles interp_diag_xxx and interp_avail_xxx are written just after reading and interpolating from file and are used for validation --> 
     352    <field id="interp_avail_aveget" name="interp_avail_aveget" long_name="Availability of data for the vegetation fraction interpolation (negative values if no data found)" unit="1" operation="once" freq_offset="0ts"/> 
     353    <field id="interp_diag_vegetrefrac" name="interp_diag_vegetrefrac" grid_ref="grid_nvm" long_name="vegetfrac read from PFTmap file" operation="once" freq_offset="0ts"/> 
     354    <field id="interp_diag_veget_next" name="interp_diag_veget_next" grid_ref="grid_nvm" long_name="Final vegetfrac read from PFTmap file" operation="once" freq_offset="0ts"/> 
     355    <field id="interp_avail_atext" name="interp_avail_atext" long_name="Availability of data for the soil texture interpolation (negative values if no data found)" unit="1" operation="once" freq_offset="0ts"/> 
     356    <field id="interp_diag_soilclass" name="interp_diag_soilclass"     grid_ref="grid_nscm" long_name="soilclass read from soils_param file" operation="once" freq_offset="0ts"/> 
     357    <field id="interp_diag_njsc" name="interp_diag_njsc" long_name="njsc after reading of soilclass from soils_param file" operation="once" freq_offset="0ts"/> 
     358    <field id="interp_diag_clayfraction" name="interp_diag_clayfraction" long_name="clayfraction read from soils_param file" operation="once" freq_offset="0ts" /> 
     359    <field id="interp_diag_sandfraction" name="interp_diag_sandfraction" long_name="sandfraction read from soils_param file" operation="once" freq_offset="0ts" /> 
     360    <field id="interp_diag_siltfraction" name="interp_diag_siltfraction" long_name="siltfraction read from soils_param file" operation="once" freq_offset="0ts" /> 
     361    <field id="interp_avail_aslope" name="interp_avail_aslope" long_name="Availability of data for the slope interpolation (negative values if no data found)" unit="1" operation="once" freq_offset="0ts"   /> 
     362    <field id="interp_diag_reinf_slope" name="interp_diag_reinf_slope" long_name="reinf_slope read from topography file" operation="once" freq_offset="0ts" /> 
    368363    <field id="interp_diag_alb_vis" name="interp_diag_alb_vis" long_name="alb_vis read from file" operation="once" freq_offset="0ts" /> 
    369364    <field id="interp_diag_alb_nir" name="interp_diag_alb_nir" long_name="alb_nir read from file" operation="once" freq_offset="0ts" /> 
     365    <field id="interp_avail_aalb_bg" name="interp_avail_aalb_bg" long_name="Availability of data for the albedo interpolation from MODIS related data-set (negative values if no data found)" unit="1" operation="once" freq_offset="0ts"/> 
     366    <field id="interp_avail_asoilcol" name="interp_avail_asoilcol" long_name="Availability of data for the soil color interpolation (negative values if no data found)" unit="1"  operation="once" freq_offset="0ts"/> 
    370367    <field id="interp_diag_N_qt_WRICE_year" name="interp_diag_N_qt_WRICE_year" long_name="N_qt_WRICE_year read from file" operation="once" freq_offset="0ts" /> 
    371368    <field id="interp_diag_N_qt_OTHER_year" name="interp_diag_N_qt_OTHER_year" long_name="N_qt_OTHER_year read from file" operation="once" freq_offset="0ts" /> 
     369    <field id="interp_avail_achem_wrice" name="interp_avail_achem_wrice" long_name="Availability of data for the rice fertilizers interpolation (negative values if no data found)" unit="1"  operation="once" freq_offset="0ts"/> 
     370    <field id="interp_avail_achem_other" name="interp_avail_achem_other" long_name="Availability of data for the other crops fertilizers interpolation (negative values if no data found)" unit="1"  operation="once" freq_offset="0ts"/> 
     371    <field id="interp_avail_achem_co2" name="interp_avail_achem_co2" long_name="Availability of data for the co2 bbg interpolation (negative values if no data found)" unit="1"  operation="once" freq_offset="0ts"/> 
    372372    <field id="interp_diag_flx_co2_bbg_year" name="interp_diag_flx_co2_bbg_year" long_name="flx_co2_bbg_year read from file" operation="once" freq_offset="0ts" /> 
    373     <field id="interp_diag_lai" grid_ref="grid_from_lai" name="interp_diag_lai" long_name="lai read from file" operation="once" freq_offset="0ts"/> 
     373    <field id="interp_avail_alaimap" name="interp_avail_alaimap" long_name="Availability of data for the lai interpolation (negative values if no data found)" operation="once" freq_offset="0ts"/> 
     374    <field id="interp_diag_lai" grid_ref="grid_from_lai" name="interp_diag_lai" long_name="lai read from file" operation="once" freq_offset="0ts" enabled=".FALSE."/> 
    374375    <field id="interp_diag_reftemp" name="interp_diag_reftemp" long_name="reftemp read from file" operation="once" freq_offset="0ts"/> 
     376    <field id="interp_avail_areftemp" name="interp_avail_areftemp" long_name="Availability of data for the reftemp interpolation (negative values if no data found)" unit="1" operation="once" freq_offset="0ts"/> 
    375377    <field id="interp_diag_woodharvest" name="interp_diag_woodharvest" long_name="woodharvest read from file" operation="once" freq_offset="0ts"/> 
     378 
    376379 
    377380    <field id="znetco2" name="znetco2" long_name="Sum CO2 flux over PFTs (variable in interface to LMDZ)" unit="kgC m-2 s-1" /> 

  • branches/ORCHIDEE_2_2/ORCHIDEE/src_xml/file_def_orchidee.xml

    r7511 r7515  
    311311    <field field_ref="snowgrain" grid_ref="grid_nsnow_out"  level="11"/> 
    312312    <field field_ref="snowdepth"  level="11"/> 
    313     <field field_ref="asoilcol"  level="11"/> 
    314     <field field_ref="aalb_bg"  level="11"/> 
    315     <field field_ref="atext"  level="11"/> 
    316     <field field_ref="areftemp"  level="11"/> 
    317     <field field_ref="alaimap"  level="11"/> 
    318     <field field_ref="aslope"  level="11"/> 
    319     <field field_ref="aveget"  level="11"/> 
    320     <field field_ref="aveget5k"  level="11"/> 
    321     <field field_ref="achem_wrice"  level="11"/> 
    322     <field field_ref="achem_other"  level="11"/> 
    323     <field field_ref="achem_co2"  level="11"/> 
    324313    <field field_ref="frac_snow"  level="0"/> 
    325314    <field field_ref="snowliqtot"  level="11"/> 
    … …  
    727716  </file> 
    728717 
    729   <!-- Sechiba file 4 for checking interpolation of input files --> 
     718  <!-- Sechiba file 4 containing variables read and interpolated from input files --> 
    730719  <file id="sechiba4" name="sechiba_interp_diag" output_level="1" output_freq="1d" enabled=".TRUE."> 
    731    <field_group group_ref="remap_1mo" grid_ref="grid_landpoints_out" > 
    732  
    733       <field field_ref="interp_diag_aveget"  level="1"/> 
    734       <field field_ref="interp_diag_vegetrefrac" grid_ref="grid_nvm_out" level="1"/> 
    735       <field field_ref="interp_diag_atext"  level="1"/> 
    736       <field field_ref="interp_diag_soilclass" grid_ref="grid_nscm_out" level="1"/> 
     720    <field_group group_ref="remap_1mo" grid_ref="grid_landpoints_out" > 
     721 
     722      <field field_ref="interp_diag_veget_next" grid_ref="grid_nvm_out" level="1"/> 
     723      <field field_ref="interp_diag_njsc" level="1"/> 
    737724      <field field_ref="interp_diag_clayfraction"  level="1"/> 
    738       <field field_ref="interp_diag_aslope"  level="1"/> 
     725      <field field_ref="interp_diag_sandfraction"  level="1"/> 
     726      <field field_ref="interp_diag_siltfraction"  level="1"/> 
    739727      <field field_ref="interp_diag_reinf_slope"  level="1"/> 
    740728      <field field_ref="interp_diag_alb_vis"  level="1"/> 
    … …  
    743731      <field field_ref="interp_diag_N_qt_OTHER_year" level="1"/> 
    744732      <field field_ref="interp_diag_flx_co2_bbg_year" level="1"/> 
    745 <!--      <field field_ref="interp_diag_lai" grid_ref="grid_from_lai" level="1"/> --> 
    746733      <field field_ref="interp_diag_reftemp" level="1"/> 
    747734      <field field_ref="interp_diag_woodharvest" level="1"/> 
    748  
     735      <!--      <field field_ref="interp_diag_lai" grid_ref="grid_from_lai" level="1"/> --> 
     736       
     737      <field field_ref="interp_avail_aveget"  level="3"/> 
     738      <field field_ref="interp_diag_vegetrefrac" grid_ref="grid_nvm_out" level="3"/> 
     739      <field field_ref="interp_avail_atext"  level="3"/> 
     740      <field field_ref="interp_diag_soilclass" grid_ref="grid_nscm_out" level="3"/> 
     741      <field field_ref="interp_avail_aslope"  level="3"/>      
     742      <field field_ref="interp_avail_aalb_bg"  level="3"/> 
     743      <field field_ref="interp_avail_asoilcol"  level="3"/> 
     744      <field field_ref="interp_avail_achem_wrice" level="3"/> 
     745      <field field_ref="interp_avail_achem_other" level="3"/> 
     746      <field field_ref="interp_avail_achem_co2" level="3"/> 
     747      <field field_ref="interp_avail_alaimap"  level="3"/> 
     748      <field field_ref="interp_avail_areftemp" level="3"/> 
     749       
    749750   </field_group> 
    750751  </file> 
Note: See TracChangeset for help on using the changeset viewer.