Changeset 8133 for branches


Ignore:
Timestamp:
2023-08-09T18:17:29+02:00 (11 months ago)
Author:
josefine.ghattas
Message:
  • Updated to use module hdf5/1.12.2 needed at irene-skl, previously done in coupled configuration. Needed for XIOS3.
  • Cleaning in xml files needed for use with XIOS3. All modifications are also working with XIOS2.

See ticket #933

Location:
branches/ORCHIDEE_2_2
Files:
6 edited

Legend:

Unmodified
Added
Removed

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

    r7509 r8133  
    2828 
    2929    <file id="soils_param_file" mode="read" output_freq="1y" enabled="true"> 
    30       <field id="soilcolor" name="soilcolor" domain_ref="dom_file_soil" operation="instant" freq_offset="1ts"/> 
     30      <field id="soilcolor" name="soilcolor" domain_ref="dom_file_soil" operation="instant" freq_offset="1ts" enabled="false"/> 
    3131      <field id="soiltext" name="soiltext" domain_ref="dom_file_soil" operation="instant" freq_offset="1ts"/> 
    3232    </file> 
    … …  
    138138      <field id="frac_veget_frac" field_ref="maxvegetfrac_mask" domain_ref="dom_from_pft" read_access="true" enabled="true" /> 
    139139 
    140       <field id="slope_tmp"           field_ref="pente_read"       domain_ref="dom_from_topo"                                  /> 
    141       <field id="frac_slope_interp"   field_ref="mask_pente_read"  domain_ref="dom_from_topo" read_access="true" enabled="true"/> 
     140      <field id="slope_tmp"           field_ref="pente_read"       domain_ref="dom_from_topo_read"                                  /> 
     141      <field id="frac_slope_interp"   field_ref="mask_pente_read"  domain_ref="dom_from_topo_read" read_access="true" enabled="true"/> 
    142142      <field id="reinf_slope_interp"                               domain_ref="dom_from_topo" read_access="true" enabled="true"> (frac_slope_interp &gt; $min_sechiba ) ? 1-slope_tmp/(frac_slope_interp+1e-100) : $slope_default </field> 
    143143 
    … …  
    163163    </field_group> 
    164164 
    165     <field_group id="orchidee_input_mc" grid_ref="grid_nslm_nstm"> 
     165    <field_group id="orchidee_input_mc" grid_ref="grid_nslm_nstm_read"> 
    166166      <!-- Interpolate the mask. This gives now the fraction of the source area underlaying the model grid cell --> 
    167167      <field id="mask_moistc_interp" field_ref="mask_moistc_in" read_access="true" /> 
    … …  
    225225     
    226226    <domain id="dom_from_topo" domain_ref="domain_landpoints"> 
    227       <interpolate_domain order="1" renormalize="false" /> 
    228     </domain> 
    229      
     227    </domain> 
     228     
     229    <domain id="dom_from_topo_read" domain_ref="domain_landpoints"> 
     230      <interpolate_domain order="1" renormalize="false" /> 
     231    </domain> 
     232 
    230233    <domain id="dom_from_albedo" domain_ref="domain_landpoints"> 
    231234      <interpolate_domain order="1" renormalize="true" detect_missing_value="true"/> 

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

    r7576 r8133  
    266266 
    267267    <!-- Definition of grids with fields having two extra dimensions, 4D grids --> 
    268     <grid id="grid_nslm_nstm"> 
     268    <grid id="grid_nslm_nstm_read"> 
    269269      <domain domain_ref="domain_landpoints" > 
    270270        <interpolate_domain order="1"/> 
    … …  
    273273      <axis axis_ref="nstm" /> 
    274274    </grid> 
     275    <grid id="grid_nslm_nstm"> 
     276      <domain domain_ref="domain_landpoints" > 
     277      </domain> 
     278      <axis axis_ref="nslm" /> 
     279      <axis axis_ref="nstm" /> 
     280    </grid> 
    275281    <grid id="grid_nslm_nstm_out"> 
    276282      <domain domain_ref="domain_landpoints_out" /> 

  • branches/ORCHIDEE_2_2/ORCHIDEE_OL/ARCH/arch-X64_IRENE.env

    r7961 r8133  
    1111module load mpi/openmpi/4.1.4 
    1212module load flavor/hdf5/parallel 
    13 module load hdf5/1.12.0 
     13module load hdf5/1.12.2 
    1414module load netcdf-fortran/4.5.3 
    1515module load mkl/20.0.0 

  • branches/ORCHIDEE_2_2/ORCHIDEE_OL/OOL_SEC_STO_FG1transnd/PARAM/iodef_xios2.xml

    r7911 r8133  
    1818          <variable id="using_server"              type="bool">false</variable> 
    1919          <variable id="using_oasis"               type="bool">false</variable> 
    20           <variable id="oasis_codes_id"            type="string" >oceanx</variable> 
    2120         
    2221      </variable_definition> 

  • branches/ORCHIDEE_2_2/ORCHIDEE_OL/OOL_SEC_STO_FG2nd/PARAM/iodef_xios2.xml

    r7422 r8133  
    1818          <variable id="using_server"              type="bool">false</variable> 
    1919          <variable id="using_oasis"               type="bool">false</variable> 
    20           <variable id="oasis_codes_id"            type="string" >oceanx</variable> 
    2120         
    2221      </variable_definition> 

  • branches/ORCHIDEE_2_2/ORCHIDEE_OL/SPINUP_ANALYTIC_FG1nd/PARAM/iodef_xios2.xml

    r7911 r8133  
    1818          <variable id="using_server"              type="bool">false</variable> 
    1919          <variable id="using_oasis"               type="bool">false</variable> 
    20           <variable id="oasis_codes_id"            type="string" >oceanx</variable> 
    2120         
    2221      </variable_definition> 
Note: See TracChangeset for help on using the changeset viewer.