Index: CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/file_def_nemo-opa.xml
===================================================================
--- CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/file_def_nemo-opa.xml	(revision 3653)
+++ CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/file_def_nemo-opa.xml	(revision 3657)
@@ -339,5 +339,5 @@
 	  <field field_ref="avt_e3w"      name="NEMO_difvho_noevd"  long_name="ocean_vertical_heat_diffusivity without evd contribution"  operation="average" freq_op="1mo" level="1" > (@avt_e3w - @avt_evd_e3w) / @e3w </field>
 	  <field field_ref="avs_e3w"      name="NEMO_difvso"  long_name="ocean_vertical_salt_diffusivity"  operation="average" freq_op="1mo" level="1" > @avs_e3w / @e3w </field>
-	  <field field_ref="avs_e3w"      name="NEMO_difvso_noevd"  long_name="ocean_vertical_salt_diffusivity without evd contribution"  operation="average" freq_op="1mo" level="1" > (@avs_e3w - @avs_evd_e3w) / @e3w </field>
+	  <field field_ref="avs_e3w"      name="NEMO_difvso_noevd"  long_name="ocean_vertical_salt_diffusivity without evd contribution"  operation="average" freq_op="1mo" level="1" > (@avs_e3w - @avt_evd_e3w) / @e3w </field>
 	</file>
 
Index: CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/ping_nemo.xml
===================================================================
--- CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/ping_nemo.xml	(revision 3653)
+++ CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/ping_nemo.xml	(revision 3657)
@@ -24,11 +24,11 @@
 <!-- for variables which realm equals one of _ocean-->
    <field id="CMIP6_O18sw"         field_ref="dummy_XYO"        /> <!-- P1 () O18sw : Roche - LSCE - **** NEMO-RD does not do -->
-   <field id="CMIP6_agessc"        field_ref="Age_E3T" > @Age_E3T / @e3t </field>  <!-- P1 (yr) sea_water_age_since_surface_contact : Time elapsed since water was last in surface layer of the ocean. **** NEMO-RD: P2 for IPSL CM6 (in forced mode only) --> 
+   <field id="CMIP6_agessc"        field_ref="Age_E3T" expr="@Age_E3T / @e3t" > Age_E3T / e3t </field>  <!-- P1 (yr) sea_water_age_since_surface_contact : Time elapsed since water was last in surface layer of the ocean. **** NEMO-RD: P2 for IPSL CM6 (in forced mode only) --> 
    <field id="CMIP6_areacello"     field_ref="areacello"        /> <!-- P1 (m2) cell_area : Horizontal area of ocean grid cells -->
    <field id="CMIP6_basin"         field_ref="basins"           /> <!-- P1 (1.0) region : Region Selection Index --> 
-   <field id="CMIP6_bigthetao"     field_ref="toce">@toce_e3t / @e3t </field> <!-- P1 (degC) sea_water_conservative_temperature : Sea water conservative temperature (this should be contributed only for models using conservative temperature as prognostic field) -->
+   <field id="CMIP6_bigthetao"     field_ref="toce" expr="@toce_e3t / @e3t" > toce_e3t / e3t </field>  <!-- P1 (degC) sea_water_conservative_temperature : Sea water conservative temperature (this should be contributed only for models using conservative temperature as prognostic field) -->
    <field id="CMIP6_bigthetaoga"   field_ref="sctemtot"         /> <!-- P1 (degC) sea_water_conservative_temperature : Diagnostic should be contributed only for models using conservative temperature as prognostic field. . -->
-   <field id="CMIP6_cfc11"         field_ref="CFC11_E3T" > @CFC11_E3T / @e3t </field>  <!-- P1 (mol m-3) mole_concentration_of_cfc11_in_sea_water : Moles Per Unit Mass of CFC-11 in sea water -->
-   <field id="CMIP6_cfc12"         field_ref="CFC12_E3T" > @CFC12_E3T / @e3t </field>  <!-- P2 (mol m-3) mole_concentration_of_cfc12_in_sea_water : Mole Concentration of CFC-12 in sea water -->
+   <field id="CMIP6_cfc11"         field_ref="CFC11_E3T" expr="@CFC11_E3T / @e3t" > CFC11_E3T / e3t </field>  <!-- P1 (mol m-3) mole_concentration_of_cfc11_in_sea_water : Moles Per Unit Mass of CFC-11 in sea water -->
+   <field id="CMIP6_cfc12"         field_ref="CFC12_E3T" expr="@CFC12_E3T / @e3t" > CFC12_E3T / e3t </field>  <!-- P2 (mol m-3) mole_concentration_of_cfc12_in_sea_water : Mole Concentration of CFC-12 in sea water -->
    <field id="CMIP6_deptho"        field_ref="tpt_dep"          /> <!-- P1 (m) sea_floor_depth_below_geoid : Ocean bathymetry.   Reported here is the sea floor depth for present day relative to z=0 geoid. Reported as missing for land grid cells. -->  
    <field id="CMIP6_difmxybo"  field_ref="dummy_XYO"        /> <!-- P2 (m4 s-1) ocean_momentum_xy_biharmonic_diffusivity : Lateral biharmonic viscosity applied to the momentum equitions. -->
@@ -48,14 +48,14 @@
    <field id="CMIP6_diftrxylo"     field_ref="dummy_XYO"        /> <!-- P3 (m2 s-1) ocean_tracer_xy_laplacian_diffusivity : unset -->
    <field id="CMIP6_diftrxylo2d"   field_ref="aht2d"            /> <!-- P3 (m2 s-1) ocean_tracer_xy_laplacian_diffusivity : unset -->
-   <field id="CMIP6_difvho"        field_ref="avt_e3w" > @avt_e3w / @e3w </field> <!-- P1 (m2 s-1) ocean_vertical_heat_diffusivity : Vertical/dianeutral diffusivity applied to prognostic temperature field. -->
-   <field id="NEMO_difvho_noevd"   field_ref="avt_e3w" > (@avt_e3w - @avt_evd_e3w) / @e3w </field> <!-- P3 (m2 s-1) ocean vertical heat diffusivity without evd contribution ****  NEMO-RD : extra variable not required by CMIP6 -->
+   <field id="CMIP6_difvho"        field_ref="avt_e3w"  expr="@avt_e3w / @e3w" > avt_e3w / e3w </field> <!-- P1 (m2 s-1) ocean_vertical_heat_diffusivity : Vertical/dianeutral diffusivity applied to prognostic temperature field. -->
+   <field id="NEMO_difvho_noevd"   field_ref="avt_e3w"  expr="(@avt_e3w - @avt_evd_e3w) / @e3w" > ( avt_e3w - avt_evd_e3w) / e3w </field> <!-- P3 (m2 s-1) ocean vertical heat diffusivity without evd contribution ****  NEMO-RD : extra variable not required by CMIP6 -->
    <field id="CMIP6_difvmbo"       field_ref="dummy_XY0"             /> <!-- P1 (m2 s-1) ocean_vertical_momentum_diffusivity_due_to_background : unset **** NEMO-RD not relevant for IPSLCM6 because we use zdftmx_new (background included in av_tide) -->
    <field id="CMIP6_difvmfdo"      field_ref="dummy_XYO"        /> <!-- P1 (m2 s-1) ocean_vertical_momentum_diffusivity_due_to_form_drag : unset **** NEMO-RD not relevant for IPSL CM6--> 
-   <field id="CMIP6_difvmo"        field_ref="avm_e3w"  > @avm_e3w / @e3w </field> <!-- P1 (m2 s-1) ocean_vertical_momentum_diffusivity : unset -->
-   <field id="CMIP6_difvmto"       field_ref="av_tide_e3w" > @av_tide_e3w / @e3w </field> <!-- P1 (m2 s-1) ocean_vertical_momentum_diffusivity_due_to_tides : unset --> 
-   <field id="CMIP6_difvso"        field_ref="avs_e3w" > @avs_e3w / @e3w </field> <!-- P1 (m2 s-1) ocean_vertical_salt_diffusivity : Vertical/dianeutral diffusivity applied to prognostic salinity field. -->
-   <field id="NEMO_difvso_noevd"   field_ref="avs_e3w" > (@avs_e3w - @avt_evd_e3w) / @e3w </field> <!-- P3 (m2 s-1) ocean vertical heat diffusivity without evd contribution ****  NEMO-RD : extra variable not required by CMIP6 -->
+   <field id="CMIP6_difvmo"        field_ref="avm_e3w"  expr="@avm_e3w / @e3w" > avm_e3w / e3w </field> <!-- P1 (m2 s-1) ocean_vertical_momentum_diffusivity : unset -->
+   <field id="CMIP6_difvmto"       field_ref="av_tide_e3w"  expr="@av_tide_e3w / @e3w" > av_tide_e3w / e3w </field> <!-- P1 (m2 s-1) ocean_vertical_momentum_diffusivity_due_to_tides : unset --> 
+   <field id="CMIP6_difvso"        field_ref="avs_e3w"  expr="@avs_e3w / @e3w" > avs_e3w / e3w </field> <!-- P1 (m2 s-1) ocean_vertical_salt_diffusivity : Vertical/dianeutral diffusivity applied to prognostic salinity field. -->
+   <field id="NEMO_difvso_noevd"   field_ref="avs_e3w"  expr="(@avs_e3w - @avt_evd_e3w) / @e3w" > ( avs_e3w - avt_evd_e3w)  / e3w </field>  <!-- P3 (m2 s-1) ocean vertical heat diffusivity without evd contribution ****  NEMO-RD : extra variable not required by CMIP6 -->
    <field id="CMIP6_difvtrbo"      field_ref="dummy_XYO"             /> <!-- P1 (m2 s-1) ocean_vertical_tracer_diffusivity_due_to_background : unset *** NEMO-RD : not relevant for IPSLCM6 -->
-   <field id="CMIP6_difvtrto"      field_ref="av_tide_e3w" > @av_tide_e3w / @e3w </field> <!-- P1 (m2 s-1) ocean_vertical_tracer_diffusivity_due_to_tides : unset -->
+   <field id="CMIP6_difvtrto"      field_ref="av_tide_e3w" expr="@av_tide_e3w / @e3w" > av_tide_e3w / e3w </field> <!-- P1 (m2 s-1) ocean_vertical_tracer_diffusivity_due_to_tides : unset -->
    <field id="CMIP6_dispkevfo"     field_ref="dispkevfo"   /> <!-- P1 (W m-2) ocean_kinetic_energy_dissipation_per_unit_area_due_to_vertical_friction. *** NEMO-RD : provides 2D (vertical integral) while not requested by CMIP6 (Griffies et al. 2016) while CMIP5 requested 3D field -->
    <field id="CMIP6_dispkexyfo"    field_ref="dummy_XY0"        /> <!-- P3 (W m-2) ocean_kinetic_energy_dissipation_per_unit_area_due_to_xy_friction : Depth integrated impacts on kinetic energy arising from lateral frictional dissipation associated with Laplacian and/or biharmonic viscosity. For CMIP5, this diagnostic was 3d, whereas the CMIP6 depth integrated diagnostic is sufficient for many purposes and reduces archive requirements. -->
@@ -113,5 +113,5 @@
    <field id="CMIP6_msftyzmpa"     field_ref="dummy_basin_merid_section"        /> <!-- P1 (kg s-1) msftyzmpa : CMIP5 called this "due to Bolus Advection".  Name change respects the more general physics of the mesoscale parameterizations. **** NEMO-RD: Does not code --> 
    <field id="CMIP6_msftyzsmpa"    field_ref="dummy_basin_merid_section"         /> <!-- P1 (kg s-1) msftyzsmpa : Report only if there is a submesoscale eddy parameterization. **** NEMO-RD: not relevant for IPSL CM6-->
-   <field id="CMIP6_obvfsq"        field_ref="bn2_e3t" > @bn2_e3t / @e3t </field> <!-- P1 (s-2) obvfsq : Square of Brunt Vaisala Frequency in Sea Water -->
+   <field id="CMIP6_obvfsq"        field_ref="bn2_e3t" expr="@bn2_e3t / @e3t" > bn2_e3t / e3t </field> <!-- P1 (s-2) obvfsq : Square of Brunt Vaisala Frequency in Sea Water -->
    <field id="CMIP6_ocontempdiff"  field_ref="ttrd_zdfp_e3t" > this * $cpocean * $rau0 </field> <!-- P2 (W m-2) ocontempdiff : Tendency of heat content for a grid cell from parameterized dianeutral mixing. Reported only for models that use conservative temperature as prognostic field. -->
    <field id="CMIP6_ocontempmint"  field_ref="dummy_XY"         /> <!-- P3 (degC kg m-2) ocontempmint : Full column sum of density*cell thickness*conservative temperature. If the model is Boussinesq, then use Boussinesq reference density for the density factor. NEMO-RD: exactly same as tomint hence we leave dummy_XY here -->
@@ -142,5 +142,5 @@
    <field id="CMIP6_pso"           field_ref="dummy_XY"         /> <!-- P1 (Pa) sea_water_pressure_at_sea_water_surface : Sea Water Pressure at Sea Water Surface **** NEMO-RD: not relevant for IPSLCM6 -->
    <field id="CMIP6_rlntds"        field_ref="dummy_XY"         /> <!-- P1 (W m-2) surface_net_downward_longwave_flux : This is defined as "where ice_free_sea over sea" **** NEMO-RD: does not do -->
-   <field id="CMIP6_rsdo"          field_ref="qsr3d_e3t" > @qsr3d_e3t / @e3t </field> <!-- P1 (W m-2) downwelling_shortwave_flux_in_sea_water : Downwelling Shortwave Radiation in Sea Water -->
+   <field id="CMIP6_rsdo"          field_ref="qsr3d_e3t" expr="@qsr3d_e3t / @e3t" > qsr3d_e3t / e3t </field>  <!-- P1 (W m-2) downwelling_shortwave_flux_in_sea_water : Downwelling Shortwave Radiation in Sea Water -->
    <field id="CMIP6_rsdoabsorb"    field_ref="dummy_XYO"        /> <!-- P2 (W m-2) net_rate_of_absorption_of_shortwave_energy_in_ocean_layer : Net Rate of Absorption of Shortwave Energy in Ocean Layer **** NEMO-RD: does not do : easy to compute offline -->
    <field id="CMIP6_rsntds"        field_ref="qsr"              /> <!-- P1 (W m-2) net_downward_shortwave_flux_at_sea_water_surface : This is the flux into the surface of liquid sea water only. This excludes shortwave flux absorbed by sea ice, but includes any light that passes through the ice and is absorbed by the ocean. -->
@@ -154,6 +154,6 @@
    <field id="CMIP6_sltovgyre"     field_ref="sopstove_3bsn"> sopst_vs_3bsn*1e6*$convSpsu   - this*1e6*$convSpsu   </field> <!-- P1 (kg s-1) northward_ocean_salt_transport_due_to_gyre : From all advective mass transport processes, resolved and parameterized. **** NEMO-RD: requested is as a function of latitude. In principle, we do not want to translate y into. latitude. to be written in meta data --> 
    <field id="CMIP6_sltovovrt"     field_ref="sopstove_3bsn"> this * 1e6 * $convSpsu  </field> <!-- P1 (kg s-1) northward_ocean_salt_transport_due_to_overturning : From all advective mass transport processes, resolved and parameterized. **** NEMO-RD: requested is as a function of latitude. In principle, we do not want to translate y into latitude. to be writtent in meta data --> 
-   <field id="CMIP6_so"            field_ref="soce_e3t">@soce_e3t / @e3t * $convSpsu  </field> <!-- P1 (0.001) sea_water_salinity : Sea Water Salinity -->
-   <field id="CMIP6_sob"           field_ref="sbs_e3tb">@sbs_e3tb / @e3tb * $convSpsu  </field> <!-- P1 (0.001) sob : Model prognostic salinity at bottom-most model grid cell -->
+   <field id="CMIP6_so"            field_ref="soce_e3t" expr="@soce_e3t / @e3t * $convSpsu"  > soce_e3t / e3t * $convSpsu  </field> <!-- P1 (0.001) sea_water_salinity : Sea Water Salinity -->
+   <field id="CMIP6_sob"           field_ref="sbs_e3tb" expr="@sbs_e3tb / @e3tb * $convSpsu" > sbs_e3tb / e3tb * $convSpsu </field>  <!-- P1 (0.001) sob : Model prognostic salinity at bottom-most model grid cell -->
    <field id="CMIP6_soga"          field_ref="scsaltot"  > this * $convSpsu </field> <!-- P1 (0.001) sea_water_salinity : Global Mean Sea Water Salinity -->
    <field id="CMIP6_somint"        field_ref="somint" > this * $convSpsu </field>  <!-- P1 (1e-3 kg m-2) somint : Full column sum of density*cell thickness*prognostic salinity. If the model is Boussinesq, then use Boussinesq reference density for the density factor. -->
@@ -166,5 +166,5 @@
    <field id="CMIP6_tauvcorr"      field_ref="dummy_FAFMIP"         /> <!-- P1 (N m-2) surface_downward_y_stress_correction : This is the stress on the liquid ocean from overlying atmosphere, sea ice, ice shelf, etc.*** NEMO-RD : TODO for FAFMIP experiments ???-->
    <field id="CMIP6_tauvo"         field_ref="vtau"             /> <!-- P1 (N m-2) surface_downward_y_stress : This is the stress on the liquid ocean from overlying atmosphere, sea ice, ice shelf, etc. -->
-   <field id="CMIP6_thetao"        field_ref="toce_pot">@toce_pot_e3t / @e3t </field> <!-- P1 (degC) sea_water_potential_temperature : Diagnostic should be contributed even for models using conservative temperature as prognostic field. -->
+   <field id="CMIP6_thetao"        field_ref="toce_pot"  expr="@toce_pot_e3t / @e3t" > toce_pot_e3t / e3t </field>  <!-- P1 (degC) sea_water_potential_temperature : Diagnostic should be contributed even for models using conservative temperature as prognostic field. -->
    <field id="CMIP6_thetaoga"      field_ref="sctemtotpot"      /> <!-- P1 (degC) sea_water_potential_temperature : Diagnostic should be contributed even for models using conservative temperature as prognostic field -->
    <field id="CMIP6_thetaot"       field_ref="toce_pot_vmean"   /> <!-- P1 (degC) sea_water_potential_temperature : Vertical average of the sea water potential temperature through the whole ocean depth -->
@@ -178,5 +178,5 @@
    <field id="CMIP6_tnpeot"        field_ref="dummy_XYO"        /> <!-- P1 (W m-2) tendency_of_ocean_potential_energy_content_due_to_tides : unset -->
    <field id="CMIP6_tnpeotb"       field_ref="dummy_XYO"        /> <!-- P1 (W m-2) tendency_of_ocean_potential_energy_content_due_to_background : unset -->
-   <field id="CMIP6_tob"           field_ref="toce_potb_e3tb">@toce_potb_e3tb / @e3tb </field> <!-- P1 (degC) sea_water_potential_temperature_at_sea_floor : Potential temperature at the ocean bottom-most grid cell.  -->
+   <field id="CMIP6_tob"           field_ref="toce_potb_e3tb" expr="@toce_potb_e3tb / @e3tb" > toce_potb_e3tb / e3tb </field> <!-- P1 (degC) sea_water_potential_temperature_at_sea_floor : Potential temperature at the ocean bottom-most grid cell.  -->
    <field id="CMIP6_tomint"        field_ref="tosmint"           /> <!-- P2 (1e-3 kg m-2) tomint : Full column sum of density*cell thickness*prognostic temperature. If the model is Boussinesq, then use Boussinesq reference density for the density factor. *** NEMO-RD assumes this is potential temperature + provides with units Â°C kg m-2-->
    <field id="CMIP6_tos"           field_ref="sst_pot"              /> <!-- P1 (K) sea_surface_temperature : temperature of liquid ocean.  Note that the correct standard_name for this variable is "sea_surface_temperature", not "surface_temperature", but this was discovered too late to correct.  To maintain consistency across CMIP5 models, the wrong standard_name will continue to be used. **** NEMO-RD: TODO : JM: is this really requested in K? This does not agree with the .xls document. To be clarified. In NEMO, sst given in Celsius -->
@@ -184,7 +184,7 @@
    <field id="CMIP6_tossq"         field_ref="sst_pot2"             /> <!-- P1 (degC2) square_of_sea_surface_temperature : square of temperature of liquid ocean, averaged over the day.  -->  
    <field id="CMIP6_umo"           field_ref="uocetr_eff" > this * $rau0 </field> <!-- P1 (kg s-1) ocean_mass_x_transport : X-ward mass transport from resolved and parameterized advective transport. -->
-   <field id="CMIP6_uo"            field_ref="uoce_e3u">@uoce_e3u / @e3u </field> <!-- P1 (m s-1) sea_water_x_velocity : Prognostic x-ward velocity component resolved by the model. -->
+   <field id="CMIP6_uo"            field_ref="uoce_e3u" expr="@uoce_e3u / @e3u" > uoce_e3u / e3u </field> <!-- P1 (m s-1) sea_water_x_velocity : Prognostic x-ward velocity component resolved by the model. -->
    <field id="CMIP6_vmo"           field_ref="vocetr_eff"  > this * $rau0 </field> <!-- P1 (kg s-1) ocean_mass_y_transport : Y-ward mass transport from resolved and parameterized advective transport. -->
-   <field id="CMIP6_vo"            field_ref="voce_e3v">@voce_e3v / @e3v </field> <!-- P1 (m s-1) sea_water_y_velocity : Prognostic x-ward velocity component resolved by the model. -->
+   <field id="CMIP6_vo"            field_ref="voce_e3v" expr="@voce_e3v / @e3v" > voce_e3v / e3v </field> <!-- P1 (m s-1) sea_water_y_velocity : Prognostic x-ward velocity component resolved by the model. -->
    <field id="CMIP6_volcello"      field_ref="dummy_XYO"        /> <!-- P1 (m3) ocean_volume : grid-cell volume ca. 2000. **** NEMO-RD does not do: not requested by OMIP and ambiguous definition -->
    <field id="CMIP6_volo"          field_ref="scvoltot"           /> <!-- P1 (m3) sea_water_volume : Total volume of liquid seawater. -->
@@ -199,5 +199,5 @@
    <field id="CMIP6_wfonocorr"     field_ref="empmr"            /> <!-- P1 (kg m-2 s-1) water_flux_into_sea_water_without_flux_correction : computed as the water  flux (without flux correction) into the ocean divided by the area of the ocean portion of the grid cell. *** NEMO-RD : TODO in field_ocean, empmr is defined as water flux out of sea ice and sea water. Is sea ice really taken into here? If no, correct description in field. If yes, this input is wrong here. -->
    <field id="CMIP6_wmo"           field_ref="wocetr_eff" > this * $rau0 </field> <!-- P1 (kg s-1) upward_ocean_mass_transport : Upward mass transport from resolved and parameterized advective transport. -->
-   <field id="CMIP6_wo"            field_ref="woce">@woce_e3w / @e3w   </field> <!-- P1 (m s-1) upward_sea_water_velocity : Sea Water Vertical Velocity -->
+   <field id="CMIP6_wo"            field_ref="woce" expr="@woce_e3w / @e3w"  > woce_e3w / e3w </field> <!-- P1 (m s-1) upward_sea_water_velocity : Sea Water Vertical Velocity -->
    <field id="CMIP6_zfullo"    field_ref="dummy_XYO"        /> <!-- P1 (m) depth_below_geoid : Depth below geoid -->
    <field id="CMIP6_zhalfo"    field_ref="dummy_XYO"        /> <!-- P1 (m) depth_below_geoid : Depth below geoid -->
@@ -309,19 +309,19 @@
    <field id="CMIP6_bddtdip"       field_ref="dummy_XYO"         /> <!-- P1 (mol m-3 s-1) tendency_of_mole_concentration_of_dissolved_inorganic_phosphorus_in_sea_water_due_to_biological_processes : Net of biological terms in time rate of change of dissolved phosphate -->
    <field id="CMIP6_bddtdisi"      field_ref="dummy_XYO"         /> <!-- P1 (mol m-3 s-1) tendency_of_mole_concentration_of_dissolved_inorganic_silicate_in_sea_water_due_to_biological_processes : Net of biological terms in time rate of change of dissolved inorganic silicon -->
-   <field id="CMIP6_bfe"           field_ref="BFe_E3T" > @BFe_E3T / @e3t * 1e-3 + @SFe_E3T / @e3t * 1e-3 </field>  <!-- P1 (mol m-3) mole_concentration_of_particulate_organic_matter_expressed_as_iron_in_sea_water : Sum of particulate organic iron component concentrations -->
-   <field id="CMIP6_bfeos"         field_ref="BFeSFC_E3T" > @BFeSFC_E3T / @E3TSFC * 1e-3 + @SFeSFC_E3T / @E3TSFC * 1e-3 </field>  <!-- P3 (mol m-3) bfeos : sum of particulate organic iron component concentrations -->
-   <field id="CMIP6_bsi"           field_ref="GSi_E3T" > @GSi_E3T / @e3t * 1e-3  </field>  <!-- P2 (mol m-3) mole_concentration_of_particulate_matter_expressed_as_silicon_in_sea_water : Sum of particulate silica component concentrations -->
-   <field id="CMIP6_bsios"         field_ref="GSiSFC_E3T" > @GSiSFC_E3T / @E3TSFC * 1e-3  </field><!-- P3 (mol m-3) bsios : sum of particulate silica component concentrations -->
-   <field id="CMIP6_calc"          field_ref="CaCO3_E3T" > @CaCO3_E3T / @e3t * 1e-3 </field><!-- P1 (mol m-3) mole_concentration_of_calcite_expressed_as_carbon_in_sea_water : Sum of particulate calcite component concentrations (e.g. Phytoplankton, Detrital, etc.) -->
-   <field id="CMIP6_chl"           field_ref="NCHL_E3T"> @NCHL_E3T / @e3t * 1e-3 + @DCHL_E3T / @e3t * 1e-3 </field> <!-- P1 (kg m-3) mass_concentration_of_phytoplankton_expressed_as_chlorophyll_in_sea_water : Sum of chlorophyll from all phytoplankton group concentrations.  In most models this is equal to chldiat+chlmisc, that is the sum of Diatom Chlorophyll Mass Concentration and Other Phytoplankton Chlorophyll Mass Concentration -->
+   <field id="CMIP6_bfe"           field_ref="BFe_E3T"     expr="@BFe_E3T / @e3t * 1e-3 + @SFe_E3T / @e3t * 1e-3" > BFe_E3T / e3t * 1e-3 + SFe_E3T / e3t * 1e-3  </field>  <!-- P1 (mol m-3) mole_concentration_of_particulate_organic_matter_expressed_as_iron_in_sea_water : Sum of particulate organic iron component concentrations -->
+   <field id="CMIP6_bfeos"         field_ref="BFeSFC_E3T"  expr="@BFeSFC_E3T / @E3TSFC * 1e-3 + @SFeSFC_E3T / @E3TSFC * 1e-3" > BFeSFC_E3T / E3TSFC * 1e-3 + SFeSFC_E3T / E3TSFC * 1e-3  </field> <!-- P3 (mol m-3) bfeos : sum of particulate organic iron component concentrations -->
+   <field id="CMIP6_bsi"           field_ref="GSi_E3T"     expr="@GSi_E3T / @e3t * 1e-3"  >   GSi_E3T / e3t * 1e-3 </field> <!-- P2 (mol m-3) mole_concentration_of_particulate_matter_expressed_as_silicon_in_sea_water : Sum of particulate silica component concentrations -->
+   <field id="CMIP6_bsios"         field_ref="GSiSFC_E3T"  expr="@GSiSFC_E3T / @E3TSFC * 1e-3"  >  GSiSFC_E3T / E3TSFC * 1e-3 </field> <!-- P3 (mol m-3) bsios : sum of particulate silica component concentrations -->
+   <field id="CMIP6_calc"          field_ref="CaCO3_E3T"   expr="@CaCO3_E3T / @e3t * 1e-3" >  CaCO3_E3T / e3t * 1e-3 </field> <!-- P1 (mol m-3) mole_concentration_of_calcite_expressed_as_carbon_in_sea_water : Sum of particulate calcite component concentrations (e.g. Phytoplankton, Detrital, etc.) -->
+   <field id="CMIP6_chl"           field_ref="NCHL_E3T"    expr="@NCHL_E3T / @e3t * 1e-3 + @DCHL_E3T / @e3t * 1e-3" > NCHL_E3T / e3t * 1e-3 + DCHL_E3T / e3t * 1e-3 </field>  <!-- P1 (kg m-3) mass_concentration_of_phytoplankton_expressed_as_chlorophyll_in_sea_water : Sum of chlorophyll from all phytoplankton group concentrations.  In most models this is equal to chldiat+chlmisc, that is the sum of Diatom Chlorophyll Mass Concentration and Other Phytoplankton Chlorophyll Mass Concentration -->
    <field id="CMIP6_chlcalc"       field_ref="dummy_XYO"        /> <!-- P2 (kg m-3) mass_concentration_of_calcareous_phytoplankton_expressed_as_chlorophyll_in_sea_water : chlorophyll concentration from the calcite-producing phytoplankton component alone -->
    <field id="CMIP6_chlcalcos"     field_ref="dummy_XY"        /> <!-- P3 (kg m-3) mass_concentration_of_calcareous_phytoplankton_expressed_as_chlorophyll_in_sea_water : chlorophyll concentration from the calcite-producing phytoplankton component alone -->
-   <field id="CMIP6_chldiat"       field_ref="DCHL_E3T" > @DCHL_E3T / @e3t * 1e-3 </field>  <!-- P1 (kg m-3) mass_concentration_of_diatoms_expressed_as_chlorophyll_in_sea_water : Chlorophyll from diatom phytoplankton component concentration alone -->
-   <field id="CMIP6_chldiatos"     field_ref="DCHLSFC_E3T" > @DCHLSFC_E3T / @E3TSFC * 1e-3 </field> <!-- P3 (kg m-3) mass_concentration_of_diatoms_expressed_as_chlorophyll_in_sea_water : chlorophyll from diatom phytoplankton component concentration alone -->
+   <field id="CMIP6_chldiat"       field_ref="DCHL_E3T"  expr="@DCHL_E3T / @e3t * 1e-3" > DCHL_E3T / e3t * 1e-3  </field> <!-- P1 (kg m-3) mass_concentration_of_diatoms_expressed_as_chlorophyll_in_sea_water : Chlorophyll from diatom phytoplankton component concentration alone -->
+   <field id="CMIP6_chldiatos"     field_ref="DCHLSFC_E3T" expr="@DCHLSFC_E3T / @E3TSFC * 1e-3" >  DCHLSFC_E3T / E3TSFC * 1e-3 </field> <!-- P3 (kg m-3) mass_concentration_of_diatoms_expressed_as_chlorophyll_in_sea_water : chlorophyll from diatom phytoplankton component concentration alone -->
    <field id="CMIP6_chldiaz"       field_ref="dummy_XYO"        /> <!-- P2 (kg m-3) mass_concentration_of_diazotrophs_expressed_as_chlorophyll_in_sea_water : Chlorophyll concentration from the diazotrophic phytoplankton component alone -->
    <field id="CMIP6_chldiazos"     field_ref="dummy_XY"        /> <!-- P3 (kg m-3) mass_concentration_of_diazotrophs_expressed_as_chlorophyll_in_sea_water : chlorophyll concentration from the diazotrophic phytoplankton component alone -->
-   <field id="CMIP6_chlmisc"       field_ref="NCHL_E3T" > @NCHL_E3T / @e3t * 1e-3 </field> <!-- P1 (kg m-3) mass_concentration_of_miscellaneous_phytoplankton_expressed_as_chlorophyll_in_sea_water : Chlorophyll from additional phytoplankton component concentrations alone -->
-   <field id="CMIP6_chlmiscos"     field_ref="NCHLSFC_E3T" > @NCHLSFC_E3T / @E3TSFC * 1e-3 </field><!-- P3 (kg m-3) mass_concentration_of_miscellaneous_phytoplankton_expressed_as_chlorophyll_in_sea_water : chlorophyll from additional phytoplankton component concentrations alone -->
-   <field id="CMIP6_chlos"         field_ref="NCHLSFC_E3T" > @NCHLSFC_E3T / @E3TSFC * 1e-3 + @DCHLSFC_E3T / @E3TSFC * 1e-3 </field> <!-- P1 (kg m-3) mass_concentration_of_phytoplankton_expressed_as_chlorophyll_in_sea_water : Sum of chlorophyll from all phytoplankton group concentrations at the sea surface.  In most models this is equal to chldiat+chlmisc, that is the sum of 'Diatom Chlorophyll Mass Concentration' plus 'Other Phytoplankton Chlorophyll Mass Concentration' -->
+   <field id="CMIP6_chlmisc"       field_ref="NCHL_E3T"  expr="@NCHL_E3T / @e3t * 1e-3" > NCHL_E3T / e3t * 1e-3 </field> <!-- P1 (kg m-3) mass_concentration_of_miscellaneous_phytoplankton_expressed_as_chlorophyll_in_sea_water : Chlorophyll from additional phytoplankton component concentrations alone -->
+   <field id="CMIP6_chlmiscos"     field_ref="NCHLSFC_E3T" expr="@NCHLSFC_E3T / @E3TSFC * 1e-3" > NCHLSFC_E3T / E3TSFC * 1e-3 </field> <!-- P3 (kg m-3) mass_concentration_of_miscellaneous_phytoplankton_expressed_as_chlorophyll_in_sea_water : chlorophyll from additional phytoplankton component concentrations alone -->
+   <field id="CMIP6_chlos"         field_ref="NCHLSFC_E3T"  expr="@NCHLSFC_E3T / @E3TSFC * 1e-3 + @DCHLSFC_E3T / @E3TSFC * 1e-3" > NCHLSFC_E3T / E3TSFC * 1e-3 + DCHLSFC_E3T / E3TSFC * 1e-3 </field>  <!-- P1 (kg m-3) mass_concentration_of_phytoplankton_expressed_as_chlorophyll_in_sea_water : Sum of chlorophyll from all phytoplankton group concentrations at the sea surface.  In most models this is equal to chldiat+chlmisc, that is the sum of 'Diatom Chlorophyll Mass Concentration' plus 'Other Phytoplankton Chlorophyll Mass Concentration' -->
    <field id="CMIP6_chlpico"       field_ref="dummy_XYO"        /> <!-- P1 (kg m-3) mass_concentration_of_picophytoplankton_expressed_as_chlorophyll_in_sea_water : chlorophyll concentration from the picophytoplankton (<2 um) component alone -->
    <field id="CMIP6_chlpicoos"     field_ref="dummy_XY"        /> <!-- P3 (kg m-3) mass_concentration_of_picophytoplankton_expressed_as_chlorophyll_in_sea_water : chlorophyll concentration from the picophytoplankton (<2 um) component alone -->
@@ -333,7 +333,7 @@
    <field id="CMIP6_darag"         field_ref="dummy_XYO"        /> <!-- P1 (mol m-3 s-1) tendency_of_mole_concentration_of_aragonite_expressed_as_carbon_in_sea_water_due_to_dissolution : Rate of change of Aragonite carbon mole concentration  due to dissolution -->
    <field id="CMIP6_dcalc"         field_ref="PCAL"             /> <!-- P1 (mol m-3 s-1) tendency_of_mole_concentration_of_calcite_expressed_as_carbon_in_sea_water_due_to_dissolution : Rate of change of Calcite carbon mole concentration  due to dissolution -->
-   <field id="CMIP6_detoc"         field_ref="POC_E3T" > @POC_E3T / @e3t * 1e-3 + @GOC_E3T / @e3t * 1e-3 </field><!-- P1 (mol m-3) mole_concentration_of_organic_detritus_expressed_as_carbon_in_sea_water : Sum of detrital organic carbon component concentrations -->
-   <field id="CMIP6_dfe"           field_ref="Fer_E3T" > @Fer_E3T / @e3t * 1e-3 </field> <!-- P1 (mol m-3) mole_concentration_of_dissolved_iron_in_sea_water : Dissolved iron in sea water,  including both Fe2+ and Fe3+ ions (but not particulate detrital iron) -->
-   <field id="CMIP6_dfeos"         field_ref="FerSFC_E3T" > @FerSFC_E3T / @E3TSFC * 1e-3 </field> <!-- P1 (mol m-3) dfeos : dissolved iron in sea water is meant to include both Fe2+ and Fe3+ ions (but not, e.g., particulate detrital iron) -->
+   <field id="CMIP6_detoc"         field_ref="POC_E3T"  expr="@POC_E3T / @e3t * 1e-3 + @GOC_E3T / @e3t * 1e-3" >  POC_E3T / e3t * 1e-3 + GOC_E3T / e3t * 1e-3 </field> <!-- P1 (mol m-3) mole_concentration_of_organic_detritus_expressed_as_carbon_in_sea_water : Sum of detrital organic carbon component concentrations -->
+   <field id="CMIP6_dfe"           field_ref="Fer_E3T"  expr="@Fer_E3T / @e3t * 1e-3" >  Fer_E3T / e3t * 1e-3 </field> <!-- P1 (mol m-3) mole_concentration_of_dissolved_iron_in_sea_water : Dissolved iron in sea water,  including both Fe2+ and Fe3+ ions (but not particulate detrital iron) -->
+   <field id="CMIP6_dfeos"         field_ref="FerSFC_E3T" expr="@FerSFC_E3T / @E3TSFC * 1e-3" >  FerSFC_E3T / E3TSFC * 1e-3 </field> <!-- P1 (mol m-3) dfeos : dissolved iron in sea water is meant to include both Fe2+ and Fe3+ ions (but not, e.g., particulate detrital iron) -->
    <field id="CMIP6_dissi13c"      field_ref="dummy_XYO"        /> <!-- P1 (mol m-3) dissi13c : Dissolved inorganic 14carbon (CO3+HCO3+H2CO3) concentration -->
    <field id="CMIP6_dissi13cos"    field_ref="dummy_XY"        /> <!-- P1 (mol m-3) dissi13cos : Dissolved inorganic 14carbon (CO3+HCO3+H2CO3) concentration -->
@@ -341,11 +341,11 @@
    <field id="CMIP6_dissi14cabio"  field_ref="dummy_XYO"        /> <!-- P2 (mol m-3) dissi14cabio : Abiotic Dissolved inorganic 14carbon (CO3+HCO3+H2CO3) concentration -->
    <field id="CMIP6_dissi14cabioos" field_ref="dummy_XY"       /> <!-- P1 (mol m-3) dissi14cabioos : Abiotic Dissolved inorganic 14carbon (CO3+HCO3+H2CO3) concentration -->
-   <field id="CMIP6_dissic"        field_ref="DIC_E3T" > @DIC_E3T / @e3t * 1e-3 </field> <!-- P1 (mol m-3) mole_concentration_of_dissolved_inorganic_carbon_in_sea_water : Dissolved inorganic carbon (CO3+HCO3+H2CO3) concentration -->
+   <field id="CMIP6_dissic"        field_ref="DIC_E3T"  expr="@DIC_E3T / @e3t * 1e-3" > DIC_E3T / e3t * 1e-3 </field> <!-- P1 (mol m-3) mole_concentration_of_dissolved_inorganic_carbon_in_sea_water : Dissolved inorganic carbon (CO3+HCO3+H2CO3) concentration -->
    <field id="CMIP6_dissicabio"    field_ref="dummy_XYO"        /> <!-- P1 (mol m-3) dissicabio : Abiotic Dissolved inorganic carbon (CO3+HCO3+H2CO3) concentration -->
    <field id="CMIP6_dissicabioos"  field_ref="dummy_XY"        /> <!-- P1 (mol m-3) dissicabioos : Abiotic Dissolved inorganic carbon (CO3+HCO3+H2CO3) concentration -->
    <field id="CMIP6_dissicnat"     field_ref="dummy_XYO"         /> <!-- P1 (mol m-3) dissicnat : Dissolved inorganic carbon (CO3+HCO3+H2CO3) concentration at preindustrial atmospheric xCO2 -->
    <field id="CMIP6_dissicnatos"   field_ref="dummy_XY"         /> <!-- P1 (mol m-3) dissicnatos : Dissolved inorganic carbon (CO3+HCO3+H2CO3) concentration at preindustrial atmospheric xCO2 -->
-   <field id="CMIP6_dissicos"      field_ref="DICSFC_E3T" > @DICSFC_E3T / @E3TSFC * 1e-3 </field><!-- P1 (mol m-3) dissicos : Dissolved inorganic carbon (CO3+HCO3+H2CO3) concentration -->
-   <field id="CMIP6_dissoc"        field_ref="DOC_E3T" > @DOC_E3T / @e3t * 1e-3 </field>  <!-- P2 (mol m-3) mole_concentration_of_dissolved_organic_carbon_in_sea_water : Sum of dissolved carbon component concentrations explicitly represented (i.e. not ~40 uM refractory unless explicit) -->
+   <field id="CMIP6_dissicos"      field_ref="DICSFC_E3T"  expr="@DICSFC_E3T / @E3TSFC * 1e-3" >  DICSFC_E3T / E3TSFC * 1e-3 </field> <!-- P1 (mol m-3) dissicos : Dissolved inorganic carbon (CO3+HCO3+H2CO3) concentration -->
+   <field id="CMIP6_dissoc"        field_ref="DOC_E3T"     expr="@DOC_E3T / @e3t * 1e-3" >  DOC_E3T / e3t * 1e-3 </field> <!-- P2 (mol m-3) mole_concentration_of_dissolved_organic_carbon_in_sea_water : Sum of dissolved carbon component concentrations explicitly represented (i.e. not ~40 uM refractory unless explicit) -->
    <field id="CMIP6_dmso"          field_ref="dummy_XYO" />  <!-- P1 (mol m-3) mole_concentration_of_dimethyl_sulfide_in_sea_water : Mole concentration of dimethyl sulphide in water -->
    <field id="CMIP6_dmsos"         field_ref="dummy_XY" />   <!-- P3 (mol m-3) dmsos : Surface Mole Concentration of Dimethyl Sulphide in sea water -->
@@ -430,10 +430,10 @@
    <field id="CMIP6_limnmisc"      field_ref="LNnutSFC"            /> <!-- P2 (1.0) limnmisc : Nitrogen Limitation of Other Phytoplankton -->
    <field id="CMIP6_limnpico"      field_ref="dummy_XY"        /> <!-- P2 (1.0) limnpico : Nitrogen limitation of Picophytoplankton -->
-   <field id="CMIP6_nh4"           field_ref="NH4_E3T" > @NH4_E3T / @e3t * 1e-3 </field><!-- P2 (mol m-3) mole_concentration_of_ammonium_in_sea_water : Dissolved Ammonium Concentration -->
-   <field id="CMIP6_no3"           field_ref="NO3_E3T" > @NO3_E3T / @e3t * 1e-3 </field><!-- P1 (mol m-3) mole_concentration_of_nitrate_in_sea_water : Dissolved Nitrate Concentration -->
-   <field id="CMIP6_no3os"         field_ref="NO3SFC_E3T" > @NO3_E3T / @e3t * 1e-3 </field><!-- P1 (mol m-3) no3os : Surface Dissolved Nitrate Concentration -->
-   <field id="CMIP6_o2"            field_ref="O2_E3T" > @O2_E3T / @e3t * 1e-3 </field><!-- P1 (mol m-3) o2 : Dissolved Oxygen Concentration -->
+   <field id="CMIP6_nh4"           field_ref="NH4_E3T"    expr="@NH4_E3T / @e3t * 1e-3" > NH4_E3T / e3t * 1e-3 </field> <!-- P2 (mol m-3) mole_concentration_of_ammonium_in_sea_water : Dissolved Ammonium Concentration -->
+   <field id="CMIP6_no3"           field_ref="NO3_E3T"    expr="@NO3_E3T / @e3t * 1e-3" > NO3_E3T / @e3t * 1e-3 </field> <!-- P1 (mol m-3) mole_concentration_of_nitrate_in_sea_water : Dissolved Nitrate Concentration -->
+   <field id="CMIP6_no3os"         field_ref="NO3SFC_E3T" expr="@NO3SFC_E3T / @E3TSFC * 1e-3" > NO3SFC_E3T / E3TSFC * 1e-3 </field> <!-- P1 (mol m-3) no3os : Surface Dissolved Nitrate Concentration -->
+   <field id="CMIP6_o2"            field_ref="O2_E3T"     expr="@O2_E3T / @e3t * 1e-3"  > O2_E3T / e3t * 1e-3 </field> <!-- P1 (mol m-3) o2 : Dissolved Oxygen Concentration -->
    <field id="CMIP6_o2min"         field_ref="O2MIN"            /> <!-- P1 (mol m-3) mole_concentration_of_dissolved_molecular_oxygen_in_sea_water_at_shallowest_local_minimum_in_vertical_profile : Oxygen Minimum Concentration -->
-   <field id="CMIP6_o2os"          field_ref="O2SFC_E3T" > @O2SFC_E3T / @E3TSFC * 1e-3 </field><!-- P1 (mol m-3) o2os : Surface Dissolved Oxygen Concentration -->
+   <field id="CMIP6_o2os"          field_ref="O2SFC_E3T"  expr="@O2SFC_E3T / @E3TSFC * 1e-3" >  O2SFC_E3T / E3TSFC * 1e-3 </field> <!-- P1 (mol m-3) o2os : Surface Dissolved Oxygen Concentration -->
    <field id="CMIP6_o2sat"         field_ref="dummy_XYO"         /> <!-- P2 (mol m-3) o2sat : Dissolved Oxygen Concentration at Saturation -->
    <field id="CMIP6_o2satos"       field_ref="dummy_XY"         /> <!-- P1 (mol m-3) o2satos : Surface Dissolved Oxygen Concentration at Saturation -->
@@ -449,12 +449,12 @@
    <field id="CMIP6_phnat"         field_ref="dummy_XYO"        /> <!-- P1 (1.0) phnat : negative log10 of hydrogen ion concentration with the concentration expressed as mol H kg-1. -->
    <field id="CMIP6_phnatos"       field_ref="dummy_XY"        /> <!-- P2 (1.0) phnatos : negative log10 of hydrogen ion concentration with the concentration expressed as mol H kg-1. -->
-   <field id="CMIP6_phyc"          field_ref="PHY_E3T" > @PHY_E3T / @e3t * 1e-3 + @PHY2_E3T / @e3t * 1e-3 </field> <!-- P1 (mol m-3) mole_concentration_of_phytoplankton_expressed_as_carbon_in_sea_water : sum of phytoplankton carbon component concentrations.  In most (all?) cases this is the sum of phycdiat and phycmisc (i.e., "Diatom Carbon Concentration" and "Non-Diatom Phytoplankton Carbon Concentration" -->
+   <field id="CMIP6_phyc"          field_ref="PHY_E3T"  expr="@PHY_E3T / @e3t * 1e-3 + @PHY2_E3T / @e3t * 1e-3" > PHY_E3T / e3t * 1e-3 + PHY2_E3T / e3t * 1e-3 </field>  <!-- P1 (mol m-3) mole_concentration_of_phytoplankton_expressed_as_carbon_in_sea_water : sum of phytoplankton carbon component concentrations.  In most (all?) cases this is the sum of phycdiat and phycmisc (i.e., "Diatom Carbon Concentration" and "Non-Diatom Phytoplankton Carbon Concentration" -->
    <field id="CMIP6_phycalc"       field_ref="dummy_XYO"        /> <!-- P1 (mol m-3) mole_concentration_of_calcareous_phytoplankton_expressed_as_carbon_in_sea_water : carbon concentration from calcareous (calcite-producing) phytoplankton component alone -->
-   <field id="CMIP6_phycos"        field_ref="PHYSFC_E3T" > @PHYSFC_E3T / @E3TSFC * 1e-3 + @PHY2SFC_E3T / @E3TSFC * 1e-3 </field><!-- P2 (mol m-3) mole_concentration_of_phytoplankton_expressed_as_carbon_in_sea_water : sum of phytoplankton organic carbon component concentrations at the sea surface -->
-   <field id="CMIP6_phydiat"       field_ref="PHY2_E3T" > @PHY2_E3T / @e3t * 1e-3  </field><!-- P1 (mol m-3) mole_concentration_of_diatoms_expressed_as_carbon_in_sea_water : carbon from the diatom phytoplankton component concentration alone -->
+   <field id="CMIP6_phycos"        field_ref="PHYSFC_E3T" expr="@PHYSFC_E3T / @E3TSFC * 1e-3 + @PHY2SFC_E3T / @E3TSFC * 1e-3" > PHYSFC_E3T / E3TSFC * 1e-3 + PHY2SFC_E3T / E3TSFC * 1e-3 </field> <!-- P2 (mol m-3) mole_concentration_of_phytoplankton_expressed_as_carbon_in_sea_water : sum of phytoplankton organic carbon component concentrations at the sea surface -->
+   <field id="CMIP6_phydiat"       field_ref="PHY2_E3T"   expr="@PHY2_E3T / @e3t * 1e-3" > PHY2_E3T / e3t * 1e-3 </field>  <!-- P1 (mol m-3) mole_concentration_of_diatoms_expressed_as_carbon_in_sea_water : carbon from the diatom phytoplankton component concentration alone -->
    <field id="CMIP6_phydiaz"       field_ref="dummy_XYO"        /> <!-- P2 (mol m-3) mole_concentration_of_diazotrophs_expressed_as_carbon_in_sea_water : carbon concentration from the diazotrophic phytoplankton component alone -->
-   <field id="CMIP6_phyfe"         field_ref="NFe_E3T" > @NFe_E3T / @e3t * 1e-3 + @DFe_E3T / @e3t * 1e-3  </field> <!-- P1 (mol m-3) mole_concentration_of_phytoplankton_expressed_as_iron_in_sea_water : sum of phytoplankton iron component concentrations -->
-   <field id="CMIP6_phyfeos"       field_ref="NFeSFC_E3T" > @NFeSFC_E3T / @E3TSFC * 1e-3 + @DFeSFC_E3T / @E3TSFC * 1e-3  </field> <!-- P3 (mol m-3) phyfeos : sum of phytoplankton iron component concentrations -->
-   <field id="CMIP6_phymisc"       field_ref="PHY_E3T" > @PHY_E3T / @e3t * 1e-3 </field> <!-- P2 (mol m-3) mole_concentration_of_miscellaneous_phytoplankton_expressed_as_carbon_in_sea_water : carbon concentration from additional phytoplankton component alone -->
+   <field id="CMIP6_phyfe"         field_ref="NFe_E3T"  expr="@NFe_E3T / @e3t * 1e-3 + @DFe_E3T / @e3t * 1e-3" > NFe_E3T / e3t * 1e-3 + DFe_E3T / e3t * 1e-3 </field> <!-- P1 (mol m-3) mole_concentration_of_phytoplankton_expressed_as_iron_in_sea_water : sum of phytoplankton iron component concentrations -->
+   <field id="CMIP6_phyfeos"       field_ref="NFeSFC_E3T" expr="@NFeSFC_E3T / @E3TSFC * 1e-3 + @DFeSFC_E3T / @E3TSFC * 1e-3"  > NFeSFC_E3T / E3TSFC * 1e-3 + DFeSFC_E3T / E3TSFC * 1e-3 </field> <!-- P3 (mol m-3) phyfeos : sum of phytoplankton iron component concentrations -->
+   <field id="CMIP6_phymisc"       field_ref="PHY_E3T"   expr="@PHY_E3T / @e3t * 1e-3"  > PHY_E3T / e3t * 1e-3  </field> <!-- P2 (mol m-3) mole_concentration_of_miscellaneous_phytoplankton_expressed_as_carbon_in_sea_water : carbon concentration from additional phytoplankton component alone -->
    <field id="CMIP6_phyn"          field_ref="dummy_XYO"        /> <!-- P1 (mol m-3) mole_concentration_of_phytoplankton_expressed_as_nitrogen_in_sea_water : sum of phytoplankton nitrogen component concentrations -->
    <field id="CMIP6_phynos"        field_ref="dummy_XY"        /> <!-- P3 (mol m-3) phynos : sum of phytoplankton nitrogen component concentrations -->
@@ -462,10 +462,10 @@
    <field id="CMIP6_phypico"       field_ref="dummy_XY"        /> <!-- P1 (mol m-3) mole_concentration_of_picophytoplankton_expressed_as_carbon_in_sea_water : carbon concentration from the picophytoplankton (<2 um) component alone -->
    <field id="CMIP6_phypos"        field_ref="dummy_XYO"        /> <!-- P3 (mol m-3) phypos : sum of phytoplankton phosphorus components -->
-   <field id="CMIP6_physi"         field_ref="DSi_E3T" > @DSi_E3T / @e3t * 1e-3 </field><!-- P2 (mol m-3) mole_concentration_of_phytoplankton_expressed_as_silicon_in_sea_water : sum of phytoplankton silica component concentrations -->
-   <field id="CMIP6_physios"       field_ref="DSiSFC_E3T" > @DSiSFC_E3T / @E3TSFC * 1e-3 </field><!-- P3 (mol m-3) physios : sum of phytoplankton silica component concentrations -->
+   <field id="CMIP6_physi"         field_ref="DSi_E3T"  expr="@DSi_E3T / @e3t * 1e-3" >  DSi_E3T / e3t * 1e-3 </field> <!-- P2 (mol m-3) mole_concentration_of_phytoplankton_expressed_as_silicon_in_sea_water : sum of phytoplankton silica component concentrations -->
+   <field id="CMIP6_physios"       field_ref="DSiSFC_E3T" expr="@DSiSFC_E3T / @E3TSFC * 1e-3" >  DSiSFC_E3T / E3TSFC * 1e-3 </field> <!-- P3 (mol m-3) physios : sum of phytoplankton silica component concentrations -->
    <field id="CMIP6_pnitrate"      field_ref="TPNEW"            /> <!-- P2 (mol m-3 s-1) tendency_of_mole_concentration_of_particulate_organic_matter_expressed_as_carbon_in_sea_water_due_to_nitrate_utilization : Primary (organic carbon) production by phytoplankton due to nitrate uptake alone -->
-   <field id="CMIP6_po4"           field_ref="PO4_E3T" > @PO4_E3T / @e3t * 1e-3 </field><!-- P1 (mol m-3) mole_concentration_of_phosphate_in_sea_water : Dissolved Phosphate Concentration -->
-   <field id="CMIP6_poc"           field_ref="POC_E3T" > @POC_E3T / @e3t + @GOC_E3T / @e3t </field><!-- (mol m-3) mole_concentration_of_particulate_organic_matter_expressed_as_carbon_in_sea_water : sum of particulate organic carbon component concentrations -->
-   <field id="CMIP6_pocos"         field_ref="POCSFC_E3T" > @POCSFC_E3T / @E3TSFC * 1e-3 + @GOCSFC_E3T / @E3TSFC * 1e-3 </field><!-- (mol m-3) pocos : sum of Surface particulate organic carbon component concentrations -->
+   <field id="CMIP6_po4"           field_ref="PO4_E3T" expr="@PO4_E3T / @e3t * 1e-3" >  PO4_E3T / e3t * 1e-3 </field> <!-- P1 (mol m-3) mole_concentration_of_phosphate_in_sea_water : Dissolved Phosphate Concentration -->
+   <field id="CMIP6_poc"           field_ref="POC_E3T" expr="@POC_E3T / @e3t * 1e-3 + @GOC_E3T / @e3t * 1e-3" >  POC_E3T / e3t * 1e-3 + GOC_E3T / e3t * 1e-3 </field> <!-- (mol m-3) mole_concentration_of_particulate_organic_matter_expressed_as_carbon_in_sea_water : sum of particulate organic carbon component concentrations -->
+   <field id="CMIP6_pocos"         field_ref="POCSFC_E3T" expr="@POCSFC_E3T / @E3TSFC * 1e-3 + @GOCSFC_E3T / @E3TSFC * 1e-3" > POCSFC_E3T / E3TSFC * 1e-3 + GOCSFC_E3T / E3TSFC * 1e-3 </field> <!-- (mol m-3) pocos : sum of Surface particulate organic carbon component concentrations -->
    <field id="CMIP6_pon"           field_ref="dummy_XYO"        /> <!-- P1 (mol m-3) mole_concentration_of_particulate_organic_matter_expressed_as_nitrogen_in_sea_water : sum of particulate organic nitrogen component concentrations -->
    <field id="CMIP6_ponos"         field_ref="dummy_XY"        /> <!-- P3 (mol m-3) ponos : sum of particulate organic nitrogen component concentrations -->
@@ -479,17 +479,17 @@
    <field id="CMIP6_pppico"        field_ref="dummy_XYO"        /> <!-- P3 (mol m-3 s-1) tendency_of_mole_concentration_of_particulate_organic_matter_expressed_as_carbon_in_sea_water_due_to_net_primary_production_by_picophytoplankton : Primary (organic carbon) production by the picophytoplankton (<2 um) component alone -->
    <field id="CMIP6_remoc"         field_ref="REMIN"            /> <!-- P2 (mol m-3 s-1) remoc : Remineralization of Organic Carbon -->
-   <field id="CMIP6_si"            field_ref="Si_E3T" > @Si_E3T / @e3t * 1e-3 </field><!-- P1 (mol m-3) mole_concentration_of_silicate_in_sea_water : Total Dissolved Inorganic Silicon Concentration -->
-   <field id="CMIP6_sios"          field_ref="SiSFC_E3T" > @SiSFC_E3T / @E3TSFC * 1e-3 </field><!-- P1 (mol m-3) sios : Surface Total Dissolved Inorganic Silicon Concentration -->
+   <field id="CMIP6_si"            field_ref="Si_E3T"  expr="@Si_E3T / @e3t * 1e-3" >  Si_E3T / e3t * 1e-3 </field> <!-- P1 (mol m-3) mole_concentration_of_silicate_in_sea_water : Total Dissolved Inorganic Silicon Concentration -->
+   <field id="CMIP6_sios"          field_ref="SiSFC_E3T" expr="@SiSFC_E3T / @E3TSFC * 1e-3" >  SiSFC_E3T / E3TSFC * 1e-3 </field> <!-- P1 (mol m-3) sios : Surface Total Dissolved Inorganic Silicon Concentration -->
    <field id="CMIP6_spco2"         field_ref="pCO2sea"   >  this * 0.101325  </field>  <!-- P1 (Pa) surface_partial_pressure_of_carbon_dioxide_in_sea_water : Surface Aqueous Partial Pressure of CO2 -->
    <field id="CMIP6_spco2abio"     field_ref="dummy_XY"         /> <!-- P1 (Pa) spco2abio : Abiotic Surface Aqueous Partial Pressure of CO2 -->
    <field id="CMIP6_spco2nat"      field_ref="dummy_XY"         /> <!-- P1 (Pa) spco2nat : Natural Surface Aqueous Partial Pressure of CO2 -->
-   <field id="CMIP6_talk"          field_ref="Alkalini_E3T" > @Alkalini_E3T / @e3t * 1e-3 </field><!-- P1 (mol m-3) sea_water_alkalinity_expressed_as_mole_equivalent : total alkalinity equivalent concentration (including carbonate, nitrogen, silicate, and borate components) -->
+   <field id="CMIP6_talk"          field_ref="Alkalini_E3T" expr="@Alkalini_E3T / @e3t * 1e-3" > Alkalini_E3T / e3t * 1e-3 </field> <!-- P1 (mol m-3) sea_water_alkalinity_expressed_as_mole_equivalent : total alkalinity equivalent concentration (including carbonate, nitrogen, silicate, and borate components) -->
    <field id="CMIP6_talknat"       field_ref="dummy_XYO"         /> <!-- P1 (mol m-3) talknat : total alkalinity equivalent concentration (including carbonate, borate, phosphorus, silicon, and nitrogen components) at preindustrial atmospheric xCO2 -->
    <field id="CMIP6_talknatos"     field_ref="dummy_XYO"         /> <!-- P1 (mol m-3) talknatos : total alkalinity equivalent concentration (including carbonate, borate, phosphorus, silicon, and nitrogen components) at preindustrial atmospheric xCO2 -->
-   <field id="CMIP6_zmeso"         field_ref="ZOO2_E3T" > @ZOO2_E3T / @e3t * 1e-3 </field> <!-- P2 (mol m-3) mole_concentration_of_mesozooplankton_expressed_as_carbon_in_sea_water : carbon  concentration from mesozooplankton (20-200 um) component alone -->
-   <field id="CMIP6_zmicro"        field_ref="ZOO_E3T" > @ZOO_E3T / @e3t * 1e-3 </field> <!-- P1 (mol m-3) mole_concentration_of_microzooplankton_expressed_as_carbon_in_sea_water : carbon  concentration from the microzooplankton (<20 um) component alone -->
+   <field id="CMIP6_zmeso"         field_ref="ZOO2_E3T" expr="@ZOO2_E3T / @e3t * 1e-3" > ZOO2_E3T / e3t * 1e-3 </field>  <!-- P2 (mol m-3) mole_concentration_of_mesozooplankton_expressed_as_carbon_in_sea_water : carbon  concentration from mesozooplankton (20-200 um) component alone -->
+   <field id="CMIP6_zmicro"        field_ref="ZOO_E3T"  expr="@ZOO_E3T / @e3t * 1e-3"  > ZOO_E3T / e3t * 1e-3   </field> <!-- P1 (mol m-3) mole_concentration_of_microzooplankton_expressed_as_carbon_in_sea_water : carbon  concentration from the microzooplankton (<20 um) component alone -->
    <field id="CMIP6_zmisc"         field_ref="dummy_XYO"        /> <!-- P3 (mol m-3) mole_concentration_of_miscellaneous_zooplankton_expressed_as_carbon_in_sea_water : carbon from additional zooplankton component concentrations alone (e.g. Micro, meso).  Since the models all have different numbers of components, this variable has been included to provide a check for intercomparison between models since some phytoplankton groups are supersets. -->
    <field id="CMIP6_zo2min"        field_ref="ZO2MIN"           /> <!-- P1 (m) depth_at_shallowest_local_minimum_in_vertical_profile_of_mole_concentration_of_dissolved_molecular_oxygen_in_sea_water : Depth of vertical minimum concentration of dissolved oxygen gas (if two, then the shallower) -->
-   <field id="CMIP6_zooc"          field_ref="ZOO_E3T" > @ZOO_E3T / @e3t * 1e-3 + @ZOO2_E3T / @e3t * 1e-3 </field>  <!-- P1 (mol m-3) mole_concentration_of_zooplankton_expressed_as_carbon_in_sea_water : sum of zooplankton carbon component concentrations -->
+   <field id="CMIP6_zooc"          field_ref="ZOO_E3T" expr="@ZOO_E3T / @e3t * 1e-3 + @ZOO2_E3T / @e3t * 1e-3" > ZOO_E3T / e3t * 1e-3 + ZOO2_E3T / e3t * 1e-3   </field> <!-- P1 (mol m-3) mole_concentration_of_zooplankton_expressed_as_carbon_in_sea_water : sum of zooplankton carbon component concentrations -->
     <field id="CMIP6_zsatarag"      field_ref="dummy_XYO"        /> <!-- P1 (m) minimum_depth_of_aragonite_undersaturation_in_sea_water : Depth of aragonite saturation horizon (0 if undersaturated at all depths, "missing" if supersaturated at all depths; if multiple horizons exist, the shallowest should be taken). -->
    <field id="CMIP6_zsatcalc"      field_ref="dummy_XYO"           /> <!-- P1 (m) minimum_depth_of_calcite_undersaturation_in_sea_water : Depth of calcite saturation horizon (0 if undersaturated at all depths, and missing saturated through whole depth; if two or more horizons exist, then the shallowest is reported) -->
