cloudnetpy-qc 1.23.0__py3-none-any.whl → 1.24.1__py3-none-any.whl

cloudnetpy_qc/data/area-type-table.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <area_type_table xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="area-type-table-1.1.xsd">
   <title>Area Type Table</title>
-  <version_number>12</version_number>
-  <date>21 January 2025</date>
+  <version_number>13</version_number>
+  <date>20 March 2025</date>
   <institution>Centre for Environmental Data Analysis</institution>
   <contact>support@ceda.ac.uk</contact>
 
@@ -84,6 +84,9 @@
   <entry id="ice_sheet">
     <description>An area type of "ice_sheet" indicates where ice sheets are present. It includes both grounded ice sheets resting over bedrock and any ice shelves flowing over the ocean that are attached to grounded ice sheets. The ice_sheet area type excludes ice-caps and glaciers and any floating ice shelves and ice tongues attached to them, but the land_ice area type includes those as well as the ice_sheet area.</description>
   </entry>
+  <entry id="lake_and_inland_sea">
+    <description>The area type lake_and_inland_sea means a quasi-permanent body of water surrounded by land, which may include certain ponds and reservoirs, but excludes rivers and streams which by gravity convey water into and out of lakes or inland seas or into the ocean.</description>
+  </entry>
   <entry id="lake_ice_or_sea_ice">
     <description>Floating ice excluding ice-shelves and icebergs.</description>
   </entry>
@@ -135,6 +138,9 @@
   <entry id="rain">
     <description>An area_type of "rain" indicates that falling rain is present at some level in the atmospheric column above an area on the surface of the Earth.</description>
   </entry>
+  <entry id="river">
+    <description>The area type river means flowing water in a channel that is mainly driven by gravity. It includes streams, creeks and canals but not lakes or seas. It also includes water in a floodplain.</description>
+  </entry>
   <entry id="sea">
     <description>The area occupied by type "sea" is equal to the sum of the areas of types "ice_free_sea" and "sea_ice".</description>
   </entry>

cloudnetpy_qc/data/cf-standard-name-table.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
    <standard_name_table xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://cfconventions.org/Data/schema-files/cf-standard-name-table-2.0.xsd">
-   <version_number>89</version_number>
-   <conventions>CF-StandardNameTable-89</conventions>
-   <first_published>2025-01-21T13:26:50Z</first_published>
-   <last_modified>2025-01-21T13:26:50Z</last_modified>
+   <version_number>90</version_number>
+   <conventions>CF-StandardNameTable-90</conventions>
+   <first_published>2025-03-20T01:16:14Z</first_published>
+   <last_modified>2025-03-20T01:16:14Z</last_modified>
    <institution>Centre for Environmental Data Analysis</institution>
    <contact>support@ceda.ac.uk</contact>
 
@@ -1963,6 +1963,11 @@
       <description>&quot;Content&quot; indicates a quantity per unit area. Examples of &quot;forestry and agricultural products&quot; are paper, cardboard, furniture, timber for construction, biofuels and food for both humans and livestock. Models that simulate land use changes have one or more pools of carbon that represent these products in order to conserve carbon and allow its eventual release into the atmosphere, for example, when the products decompose in landfill sites.</description>
    </entry>
 
+   <entry id="carbon_mass_content_of_geological_storage">
+      <canonical_units>kg m-2</canonical_units>
+      <description>The carbon mass per unit area that has been intentionally removed from the environment by e.g., biomass energy with carbon capture and storage (BECCS), and stored indefinitely long-term (i.e., geologic storage). &quot;Content&quot; indicates a quantity per unit area.</description>
+   </entry>
+
    <entry id="carbon_mass_flux_into_forestry_and_agricultural_products_due_to_anthropogenic_land_use_or_land_cover_change">
       <canonical_units>kg m-2 s-1</canonical_units>
       <description>In accordance with common usage in geophysical disciplines, &quot;flux&quot; implies per unit area, called &quot;flux density&quot; in physics. The specification of a physical process by the phrase &quot;due_to_&quot; process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. &quot;Anthropogenic&quot; means influenced, caused, or created by human activity. Examples of &quot;forestry and agricultural products&quot; are paper, cardboard, furniture, timber for construction, biofuels and food for both humans and livestock. Models that simulate land use changes have one or more pools of carbon that represent these products in order to conserve carbon and allow its eventual release into the atmosphere, for example, when the products decompose in landfill sites. &quot;Anthropogenic land use change&quot; means human changes to land, excluding forest regrowth. It includes fires ignited by humans for the purpose of land use change and the processes of eventual disposal and decomposition of wood products such as paper, cardboard, furniture and timber for construction.</description>
@@ -3563,11 +3568,36 @@
       <description>The phrase &quot;integral_wrt_X_of_Y&quot; means int Y dX. To specify the limits of the integral the data variable should have an axis for X and associated coordinate bounds. If no axis for X is associated with the data variable, or no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is air the integral is assumed to be calculated over the full depth of the atmosphere. The phrase &quot;wrt&quot; means &quot;with respect to&quot;. The phrase &quot;product_of_X_and_Y&quot; means X*Y. Depth is the vertical distance below the surface. Sea water salinity is the salt content of sea water, often on the Practical Salinity Scale of 1978. However, the unqualified term &#x27;salinity&#x27; is generic and does not necessarily imply any particular method of calculation. The units of salinity are dimensionless and the units attribute should normally be given as 1e-3 or 0.001 i.e. parts per thousand. There are standard names for the more precisely defined salinity quantities sea_water_knudsen_salinity, S_K (used for salinity observations between 1901 and 1966), sea_water_cox_salinity, S_C (used for salinity observations between 1967 and 1977), sea_water_practical_salinity, S_P (used for salinity observations from 1978 to the present day), sea_water_absolute_salinity, S_A, sea_water_preformed_salinity, S_*, and sea_water_reference_salinity. Practical Salinity is reported on the Practical Salinity Scale of 1978 (PSS-78), and is usually based on the electrical conductivity of sea water in observations since the 1960s. Conversion of data between the observed scales follows S_P = (S_K - 0.03) * (1.80655 / 1.805) and S_P = S_C, however the accuracy of the latter is dependent on whether chlorinity or conductivity was used to determine the S_C value, with this inconsistency driving the development of PSS-78. The more precise standard names should be used where appropriate for both modelled and observed salinities. In particular, the use of sea_water_salinity to describe salinity observations made from 1978 onwards is now deprecated in favor of the term sea_water_practical_salinity which is the salinity quantity stored by national data centers for post-1978 observations. The only exception to this is where the observed salinities are definitely known not to be recorded on the Practical Salinity Scale. Practical salinity units are dimensionless. The unit &quot;parts per thousand&quot; was used for sea_water_knudsen_salinity and sea_water_cox_salinity. Sea water density is the in-situ density (not the potential density). For Boussinesq models, density is the constant Boussinesq reference density, a quantity which has the standard name reference_sea_water_density_for_boussinesq_approximation.</description>
    </entry>
 
+   <entry id="integral_wrt_depth_of_sea_water_absolute_salinity_expressed_as_salt_mass_content">
+      <canonical_units>kg m-2</canonical_units>
+      <description>The phrase &quot;integral_wrt_X_of_Y&quot; means int Y dX. To specify the limits of the integral the data variable should have an axis for X and associated coordinate bounds. If no axis for X is associated with the data variable, or no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is air the integral is assumed to be calculated over the full depth of the atmosphere. The abbreviation &quot;wrt&quot; means &quot;with respect to&quot;.  Depth is the vertical distance below the surface. Absolute Salinity, S_A, is defined as part of the Thermodynamic Equation of Seawater 2010 (TEOS-10) which was adopted in 2010 by the Intergovernmental Oceanographic Commission (IOC). It is the mass fraction of dissolved material in sea water. Absolute Salinity incorporates the spatial variations in the composition of sea water. This type of Absolute Salinity is also called &quot;Density Salinity&quot;. TEOS-10 estimates Absolute Salinity as the salinity variable that, when used with the TEOS-10 expression for density, yields the correct density of a sea water sample even when the sample is not of Reference Composition. In practice, Absolute Salinity is often calculated from Practical Salinity using a spatial lookup table of pre-defined values of the Absolute Salinity Anomaly. It is recommended that the version of (TEOS-10) software and the associated Absolute Salinity Anomaly climatology be specified within metadata by attaching a comment attribute to the data variable. Reference: www.teos-10.org; Millero et al., 2008 doi: 10.1016/j.dsr.2007.10.001. There are also standard names for the precisely defined salinity quantities sea_water_knudsen_salinity, S_K (used for salinity observations between 1901 and 1966), sea_water_cox_salinity, S_C (used for salinity observations between 1967 and 1977), sea_water_practical_salinity, S_P (used for salinity observations from 1978 onwards), sea_water_preformed_salinity, S_*, and sea_water_reference_salinity. Salinity quantities that do not match any of the precise definitions should be given the more general standard name of sea_water_salinity.</description>
+   </entry>
+
+   <entry id="integral_wrt_depth_of_sea_water_conservative_temperature_expressed_as_heat_content">
+      <canonical_units>J m-2</canonical_units>
+      <description>The phrase &quot;integral_wrt_X_of_Y&quot; means int Y dX. The abbreviation &quot;wrt&quot; means &quot;with respect to&quot;. To specify the limits of the integral the data variable should have an axis for X and associated coordinate bounds. If no axis for X is associated with the data variable, or no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is air the integral is assumed to be calculated over the full depth of the atmosphere. Conservative Temperature is defined as part of the Thermodynamic Equation of Seawater 2010 (TEOS-10) which was adopted in 2010 by the International Oceanographic Commission (IOC). Conservative Temperature is specific potential enthalpy (which has the standard name sea_water_specific_potential_enthalpy) divided by a fixed value of the specific heat capacity of sea water, namely cp_0 = 3991.86795711963 J kg-1 K-1. The zero Joule reference temperature, referred to as bigthetao, is zero degrees Celsius. Conservative Temperature is a more accurate measure of the &quot;heat content&quot; of sea water, by a factor of one hundred, than is potential temperature. Because of this, it can be regarded as being proportional to the heat content of sea water per unit mass. Reference: www.teos-10.org; McDougall, 2003 doi: 10.1175/1520-0485(2003)033&lt;0945:PEACOV&gt;2.0.CO;2. The phrase &quot;expressed_as_heat_content&quot; means that this quantity is calculated as the specific heat capacity times density of sea water multiplied by the conservative temperature of the sea water in the grid cell and integrated over depth.</description>
+   </entry>
+
+   <entry id="integral_wrt_depth_of_sea_water_potential_temperature_expressed_as_heat_content">
+      <canonical_units>J m-2</canonical_units>
+      <description>The phrase &quot;integral_wrt_X_of_Y&quot; means int Y dX. To specify the limits of the integral the data variable should have an axis for X and associated coordinate bounds. If no axis for X is associated with the data variable, or no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is air the integral is assumed to be calculated over the full depth of the atmosphere. The abbreviation &quot;wrt&quot; means &quot;with respect to&quot;. Depth is the vertical distance below the surface. Sea water potential temperature is the temperature a parcel of sea water would have if moved adiabatically to sea level pressure. The phrase &quot;expressed_as_heat_content&quot; means that this quantity is calculated as the specific heat capacity times density of sea water multiplied by the potential temperature of the sea water in the grid cell and integrated over depth.</description>
+   </entry>
+
    <entry id="integral_wrt_depth_of_sea_water_practical_salinity">
       <canonical_units>m</canonical_units>
       <description>The phrase &quot;integral_wrt_X_of_Y&quot; means int Y dX. To specify the limits of the integral the data variable should have an axis for X and associated coordinate bounds. If no axis for X is associated with the data variable, or no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is air the integral is assumed to be calculated over the full depth of the atmosphere. &quot;wrt&quot; means with respect to. Depth is the vertical distance below the surface. Practical Salinity, S_P, is a determination of the salinity of sea water, based on its electrical conductance. The measured conductance, corrected for temperature and pressure, is compared to the conductance of a standard  potassium chloride solution, producing a value on the Practical Salinity Scale of 1978 (PSS-78). This name should not be used to describe salinity observations made before 1978, or ones not based on conductance measurements. Conversion of Practical Salinity to other precisely defined salinity measures should use the appropriate formulas specified by TEOS-10. Other standard names for precisely defined salinity quantities are sea_water_absolute_salinity (S_A); sea_water_preformed_salinity (S_*), sea_water_reference_salinity (S_R); sea_water_cox_salinity (S_C), used for salinity observations between 1967 and 1977; and sea_water_knudsen_salinity (S_K), used for salinity observations between 1901 and 1966. Salinity quantities that do not match any of the precise definitions should be given the more general standard name of sea_water_salinity. Reference: www.teos-10.org; Lewis, 1980 doi:10.1109/JOE.1980.1145448.</description>
    </entry>
 
+   <entry id="integral_wrt_depth_of_sea_water_practical_salinity_expressed_as_salt_mass_content">
+      <canonical_units>kg m-2</canonical_units>
+      <description>The phrase &quot;integral_wrt_X_of_Y&quot; means int Y dX. To specify the limits of the integral the data variable should have an axis for X and associated coordinate bounds. If no axis for X is associated with the data variable, or no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is air the integral is assumed to be calculated over the full depth of the atmosphere. The abbreviation &quot;wrt&quot; means &quot;with respect to&quot;. Depth is the vertical distance below the surface. Practical Salinity, S_P, is a determination of the salinity of sea water, based on its electrical conductance. The measured conductance, corrected for temperature and pressure, is compared to the conductance of a standard potassium chloride solution, producing a value on the Practical Salinity Scale of 1978 (PSS-78). This name should not be used to describe salinity observations made before 1978, or ones not based on conductance measurements. Conversion of Practical Salinity to other precisely defined salinity measures should use the appropriate formulas specified by TEOS-10. Other standard names for precisely defined salinity quantities are sea_water_absolute_salinity (S_A); sea_water_preformed_salinity (S_*), sea_water_reference_salinity (S_R); sea_water_cox_salinity (S_C), used for salinity observations between 1967 and 1977; and sea_water_knudsen_salinity (S_K), used for salinity observations between 1901 and 1966. Salinity quantities that do not match any of the precise definitions should be given the more general standard name of sea_water_salinity. Reference: www.teos-10.org; Lewis, 1980 doi:10.1109/JOE.1980.1145448.</description>
+   </entry>
+
+   <entry id="integral_wrt_depth_of_sea_water_preformed_salinity_expressed_as_salt_mass_content">
+      <canonical_units>kg m-2</canonical_units>
+      <description>The phrase &quot;integral_wrt_X_of_Y&quot; means int Y dX. To specify the limits of the integral the data variable should have an axis for X and associated coordinate bounds. If no axis for X is associated with the data variable, or no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is air the integral is assumed to be calculated over the full depth of the atmosphere. The abbreviation &quot;wrt&quot; means &quot;with respect to&quot;. Depth is the vertical distance below the surface. Preformed Salinity, S*, is defined as part of the Thermodynamic Equation of Seawater 2010 (TEOS-10) which was adopted in 2010 by the Intergovernmental Oceanographic Commission (IOC). Preformed Salinity is a salinity variable that is designed to be as conservative as possible, by removing the estimated biogeochemical influences on the sea water composition. Preformed Salinity is Absolute Salinity, S_A (which has the standard name sea_water_absolute_salinity), minus all contributions to sea water composition from biogeochemical processes. Preformed Salinity is the mass fraction of dissolved material in sea water. Reference: www.teos-10.org; Pawlowicz et al., 2011 doi: 10.5194/os-7-363-2011; Wright et al., 2011 doi: 10.5194/os-7-1-2011. There are also standard names for the precisely defined salinity quantities sea_water_knudsen_salinity, S_K (used for salinity observations between 1901 and 1966), sea_water_cox_salinity, S_C (used for salinity observations between 1967 and 1977), sea_water_practical_salinity, S_P (used for salinity observations from 1978 onwards), and sea_water_reference_salinity. Salinity quantities that do not match any of the precise definitions should be given the more general standard name of sea_water_salinity.</description>
+   </entry>
+
    <entry id="integral_wrt_depth_of_sea_water_temperature">
       <canonical_units>K m</canonical_units>
       <description>The phrase &quot;integral_wrt_X_of_Y&quot; means int Y dX. To specify the limits of the integral the data variable should have an axis for X and associated coordinate bounds. If no axis for X is associated with the data variable, or no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is air the integral is assumed to be calculated over the full depth of the atmosphere. &quot;wrt&quot; means with respect to. Depth is the vertical distance below the surface. Sea water temperature is the in situ temperature of the sea water. For observed data, depending on the period during which the observation was made, the measured in situ temperature was recorded against standard &quot;scales&quot;. These historical scales include the International Practical Temperature Scale of 1948 (IPTS-48; 1948-1967), the International Practical Temperature Scale of 1968 (IPTS-68, Barber, 1969; 1968-1989) and the International Temperature Scale of 1990 (ITS-90, Saunders 1990; 1990 onwards). Conversion of data between these scales follows t68 = t48 - (4.4 x 10e-6) * t48(100 - t - 48); t90 = 0.99976 * t68. Observations made prior to 1948 (IPTS-48) have not been documented and therefore a conversion cannot be certain. Differences between t90 and t68 can be up to 0.01 at temperatures of 40 C and above; differences of 0.002-0.007 occur across the standard range of ocean temperatures (-10 - 30 C). The International Equation of State of Seawater 1980 (EOS-80, UNESCO, 1981) and the Practical Salinity Scale (PSS-78) were both based on IPTS-68, while the Thermodynamic Equation of Seawater 2010 (TEOS-10) is based on ITS-90. References: Barber, 1969, doi: 10.1088/0026-1394/5/2/001; UNESCO, 1981; Saunders, 1990, WOCE Newsletter, 10, September 1990. It is strongly recommended that a variable with this standard name should have a units_metadata attribute, with one of the values &quot;on-scale&quot; or &quot;difference&quot;, whichever is appropriate for the data, because it is essential to know whether the temperature is on-scale (meaning relative to the origin of the scale indicated by the units) or refers to temperature differences (implying that the origin of the temperature scale is irrevelant), in order to convert the units correctly (cf. https://cfconventions.org/cf-conventions/cf-conventions.html#temperature-units).</description>
@@ -5523,6 +5553,11 @@
       <description>The phrase &quot;ratio_of_X_to_Y&quot; means X/Y. The phrase &quot;isotope_ratio&quot; is used in the construction isotope_ratio_of_A_to_B where A and B are both named isotopes. It means the ratio of the number of atoms of A to the number of atoms of B present within a medium. &quot;O&quot; means the element &quot;oxygen&quot; and &quot;18O&quot; is the stable isotope &quot;oxygen-18&quot;. &quot;16O&quot; is the stable isotope &quot;oxygen-16&quot;. The phrase &quot;in_sea_water_excluding_solutes_and_solids&quot; means that the standard name refers only to the chemical compound water and does not include material that may be dissolved or suspended in the aqueous medium.</description>
    </entry>
 
+   <entry id="isotope_ratio_of_2H_to_1H_in_sea_water_excluding_solutes_and_solids">
+      <canonical_units>1</canonical_units>
+      <description>The phrase &quot;ratio_of_X_to_Y&quot; means X/Y. The phrase &quot;isotope_ratio&quot; is used in the construction isotope_ratio_of_A_to_B where A and B are both named isotopes. It means the ratio of the number of atoms of A to the number of atoms of B present within a medium. &quot;H&quot; means the element &quot;hydrogen&quot; and &quot;2H&quot; is the stable isotope &quot;hydrogen-2&quot;, usually called &quot;deuterium&quot;. &quot;1H&quot; is the stable isotope &quot;hydrogen-1&quot;. The phrase &quot;in_sea_water_excluding_solutes_and_solids&quot; means that the standard name refers only to the chemical compound water and does not include material that may be dissolved or suspended in the aqueous medium.</description>
+   </entry>
+
    <entry id="isotropic_longwave_radiance_in_air">
       <canonical_units>W m-2 sr-1</canonical_units>
       <description>&quot;longwave&quot; means longwave radiation. Radiance is the radiative flux in a particular direction, per unit of solid angle. If radiation is isotropic, the radiance is independent of direction, so the direction should not be specified. If the radiation is directionally dependent, a standard name of upwelling or downwelling radiance should be chosen instead.</description>
@@ -7188,6 +7223,11 @@
       <description>&quot;Content&quot; indicates a quantity per unit area. &quot;Layer&quot; means any layer with upper and lower boundaries that have constant values in some vertical coordinate. There must be a vertical coordinate variable indicating the extent of the layer(s). If the layers are model layers, the vertical coordinate can be model_level_number, but it is recommended to specify a physical coordinate (in a scalar or auxiliary coordinate variable) as well.</description>
    </entry>
 
+   <entry id="mass_flux_of_carbon_from_biomass_into_geological_storage">
+      <canonical_units>kg m-2 s-1</canonical_units>
+      <description>The flux of carbon from biomass that is intentionally stored in long-term geological reservoirs as a carbon dioxide removal process. This is most closely related to the quantity with standard name mass_flux_of_carbon_into_forestry_and_agricultural_products_due_to_crop_harvesting which represents the flux due to product pools. For the purpose of simulations that include intentional carbon dioxide removal from biomass (e.g., biomass energy with carbon capture and storage (BECCS)), it is necessary to be able to separate the fluxes to indefinitely long-term (i.e. geologic storage) pools from shorter- and medium-term cycling product pools. In accordance with common usage in geophysical disciplines, &quot;flux&quot; implies per unit area, called &quot;flux density&quot; in physics.</description>
+   </entry>
+
    <entry id="mass_flux_of_carbon_into_forestry_and_agricultural_products_due_to_crop_harvesting">
       <canonical_units>kg m-2 s-1</canonical_units>
       <description>In accordance with common usage in geophysical disciplines, &quot;flux&quot; implies per unit area, called &quot;flux density&quot; in physics. Examples of &quot;forestry and agricultural products&quot; are paper, cardboard, furniture, timber for construction, biofuels and food for both humans and livestock. Models that simulate land use changes have one or more pools of carbon that represent these products in order to conserve carbon and allow its eventual release into the atmosphere, for example, when the products decompose in landfill sites. The specification of a physical process by the phrase &quot;due_to_&quot; process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. The definition of &quot;crop&quot; is model dependent, for example, some models may include fruit trees, trees grown for timber or other types of agricultural and forestry planting as crops. Crop harvesting means the human activity of collecting plant materials for the purpose of turning them into forestry or agricultural products.</description>
@@ -8928,6 +8968,11 @@
       <description>Mole concentration means number of moles per unit volume, also called &quot;molarity&quot;, and is used in the construction mole_concentration_of_X_in_Y, where X is a material constituent of Y.  A chemical species denoted by X may be described by a single term such as &#x27;nitrogen&#x27; or a phrase such as &#x27;nox_expressed_as_nitrogen&#x27;. The chemical formula for molecular hydrogen is H2.</description>
    </entry>
 
+   <entry id="mole_concentration_of_nanophytoplankton_expressed_as_carbon_in_sea_water">
+      <canonical_units>mol m-3</canonical_units>
+      <description>&quot;Mole concentration&quot; means number of moles per unit volume, also called &quot;molarity&quot;, and is used in the construction &quot;mole_concentration_of_X_in_Y&quot;, where X is a material constituent of Y. A chemical species or biological group denoted by X may be described by a single term such as &quot;nitrogen&quot; or a phrase such as &quot;nox_expressed_as_nitrogen&quot;. The phrase &quot;expressed_as&quot; is used in the construction &quot;A_expressed_as_B&quot;, where B is a chemical constituent of A. It means that the quantity indicated by the standard name is calculated solely with respect to the B contained in A, neglecting all other chemical constituents of A. Phytoplankton are algae that grow where there is sufficient light to support photosynthesis.  Nanophytoplankton are phytoplankton in the size range 2 – 20 micrometers.</description>
+   </entry>
+
    <entry id="mole_concentration_of_nitrate_and_nitrite_in_sea_water">
       <canonical_units>mol m-3</canonical_units>
       <description>Mole concentration means number of moles per unit volume, also called &quot;molarity&quot;, and is used in the construction mole_concentration_of_X_in_Y, where X is a material constituent of Y. A chemical species denoted by X may be described by a single term such as &#x27;nitrogen&#x27; or a phrase such as &#x27;nox_expressed_as_nitrogen&#x27;. The chemical formula for the nitrate anion is NO3-. The chemical formula for the nitrite anion is NO2-.</description>
@@ -14644,11 +14689,6 @@ http://vocab.nerc.ac.uk/collection/P01/current/TPHSDSZZ/6/.</description>
       <description>Potential temperature is the temperature a parcel of air or sea water would have if moved adiabatically to sea level pressure. The potential temperature at the sea floor is that adjacent to the ocean bottom, which would be the deepest grid cell in an ocean model and within the benthic boundary layer for measurements. It is strongly recommended that a variable with this standard name should have a units_metadata attribute, with one of the values &quot;on-scale&quot; or &quot;difference&quot;, whichever is appropriate for the data, because it is essential to know whether the temperature is on-scale (meaning relative to the origin of the scale indicated by the units) or refers to temperature differences (implying that the origin of the temperature scale is irrevelant), in order to convert the units correctly (cf. https://cfconventions.org/cf-conventions/cf-conventions.html#temperature-units).</description>
    </entry>
 
-   <entry id="sea_water_potential_temperature_expressed_as_heat_content">
-      <canonical_units>J m-2</canonical_units>
-      <description>The phrase &quot;expressed_as_heat_content&quot; means that this quantity is calculated as the specific heat capacity times density of sea water multiplied by the potential temperature of the sea water in the grid cell and integrated over depth. If used for a layer heat content, coordinate bounds should be used to define the extent of the layers. If no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is sea water the integral is assumed to be calculated over the full depth of the ocean. Potential temperature is the temperature a parcel of air or sea water would have if moved adiabatically to sea level pressure.</description>
-   </entry>
-
    <entry id="sea_water_practical_salinity">
       <canonical_units>1</canonical_units>
       <description>Practical Salinity, S_P, is a determination of the salinity of sea water, based on its electrical conductance. The measured conductance, corrected for temperature and pressure, is compared to the conductance of a standard potassium chloride solution, producing a value on the Practical Salinity Scale of 1978 (PSS-78). This name should not be used to describe salinity observations made before 1978, or ones not based on conductance measurements. Conversion of Practical Salinity to other precisely defined salinity measures should use the appropriate formulas specified by TEOS-10. Other standard names for precisely defined salinity quantities are sea_water_absolute_salinity (S_A); sea_water_preformed_salinity (S_*),  sea_water_reference_salinity (S_R); sea_water_cox_salinity (S_C), used for salinity observations between 1967 and 1977; and sea_water_knudsen_salinity (S_K), used for salinity observations between 1901 and 1966. Salinity quantities that do not match any of the precise definitions should be given the more general standard name of sea_water_salinity. Reference: www.teos-10.org; Lewis, 1980 doi:10.1109/JOE.1980.1145448.</description>
@@ -21674,6 +21714,11 @@ http://vocab.nerc.ac.uk/collection/P01/current/TPHSDSZZ/6/.</description>
       <description>The specification of a physical process by the phrase due_to_process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. &quot;Eastward&quot; indicates a vector component which is positive when directed eastward (negative westward).  The total tendency of the eastward wind due to gravity waves has the standard name tendency_of_eastward_wind_due_to_gravity_wave_drag.  It is the sum of the tendencies due to orographic gravity waves and nonorographic waves.  The tendency of eastward wind due to nonorographic gravity waves has the standard name tendency_of_eastward_wind_due_to_nonorographic_gravity_wave_drag.</description>
    </entry>
 
+   <entry id="tendency_of_eastward_wind_due_to_parameterized_physics">
+      <canonical_units>m s-2</canonical_units>
+      <description>The tendency of the eastward horizontal wind component due to all parameterized physics in a model. The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. &quot;Eastward&quot; indicates a vector component which is positive when directed eastward (negative westward). Wind is defined as a two-dimensional (horizontal) air velocity vector, with no vertical component. (Vertical motion in the atmosphere has the standard name &quot;upward_air_velocity&quot;). The specification of a physical process by the phrase &quot;due_to_&quot; process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase.</description>
+   </entry>
+
    <entry id="tendency_of_enthalpy_content_of_atmosphere_layer_due_to_advection">
       <canonical_units>W m-2</canonical_units>
       <description>The specification of a physical process by the phrase due_to_process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. &quot;tendency_of_X&quot; means derivative of X with respect to time. &quot;Content&quot; indicates a quantity per unit area. &quot;Layer&quot; means any layer with upper and lower boundaries that have constant values in some vertical coordinate. There must be a vertical coordinate variable indicating the extent of the layer(s). If the layers are model layers, the vertical coordinate can be model_level_number, but it is recommended to specify a physical coordinate (in a scalar or auxiliary coordinate variable) as well. Enthalpy can be written either as (1) CpT, where Cp is heat capacity at constant pressure, T is absolute temperature, or (2) U+pV, where U is internal energy, p is pressure and V is volume.</description>
@@ -21684,6 +21729,111 @@ http://vocab.nerc.ac.uk/collection/P01/current/TPHSDSZZ/6/.</description>
       <description>Global average sea level change is due to change in volume of the water in the ocean, caused by mass and/or density change, or to change in the volume of the ocean basins, caused by tectonics etc. It is sometimes called &quot;eustatic&quot;, which is a term that also has other definitions. It differs from the change in the global average sea surface height relative to the centre of the Earth by the global average vertical movement of the ocean floor. Zero sea level change is an arbitrary level. &quot;tendency_of_X&quot; means derivative of X with respect to time. Because global average sea level change quantifies the change in volume of the world ocean, it is not calculated necessarily by considering local changes in mean sea level.</description>
    </entry>
 
+   <entry id="tendency_of_integral_wrt_depth_of_sea_water_conservative_temperature_expressed_as_heat_content">
+      <canonical_units>W m-2</canonical_units>
+      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. This tendency encompasses all processes that impact on the time changes for the heat content within a grid cell. The phrase &quot;integral_wrt_X_of_Y&quot; means int Y dX. To specify the limits of the integral the data variable should have an axis for X and associated coordinate bounds. If no axis for X is associated with the data variable, or no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is air the integral is assumed to be calculated over the full depth of the atmosphere. The abbreviation &quot;wrt&quot; means &quot;with respect to&quot;. Depth is the vertical distance below the surface. Conservative Temperature is defined as part of the Thermodynamic Equation of Seawater 2010 (TEOS-10) which was adopted in 2010 by the International Oceanographic Commission (IOC). Conservative Temperature is specific potential enthalpy (which has the standard name sea_water_specific_potential_enthalpy) divided by a fixed value of the specific heat capacity of sea water, namely cp_0 = 3991.86795711963 J kg-1 K-1. The zero Joule reference temperature, referred to as bigthetao, is zero degrees Celsius. Conservative Temperature is a more accurate measure of the &quot;heat content&quot; of sea water, by a factor of one hundred, than is potential temperature. Because of this, it can be regarded as being proportional to the heat content of sea water per unit mass. Reference: www.teos-10.org; McDougall, 2003 doi: 10.1175/1520-0485(2003)033&lt;0945:PEACOV&gt;2.0.CO;2. The phrase &quot;expressed_as_heat_content&quot; means that this quantity is calculated as the specific heat capacity times density of sea water multiplied by the conservative temperature of the sea water in the grid cell and integrated over depth.</description>
+   </entry>
+
+   <entry id="tendency_of_integral_wrt_depth_of_sea_water_conservative_temperature_expressed_as_heat_content_due_to_parameterized_dianeutral_mixing">
+      <canonical_units>W m-2</canonical_units>
+      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. The phrase &quot;integral_wrt_X_of_Y&quot; means int Y dX. To specify the limits of the integral the data variable should have an axis for X and associated coordinate bounds. If no axis for X is associated with the data variable, or no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is air the integral is assumed to be calculated over the full depth of the atmosphere. The abbreviation &quot;wrt&quot; means &quot;with respect to&quot;. Depth is the vertical distance below the surface. Conservative Temperature is defined as part of the Thermodynamic Equation of Seawater 2010 (TEOS-10) which was adopted in 2010 by the International Oceanographic Commission (IOC). Conservative Temperature is specific potential enthalpy (which has the standard name sea_water_specific_potential_enthalpy) divided by a fixed value of the specific heat capacity of sea water, namely cp_0 = 3991.86795711963 J kg-1 K-1. The zero Joule reference temperature, referred to as bigthetao, is zero degrees Celsius. Conservative Temperature is a more accurate measure of the &quot;heat content&quot; of sea water, by a factor of one hundred, than is potential temperature. Because of this, it can be regarded as being proportional to the heat content of sea water per unit mass. Reference: www.teos-10.org; McDougall, 2003 doi: 10.1175/1520-0485(2003)033&lt;0945:PEACOV&gt;2.0.CO;2. The phrase &quot;expressed_as_heat_content&quot; means that this quantity is calculated as the specific heat capacity times density of sea water multiplied by the conservative temperature of the sea water in the grid cell and integrated over depth. The specification of a physical process by the phrase &quot;due_to_&quot; process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. &quot;Dianeutral mixing&quot; means mixing across surfaces of neutral buoyancy. &quot;Parameterized&quot; means the part due to a scheme representing processes which are not explicitly resolved by the model.</description>
+   </entry>
+
+   <entry id="tendency_of_integral_wrt_depth_of_sea_water_conservative_temperature_expressed_as_heat_content_due_to_parameterized_eddy_advection">
+      <canonical_units>W m-2</canonical_units>
+      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. The phrase &quot;integral_wrt_X_of_Y&quot; means int Y dX. To specify the limits of the integral the data variable should have an axis for X and associated coordinate bounds. If no axis for X is associated with the data variable, or no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is air the integral is assumed to be calculated over the full depth of the atmosphere. Depth is the vertical distance below the surface. Conservative Temperature is defined as part of the Thermodynamic Equation of Seawater 2010 (TEOS-10) which was adopted in 2010 by the International Oceanographic Commission (IOC). Conservative Temperature is specific potential enthalpy (which has the standard name sea_water_specific_potential_enthalpy) divided by a fixed value of the specific heat capacity of sea water, namely cp_0 = 3991.86795711963 J kg-1 K-1. The zero Joule reference temperature, referred to as bigthetao, is zero degrees Celsius. Conservative Temperature is a more accurate measure of the &quot;heat content&quot; of sea water, by a factor of one hundred, than is potential temperature. Because of this, it can be regarded as being proportional to the heat content of sea water per unit mass. Reference: www.teos-10.org; McDougall, 2003 doi: 10.1175/1520-0485(2003)033&lt;0945:PEACOV&gt;2.0.CO;2. The phrase &quot;expressed_as_heat_content&quot; means that this quantity is calculated as the specific heat capacity times density of sea water multiplied by the conservative temperature of the sea water in the grid cell and integrated over depth. The specification of a physical process by the phrase &quot;due_to_&quot; process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. Parameterized eddy advection in an ocean model means the part due to a scheme representing parameterized eddy-induced advective effects not included in the resolved model velocity field. Parameterized eddy advection can be represented on various spatial scales and there are standard names for parameterized_mesoscale_eddy_advection and parameterized_submesoscale_eddy_advection which both contribute to the total parameterized eddy advection. Additionally, when the parameterized advective process is represented in the model as a skew-diffusion rather than an advection, then the parameterized skew diffusion should be included in this diagnostic. The convergence of a skew-flux is identical (in the continuous formulation) to the convergence of an advective flux, making their tendencies the same.</description>
+   </entry>
+
+   <entry id="tendency_of_integral_wrt_depth_of_sea_water_conservative_temperature_expressed_as_heat_content_due_to_parameterized_mesoscale_eddy_advection">
+      <canonical_units>W m-2</canonical_units>
+      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. The phrase &quot;integral_wrt_X_of_Y&quot; means int Y dX. To specify the limits of the integral the data variable should have an axis for X and associated coordinate bounds. If no axis for X is associated with the data variable, or no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is air the integral is assumed to be calculated over the full depth of the atmosphere. The abbreviation &quot;wrt&quot; means &quot;with respect to&quot;. Depth is the vertical distance below the surface. Conservative Temperature is defined as part of the Thermodynamic Equation of Seawater 2010 (TEOS-10) which was adopted in 2010 by the International Oceanographic Commission (IOC). Conservative Temperature is specific potential enthalpy (which has the standard name sea_water_specific_potential_enthalpy) divided by a fixed value of the specific heat capacity of sea water, namely cp_0 = 3991.86795711963 J kg-1 K-1. The zero Joule reference temperature, referred to as bigthetao, is zero degrees Celsius. Conservative Temperature is a more accurate measure of the &quot;heat content&quot; of sea water, by a factor of one hundred, than is potential temperature. Because of this, it can be regarded as being proportional to the heat content of sea water per unit mass. Reference: www.teos-10.org; McDougall, 2003 doi: 10.1175/1520-0485(2003)033&lt;0945:PEACOV&gt;2.0.CO;2. The phrase &quot;expressed_as_heat_content&quot; means that this quantity is calculated as the specific heat capacity times density of sea water multiplied by the conservative temperature of the sea water in the grid cell and integrated over depth. The specification of a physical process by the phrase &quot;due_to_&quot; process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. Parameterized eddy advection in an ocean model means the part due to a scheme representing parameterized eddy-induced advective effects not included in the resolved model velocity field. Parameterized mesoscale eddy advection occurs on a spatial scale of many tens of kilometres and an evolutionary time of weeks. Reference: James C. McWilliams 2016, Submesoscale currents in the ocean, Proceedings of the Royal Society A: Mathematical, Physical and Engineering Sciences, volume 472, issue 2189. DOI: 10.1098/rspa.2016.0117. Parameterized mesoscale eddy advection is represented in ocean models using schemes such as the Gent-McWilliams scheme. There are also standard names for parameterized_submesoscale_eddy_advection which, along with parameterized_mesoscale_eddy_advection, contributes to the total parameterized eddy advection. Additionally, when the parameterized advective process is represented in the model as a skew-diffusion rather than an advection, then the parameterized skew diffusion should be included in this diagnostic. The convergence of a skew-flux is identical (in the continuous formulation) to the convergence of an advective flux, making their tendencies the same.</description>
+   </entry>
+
+   <entry id="tendency_of_integral_wrt_depth_of_sea_water_conservative_temperature_expressed_as_heat_content_due_to_parameterized_mesoscale_eddy_diffusion">
+      <canonical_units>W m-2</canonical_units>
+      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. The phrase &quot;integral_wrt_X_of_Y&quot; means int Y dX. To specify the limits of the integral the data variable should have an axis for X and associated coordinate bounds. If no axis for X is associated with the data variable, or no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is air the integral is assumed to be calculated over the full depth of the atmosphere. The abbreviation &quot;wrt&quot; means &quot;with respect to&quot;. Depth is the vertical distance below the surface. Conservative Temperature is defined as part of the Thermodynamic Equation of Seawater 2010 (TEOS-10) which was adopted in 2010 by the International Oceanographic Commission (IOC). Conservative Temperature is specific potential enthalpy (which has the standard name sea_water_specific_potential_enthalpy) divided by a fixed value of the specific heat capacity of sea water, namely cp_0 = 3991.86795711963 J kg-1 K-1. The zero Joule reference temperature, referred to as bigthetao, is zero degrees Celsius. Conservative Temperature is a more accurate measure of the &quot;heat content&quot; of sea water, by a factor of one hundred, than is potential temperature. Because of this, it can be regarded as being proportional to the heat content of sea water per unit mass. Reference: www.teos-10.org; McDougall, 2003 doi: 10.1175/1520-0485(2003)033&lt;0945:PEACOV&gt;2.0.CO;2. The phrase &quot;expressed_as_heat_content&quot; means that this quantity is calculated as the specific heat capacity times density of sea water multiplied by the conservative temperature of the sea water in the grid cell and integrated over depth. The specification of a physical process by the phrase &quot;due_to_&quot; process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. Parameterized mesoscale eddy diffusive processes include diffusion along neutral directions in the interior of the ocean and horizontal diffusion in the surface boundary layer. The processes occur on a spatial scale of many tens of kilometres and an evolutionary time of weeks.</description>
+   </entry>
+
+   <entry id="tendency_of_integral_wrt_depth_of_sea_water_conservative_temperature_expressed_as_heat_content_due_to_parameterized_submesoscale_eddy_advection">
+      <canonical_units>W m-2</canonical_units>
+      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. The phrase &quot;integral_wrt_X_of_Y&quot; means int Y dX. To specify the limits of the integral the data variable should have an axis for X and associated coordinate bounds. If no axis for X is associated with the data variable, or no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is air the integral is assumed to be calculated over the full depth of the atmosphere. The abbreviation &quot;wrt&quot; means &quot;with respect to&quot;. Depth is the vertical distance below the surface. Conservative Temperature is defined as part of the Thermodynamic Equation of Seawater 2010 (TEOS-10) which was adopted in 2010 by the International Oceanographic Commission (IOC). Conservative Temperature is specific potential enthalpy (which has the standard name sea_water_specific_potential_enthalpy) divided by a fixed value of the specific heat capacity of sea water, namely cp_0 = 3991.86795711963 J kg-1 K-1. The zero Joule reference temperature, referred to as bigthetao, is zero degrees Celsius. Conservative Temperature is a more accurate measure of the &quot;heat content&quot; of sea water, by a factor of one hundred, than is potential temperature. Because of this, it can be regarded as being proportional to the heat content of sea water per unit mass. Reference: www.teos-10.org; McDougall, 2003 doi: 10.1175/1520-0485(2003)033&lt;0945:PEACOV&gt;2.0.CO;2. The phrase &quot;expressed_as_heat_content&quot; means that this quantity is calculated as the specific heat capacity times density of sea water multiplied by the conservative temperature of the sea water in the grid cell and integrated over depth. The specification of a physical process by the phrase &quot;due_to_&quot; process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. Parameterized eddy advection in an ocean model means the part due to a scheme representing parameterized eddy-induced advective effects not included in the resolved model velocity field. Parameterized submesoscale eddy advection occurs on a spatial scale of the order of 1 km horizontally. Reference: James C. McWilliams 2016, Submesoscale currents in the ocean, Proceedings of the Royal Society A: Mathematical, Physical and Engineering Sciences, volume 472, issue 2189. DOI: 10.1098/rspa.2016.0117. There are also standard names for parameterized_mesoscale_eddy_advection which, along with parameterized_submesoscale_eddy_advection, contributes to the total parameterized eddy advection. Additionally, when the parameterized advective process is represented in the model as a skew-diffusion rather than an advection, then the parameterized skew diffusion should be included in this diagnostic. The convergence of a skew-flux is identical (in the continuous formulation) to the convergence of an advective flux, making their tendencies the same.</description>
+   </entry>
+
+   <entry id="tendency_of_integral_wrt_depth_of_sea_water_conservative_temperature_expressed_as_heat_content_due_to_residual_mean_advection">
+      <canonical_units>W m-2</canonical_units>
+      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. The phrase &quot;integral_wrt_X_of_Y&quot; means int Y dX. To specify the limits of the integral the data variable should have an axis for X and associated coordinate bounds. If no axis for X is associated with the data variable, or no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is air the integral is assumed to be calculated over the full depth of the atmosphere. The abbreviation &quot;wrt&quot; means &quot;with respect to&quot;.  Depth is the vertical distance below the surface. Conservative Temperature is defined as part of the Thermodynamic Equation of Seawater 2010 (TEOS-10) which was adopted in 2010 by the International Oceanographic Commission (IOC). Conservative Temperature is specific potential enthalpy (which has the standard name sea_water_specific_potential_enthalpy) divided by a fixed value of the specific heat capacity of sea water, namely cp_0 = 3991.86795711963 J kg-1 K-1. The zero Joule reference temperature, referred to as bigthetao, is zero degrees Celsius. Conservative Temperature is a more accurate measure of the &quot;heat content&quot; of sea water, by a factor of one hundred, than is potential temperature. Because of this, it can be regarded as being proportional to the heat content of sea water per unit mass. Reference: www.teos-10.org; McDougall, 2003 doi: 10.1175/1520-0485(2003)033&lt;0945:PEACOV&gt;2.0.CO;2. The phrase &quot;expressed_as_heat_content&quot; means that this quantity is calculated as the specific heat capacity times density of sea water multiplied by the conservative temperature of the sea water in the grid cell and integrated over depth. The specification of a physical process by the phrase &quot;due_to_&quot; process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. The phrase &quot;residual_mean_advection&quot; refers to the sum of the model&#x27;s resolved advective transport plus any parameterized advective transport. Parameterized advective transport includes processes such as parameterized mesoscale and submesoscale transport, as well as any other advectively parameterized transport. When the parameterized advective transport is represented in the model as a skew-diffusion rather than an advection, then the parameterized skew diffusion should be included in this diagnostic, since the convergence of skew-fluxes are identical (in the continuous formulation) to the convergence of advective fluxes.</description>
+   </entry>
+
+   <entry id="tendency_of_integral_wrt_depth_of_sea_water_potential_temperature_expressed_as_heat_content">
+      <canonical_units>W m-2</canonical_units>
+      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. This tendency encompasses all processes that impact on the time changes for the heat content within a grid cell. The phrase &quot;integral_wrt_X_of_Y&quot; means int Y dX. To specify the limits of the integral the data variable should have an axis for X and associated coordinate bounds. If no axis for X is associated with the data variable, or no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is air the integral is assumed to be calculated over the full depth of the atmosphere. The abbreviation &quot;wrt&quot; means &quot;with respect to&quot;. Depth is the vertical distance below the surface. Sea water potential temperature is the temperature a parcel of sea water would have if moved adiabatically to sea level pressure. The phrase &quot;expressed_as_heat_content&quot; means that this quantity is calculated as the specific heat capacity times density of sea water multiplied by the potential temperature of the sea water in the grid cell and integrated over depth.</description>
+   </entry>
+
+   <entry id="tendency_of_integral_wrt_depth_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_dianeutral_mixing">
+      <canonical_units>W m-2</canonical_units>
+      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. The phrase &quot;integral_wrt_X_of_Y&quot; means int Y dX. To specify the limits of the integral the data variable should have an axis for X and associated coordinate bounds. If no axis for X is associated with the data variable, or no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is air the integral is assumed to be calculated over the full depth of the atmosphere. The abbreviation &quot;wrt&quot; means &quot;with respect to&quot;.  Depth is the vertical distance below the surface. Potential temperature is the temperature a parcel of air or sea water would have if moved adiabatically to sea level pressure. The phrase &quot;expressed_as_heat_content&quot; means that this quantity is calculated as the specific heat capacity times density of sea water multiplied by the potential temperature of the sea water in the grid cell and integrated over depth. The specification of a physical process by the phrase &quot;due_to_&quot; process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. &quot;Dianeutral mixing&quot; means mixing across surfaces of neutral buoyancy. &quot;Parameterized&quot; means the part due to a scheme representing processes which are not explicitly resolved by the model.</description>
+   </entry>
+
+   <entry id="tendency_of_integral_wrt_depth_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_eddy_advection">
+      <canonical_units>W m-2</canonical_units>
+      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. The phrase &quot;integral_wrt_X_of_Y&quot; means int Y dX. To specify the limits of the integral the data variable should have an axis for X and associated coordinate bounds. If no axis for X is associated with the data variable, or no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is air the integral is assumed to be calculated over the full depth of the atmosphere. The abbreviation &quot;wrt&quot; means &quot;with respect to&quot;. Depth is the vertical distance below the surface. Potential temperature is the temperature a parcel of air or sea water would have if moved adiabatically to sea level pressure. The phrase &quot;expressed_as_heat_content&quot; means that this quantity is calculated as the specific heat capacity times density of sea water multiplied by the potential temperature of the sea water in the grid cell and integrated over depth. The specification of a physical process by the phrase &quot;due_to_&quot; process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. Parameterized eddy advection in an ocean model means the part due to a scheme representing parameterized eddy-induced advective effects not included in the resolved model velocity field. Parameterized eddy advection can be represented on various spatial scales and there are standard names for parameterized_mesoscale_eddy_advection and parameterized_submesoscale_eddy_advection which both contribute to the total parameterized eddy advection. Additionally, when the parameterized advective process is represented in the model as a skew-diffusion rather than an advection, then the parameterized skew diffusion should be included in this diagnostic. The convergence of a skew-flux is identical (in the continuous formulation) to the convergence of an advective flux, making their tendencies the same.</description>
+   </entry>
+
+   <entry id="tendency_of_integral_wrt_depth_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_mesoscale_eddy_advection">
+      <canonical_units>W m-2</canonical_units>
+      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. The phrase &quot;integral_wrt_X_of_Y&quot; means int Y dX. To specify the limits of the integral the data variable should have an axis for X and associated coordinate bounds. If no axis for X is associated with the data variable, or no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is air the integral is assumed to be calculated over the full depth of the atmosphere. The abbreviation &quot;wrt&quot; means &quot;with respect to&quot;.  Depth is the vertical distance below the surface. Potential temperature is the temperature a parcel of air or sea water would have if moved adiabatically to sea level pressure. The phrase &quot;expressed_as_heat_content&quot; means that this quantity is calculated as the specific heat capacity times density of sea water multiplied by the potential temperature of the sea water in the grid cell and integrated over depth. The specification of a physical process by the phrase &quot;due_to_&quot; process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. Parameterized eddy advection in an ocean model means the part due to a scheme representing parameterized eddy-induced advective effects not included in the resolved model velocity field. Parameterized mesoscale eddy advection occurs on a spatial scale of many tens of kilometres and an evolutionary time of weeks. Reference: James C. McWilliams 2016, Submesoscale currents in the ocean, Proceedings of the Royal Society A: Mathematical, Physical and Engineering Sciences, volume 472, issue 2189. DOI: 10.1098/rspa.2016.0117. Parameterized mesoscale eddy advection is represented in ocean models using schemes such as the Gent-McWilliams scheme. There are also standard names for parameterized_submesoscale_eddy_advection which, along with parameterized_mesoscale_eddy_advection, contributes to the total parameterized eddy advection. Additionally, when the parameterized advective process is represented in the model as a skew-diffusion rather than an advection, then the parameterized skew diffusion should be included in this diagnostic. The convergence of a skew-flux is identical (in the continuous formulation) to the convergence of an advective flux, making their tendencies the same.</description>
+   </entry>
+
+   <entry id="tendency_of_integral_wrt_depth_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_mesoscale_eddy_diffusion">
+      <canonical_units>W m-2</canonical_units>
+      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. The phrase &quot;integral_wrt_X_of_Y&quot; means int Y dX. To specify the limits of the integral the data variable should have an axis for X and associated coordinate bounds. If no axis for X is associated with the data variable, or no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is air the integral is assumed to be calculated over the full depth of the atmosphere. The abbreviation &quot;wrt&quot; means &quot;with respect to&quot;.  Depth is the vertical distance below the surface. Potential temperature is the temperature a parcel of air or sea water would have if moved adiabatically to sea level pressure. The phrase &quot;expressed_as_heat_content&quot; means that this quantity is calculated as the specific heat capacity times density of sea water multiplied by the potential temperature of the sea water in the grid cell and integrated over depth. The specification of a physical process by the phrase &quot;due_to_&quot; process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. Parameterized mesoscale eddy diffusive processes include diffusion along neutral directions in the interior of the ocean and horizontal diffusion in the surface boundary layer. The processes occur on a spatial scale of many tens of kilometres and an evolutionary time of weeks.</description>
+   </entry>
+
+   <entry id="tendency_of_integral_wrt_depth_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_submesoscale_eddy_advection">
+      <canonical_units>W m-2</canonical_units>
+      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. The phrase &quot;integral_wrt_X_of_Y&quot; means int Y dX. To specify the limits of the integral the data variable should have an axis for X and associated coordinate bounds. If no axis for X is associated with the data variable, or no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is air the integral is assumed to be calculated over the full depth of the atmosphere. The abbreviation &quot;wrt&quot; means &quot;with respect to&quot;. Depth is the vertical distance below the surface. Potential temperature is the temperature a parcel of air or sea water would have if moved adiabatically to sea level pressure. The phrase &quot;expressed_as_heat_content&quot; means that this quantity is calculated as the specific heat capacity times density of sea water multiplied by the potential temperature of the sea water in the grid cell and integrated over depth. The specification of a physical process by the phrase &quot;due_to_&quot; process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. Parameterized eddy advection in an ocean model means the part due to a scheme representing parameterized eddy-induced advective effects not included in the resolved model velocity field. Parameterized submesoscale eddy advection occurs on a spatial scale of the order of 1 km horizontally. Reference: James C. McWilliams 2016, Submesoscale currents in the ocean, Proceedings of the Royal Society A: Mathematical, Physical and Engineering Sciences, volume 472, issue 2189. DOI: 10.1098/rspa.2016.0117. There are also standard names for parameterized_mesoscale_eddy_advection which, along with parameterized_submesoscale_eddy_advection, contributes to the total parameterized eddy advection. Additionally, when the parameterized advective process is represented in the model as a skew-diffusion rather than an advection, then the parameterized skew diffusion should be included in this diagnostic. The convergence of a skew-flux is identical (in the continuous formulation) to the convergence of an advective flux, making their tendencies the same.</description>
+   </entry>
+
+   <entry id="tendency_of_integral_wrt_depth_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_residual_mean_advection">
+      <canonical_units>W m-2</canonical_units>
+      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. The phrase &quot;integral_wrt_X_of_Y&quot; means int Y dX. To specify the limits of the integral the data variable should have an axis for X and associated coordinate bounds. If no axis for X is associated with the data variable, or no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is air the integral is assumed to be calculated over the full depth of the atmosphere. The abbreviation &quot;wrt&quot; means &quot;with respect to&quot;.  Depth is the vertical distance below the surface. Potential temperature is the temperature a parcel of air or sea water would have if moved adiabatically to sea level pressure. The phrase &quot;expressed_as_heat_content&quot; means that this quantity is calculated as the specific heat capacity times density of sea water multiplied by the potential temperature of the sea water in the grid cell and integrated over depth. The specification of a physical process by the phrase &quot;due_to_&quot; process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. The phrase &quot;residual_mean_advection&quot; refers to the sum of the model&#x27;s resolved advective transport plus any parameterized advective transport. Parameterized advective transport includes processes such as parameterized mesoscale and submesoscale transport, as well as any other advectively parameterized transport. When the parameterized advective transport is represented in the model as a skew-diffusion rather than an advection, then the parameterized skew diffusion should be included in this diagnostic, since the convergence of skew-fluxes are identical (in the continuous formulation) to the convergence of advective fluxes.</description>
+   </entry>
+
+   <entry id="tendency_of_integral_wrt_depth_of_sea_water_salinity_expressed_as_salt_mass_content">
+      <canonical_units>kg m-2 s-1</canonical_units>
+      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. This tendency encompasses all processes that impact on the time changes for the salt content within a grid cell. The phrase &quot;integral_wrt_X_of_Y&quot; means int Y dX. To specify the limits of the integral the data variable should have an axis for X and associated coordinate bounds. If no axis for X is associated with the data variable, or no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is air the integral is assumed to be calculated over the full depth of the atmosphere. The abbreviation &quot;wrt&quot; means &quot;with respect to&quot;. Depth is the vertical distance below the surface. Sea water salinity is the salt concentration of sea water, often on the Practical Salinity Scale of 1978. However, the unqualified term &#x27;salinity&#x27; is generic and does not necessarily imply any particular method of calculation. There are standard names for the more precisely defined salinity quantities sea_water_knudsen_salinity, S_K (used for salinity observations between 1901 and 1966), sea_water_cox_salinity, S_C (used for salinity observations between 1967 and 1977), sea_water_practical_salinity, S_P (used for salinity observations from 1978 to the present day), sea_water_absolute_salinity, S_A, sea_water_preformed_salinity, S_*, and sea_water_reference_salinity. Salinity quantities that do not match any of the precise definitions should be given the more general standard name of sea_water_salinity.</description>
+   </entry>
+
+   <entry id="tendency_of_integral_wrt_depth_of_sea_water_salinity_expressed_as_salt_mass_content_due_to_parameterized_dianeutral_mixing">
+      <canonical_units>kg m-2 s-1</canonical_units>
+      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. The phrase &quot;integral_wrt_X_of_Y&quot; means int Y dX. To specify the limits of the integral the data variable should have an axis for X and associated coordinate bounds. If no axis for X is associated with the data variable, or no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is air the integral is assumed to be calculated over the full depth of the atmosphere. The abbreviation &quot;wrt&quot; means &quot;with respect to&quot;. Depth is the vertical distance below the surface. Sea water salinity is the salt concentration of sea water, often on the Practical Salinity Scale of 1978. However, the unqualified term &#x27;salinity&#x27; is generic and does not necessarily imply any particular method of calculation. There are standard names for the more precisely defined salinity quantities sea_water_knudsen_salinity, S_K (used for salinity observations between 1901 and 1966), sea_water_cox_salinity, S_C (used for salinity observations between 1967 and 1977), sea_water_practical_salinity, S_P (used for salinity observations from 1978 to the present day), sea_water_absolute_salinity, S_A, sea_water_preformed_salinity, S_*, and sea_water_reference_salinity. Salinity quantities that do not match any of the precise definitions should be given the more general standard name of sea_water_salinity. The specification of a physical process by the phrase &quot;due_to_&quot; process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. &quot;Dianeutral mixing&quot; means mixing across surfaces of neutral buoyancy. &quot;Parameterized&quot; means the part due to a scheme representing processes which are not explicitly resolved by the model.</description>
+   </entry>
+
+   <entry id="tendency_of_integral_wrt_depth_of_sea_water_salinity_expressed_as_salt_mass_content_due_to_parameterized_eddy_advection">
+      <canonical_units>kg m-2 s-1</canonical_units>
+      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. The phrase &quot;integral_wrt_X_of_Y&quot; means int Y dX. To specify the limits of the integral the data variable should have an axis for X and associated coordinate bounds. If no axis for X is associated with the data variable, or no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is air the integral is assumed to be calculated over the full depth of the atmosphere. The abbreviation &quot;wrt&quot; means &quot;with respect to&quot;. Depth is the vertical distance below the surface. Sea water salinity is the salt concentration of sea water, often on the Practical Salinity Scale of 1978. However, the unqualified term &#x27;salinity&#x27; is generic and does not necessarily imply any particular method of calculation. There are standard names for the more precisely defined salinity quantities sea_water_knudsen_salinity, S_K (used for salinity observations between 1901 and 1966), sea_water_cox_salinity, S_C (used for salinity observations between 1967 and 1977), sea_water_practical_salinity, S_P (used for salinity observations from 1978 to the present day), sea_water_absolute_salinity, S_A, sea_water_preformed_salinity, S_*, and sea_water_reference_salinity. Salinity quantities that do not match any of the precise definitions should be given the more general standard name of sea_water_salinity. The specification of a physical process by the phrase &quot;due_to_&quot; process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. Parameterized eddy advection in an ocean model means the part due to a scheme representing parameterized eddy-induced advective effects not included in the resolved model velocity field. Parameterized eddy advection can be represented on various spatial scales and there are standard names for parameterized_mesoscale_eddy_advection and parameterized_submesoscale_eddy_advection which both contribute to the total parameterized eddy advection.</description>
+   </entry>
+
+   <entry id="tendency_of_integral_wrt_depth_of_sea_water_salinity_expressed_as_salt_mass_content_due_to_parameterized_mesoscale_eddy_advection">
+      <canonical_units>kg m-2 s-1</canonical_units>
+      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. The phrase &quot;integral_wrt_X_of_Y&quot; means int Y dX. To specify the limits of the integral the data variable should have an axis for X and associated coordinate bounds. If no axis for X is associated with the data variable, or no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is air the integral is assumed to be calculated over the full depth of the atmosphere. The abbreviation &quot;wrt&quot; means &quot;with respect to&quot;. Depth is the vertical distance below the surface. Sea water salinity is the salt concentration of sea water, often on the Practical Salinity Scale of 1978. However, the unqualified term &#x27;salinity&#x27; is generic and does not necessarily imply any particular method of calculation. There are standard names for the more precisely defined salinity quantities sea_water_knudsen_salinity, S_K (used for salinity observations between 1901 and 1966), sea_water_cox_salinity, S_C (used for salinity observations between 1967 and 1977), sea_water_practical_salinity, S_P (used for salinity observations from 1978 to the present day), sea_water_absolute_salinity, S_A, sea_water_preformed_salinity, S_*, and sea_water_reference_salinity. Salinity quantities that do not match any of the precise definitions should be given the more general standard name of sea_water_salinity. The specification of a physical process by the phrase &quot;due_to_&quot; process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. Parameterized eddy advection in an ocean model means the part due to a scheme representing parameterized eddy-induced advective effects not included in the resolved model velocity field. Parameterized mesoscale eddy advection occurs on a spatial scale of many tens of kilometres and an evolutionary time of weeks. Reference: James C. McWilliams 2016, Submesoscale currents in the ocean, Proceedings of the Royal Society A: Mathematical, Physical and Engineering Sciences, volume 472, issue 2189. DOI: 10.1098/rspa.2016.0117. Parameterized mesoscale eddy advection is represented in ocean models using schemes such as the Gent-McWilliams scheme. There are also standard names for parameterized_submesoscale_eddy_advection which, along with parameterized_mesoscale_eddy_advection, contributes to the total parameterized eddy advection. Additionally, when the parameterized advective process is represented in the model as a skew-diffusion rather than an advection, then the parameterized skew diffusion should be included in this diagnostic. The convergence of a skew-flux is identical (in the continuous formulation) to the convergence of an advective flux, making their tendencies the same.</description>
+   </entry>
+
+   <entry id="tendency_of_integral_wrt_depth_of_sea_water_salinity_expressed_as_salt_mass_content_due_to_parameterized_mesoscale_eddy_diffusion">
+      <canonical_units>kg m-2 s-1</canonical_units>
+      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. The phrase &quot;integral_wrt_X_of_Y&quot; means int Y dX. To specify the limits of the integral the data variable should have an axis for X and associated coordinate bounds. If no axis for X is associated with the data variable, or no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is air the integral is assumed to be calculated over the full depth of the atmosphere. The abbreviation &quot;wrt&quot; means &quot;with respect to&quot;. Depth is the vertical distance below the surface. Sea water salinity is the salt concentration of sea water, often on the Practical Salinity Scale of 1978. However, the unqualified term &#x27;salinity&#x27; is generic and does not necessarily imply any particular method of calculation. There are standard names for the more precisely defined salinity quantities sea_water_knudsen_salinity, S_K (used for salinity observations between 1901 and 1966), sea_water_cox_salinity, S_C (used for salinity observations between 1967 and 1977), sea_water_practical_salinity, S_P (used for salinity observations from 1978 to the present day), sea_water_absolute_salinity, S_A, sea_water_preformed_salinity, S_*, and sea_water_reference_salinity. Salinity quantities that do not match any of the precise definitions should be given the more general standard name of sea_water_salinity. Parameterized mesoscale eddy diffusive processes include diffusion along neutral directions in the interior of the ocean and horizontal diffusion in the surface boundary layer. The processes occur on a spatial scale of many tens of kilometres and an evolutionary time of weeks.</description>
+   </entry>
+
+   <entry id="tendency_of_integral_wrt_depth_of_sea_water_salinity_expressed_as_salt_mass_content_due_to_parameterized_submesoscale_eddy_advection">
+      <canonical_units>kg m-2 s-1</canonical_units>
+      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. The phrase &quot;integral_wrt_X_of_Y&quot; means int Y dX. To specify the limits of the integral the data variable should have an axis for X and associated coordinate bounds. If no axis for X is associated with the data variable, or no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is air the integral is assumed to be calculated over the full depth of the atmosphere. The abbreviation &quot;wrt&quot; means &quot;with respect to&quot;. Depth is the vertical distance below the surface. Sea water salinity is the salt concentration of sea water, often on the Practical Salinity Scale of 1978. However, the unqualified term &#x27;salinity&#x27; is generic and does not necessarily imply any particular method of calculation. There are standard names for the more precisely defined salinity quantities sea_water_knudsen_salinity, S_K (used for salinity observations between 1901 and 1966), sea_water_cox_salinity, S_C (used for salinity observations between 1967 and 1977), sea_water_practical_salinity, S_P (used for salinity observations from 1978 to the present day), sea_water_absolute_salinity, S_A, sea_water_preformed_salinity, S_*, and sea_water_reference_salinity. Salinity quantities that do not match any of the precise definitions should be given the more general standard name of sea_water_salinity. Parameterized eddy advection in an ocean model means the part due to a scheme representing parameterized eddy-induced advective effects not included in the resolved model velocity field. Parameterized submesoscale eddy advection occurs on a spatial scale of the order of 1 km horizontally. Reference: James C. McWilliams 2016, Submesoscale currents in the ocean, Proceedings of the Royal Society A: Mathematical, Physical and Engineering Sciences, volume 472, issue 2189. DOI: 10.1098/rspa.2016.0117. There are also standard names for parameterized_mesoscale_eddy_advection which, along with parameterized_submesoscale_eddy_advection, contributes to the total parameterized eddy advection. Additionally, when the parameterized advective process is represented in the model as a skew-diffusion rather than an advection, then the parameterized skew diffusion should be included in this diagnostic. The convergence of a skew-flux is identical (in the continuous formulation) to the convergence of an advective flux, making their tendencies the same.</description>
+   </entry>
+
+   <entry id="tendency_of_integral_wrt_depth_of_sea_water_salinity_expressed_as_salt_mass_content_due_to_residual_mean_advection">
+      <canonical_units>kg m-2 s-1</canonical_units>
+      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. The phrase &quot;integral_wrt_X_of_Y&quot; means int Y dX. To specify the limits of the integral the data variable should have an axis for X and associated coordinate bounds. If no axis for X is associated with the data variable, or no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is air the integral is assumed to be calculated over the full depth of the atmosphere. The abbreviation &quot;wrt&quot; means &quot;with respect to&quot;. Depth is the vertical distance below the surface. Sea water salinity is the salt concentration of sea water, often on the Practical Salinity Scale of 1978. However, the unqualified term &#x27;salinity&#x27; is generic and does not necessarily imply any particular method of calculation. There are standard names for the more precisely defined salinity quantities sea_water_knudsen_salinity, S_K (used for salinity observations between 1901 and 1966), sea_water_cox_salinity, S_C (used for salinity observations between 1967 and 1977), sea_water_practical_salinity, S_P (used for salinity observations from 1978 to the present day), sea_water_absolute_salinity, S_A, sea_water_preformed_salinity, S_*, and sea_water_reference_salinity. Salinity quantities that do not match any of the precise definitions should be given the more general standard name of sea_water_salinity. The phrase &quot;residual_mean_advection&quot; refers to the sum of the model&#x27;s resolved advective transport plus any parameterized advective transport. Parameterized advective transport includes processes such as parameterized mesoscale and submesoscale transport, as well as any other advectively parameterized transport. When the parameterized advective transport is represented in the model as a skew-diffusion rather than an advection, then the parameterized skew diffusion should be included in this diagnostic, since the convergence of skew-fluxes are identical (in the continuous formulation) to the convergence of advective fluxes.</description>
+   </entry>
+
    <entry id="tendency_of_kinetic_energy_content_of_atmosphere_layer_due_to_advection">
       <canonical_units>W m-2</canonical_units>
       <description>The specification of a physical process by the phrase due_to_process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. &quot;tendency_of_X&quot; means derivative of X with respect to time. &quot;Content&quot; indicates a quantity per unit area. &quot;Layer&quot; means any layer with upper and lower boundaries that have constant values in some vertical coordinate. There must be a vertical coordinate variable indicating the extent of the layer(s). If the layers are model layers, the vertical coordinate can be model_level_number, but it is recommended to specify a physical coordinate (in a scalar or auxiliary coordinate variable) as well.</description>
@@ -22234,6 +22384,11 @@ http://vocab.nerc.ac.uk/collection/P01/current/TPHSDSZZ/6/.</description>
       <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. &quot;Northward&quot; indicates a vector component which is positive when directed northward (negative southward). Wind is defined as a two-dimensional (horizontal) air velocity vector, with no vertical component. (Vertical motion in the atmosphere has the standard name &quot;upward_air_velocity&quot;). The specification of a physical process by the phrase &quot;due_to_&quot; process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. &quot;Orographic gravity waves&quot; refer to gravity waves which are generated by flow over orography. The quantity with standard name tendency_of_northward_wind_due_to_gravity_wave_drag is the total tendency of the northward wind due to gravity waves. It is the sum of the tendencies due to orographic and nonorographic gravity waves which have the standard names tendency_of_northward_wind_due_to_orographic_gravity_wave_drag and tendency_of_northward_wind_due_to_nonorographic_gravity_wave_drag, respectively.</description>
    </entry>
 
+   <entry id="tendency_of_northward_wind_due_to_parameterized_physics">
+      <canonical_units>m s-2</canonical_units>
+      <description>The tendency of the northward horizontal wind component due to all parameterized physics in a model. The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. &quot;Northward&quot; indicates a vector component which is positive when directed northward (negative southward). Wind is defined as a two-dimensional (horizontal) air velocity vector, with no vertical component. (Vertical motion in the atmosphere has the standard name &quot;upward_air_velocity&quot;). The specification of a physical process by the phrase &quot;due_to_&quot; process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase.</description>
+   </entry>
+
    <entry id="tendency_of_ocean_barotropic_streamfunction">
       <canonical_units>m3 s-2</canonical_units>
       <description>&quot;tendency_of_X&quot; means derivative of X with respect to time.</description>
@@ -22524,76 +22679,6 @@ http://vocab.nerc.ac.uk/collection/P01/current/TPHSDSZZ/6/.</description>
       <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. sea_water_alkalinity_expressed_as_mole_equivalent is the total alkalinity equivalent concentration (including carbonate, nitrogen, silicate, and borate components). The specification of a physical process by the phrase &quot;due_to_&quot; process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase.</description>
    </entry>
 
-   <entry id="tendency_of_sea_water_conservative_temperature_expressed_as_heat_content">
-      <canonical_units>W m-2</canonical_units>
-      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. This tendency encompasses all processes that impact on the time changes for the heat content within a grid cell. The phrase &quot;expressed_as_heat_content&quot; means that this quantity is calculated as the specific heat capacity times density of sea water multiplied by the conservative temperature of the sea water in the grid cell and integrated over depth. If used for a layer heat content, coordinate bounds should be used to define the extent of the layers. If no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is sea water the integral is assumed to be calculated over the full depth of the ocean. Conservative Temperature is defined as part of the Thermodynamic Equation of Seawater 2010 (TEOS-10) which was adopted in 2010 by the International Oceanographic Commission (IOC). Conservative Temperature is specific potential enthalpy (which has the standard name sea_water_specific_potential_enthalpy) divided by a fixed value of the specific heat capacity of sea water, namely cp_0 = 3991.86795711963 J kg-1 K-1. Conservative Temperature is a more accurate measure of the &quot;heat content&quot; of sea water, by a factor of one hundred, than is potential temperature. Because of this, it can be regarded as being proportional to the heat content of sea water per unit mass. Reference: www.teos-10.org; McDougall, 2003 doi: 10.1175/1520-0485(2003)033&lt;0945:PEACOV&gt;2.0.CO;2.</description>
-   </entry>
-
-   <entry id="tendency_of_sea_water_conservative_temperature_expressed_as_heat_content_due_to_parameterized_dianeutral_mixing">
-      <canonical_units>W m-2</canonical_units>
-      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. The phrase &quot;expressed_as_heat_content&quot; means that this quantity is calculated as the specific heat capacity times density of sea water multiplied by the conservative temperature of the sea water in the grid cell and integrated over depth. If used for a layer heat content, coordinate bounds should be used to define the extent of the layers. If no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is sea water the integral is assumed to be calculated over the full depth of the ocean. Conservative Temperature is defined as part of the Thermodynamic Equation of Seawater 2010 (TEOS-10) which was adopted in 2010 by the International Oceanographic Commission (IOC). Conservative Temperature is specific potential enthalpy (which has the standard name sea_water_specific_potential_enthalpy) divided by a fixed value of the specific heat capacity of sea water, namely cp_0 = 3991.86795711963 J kg-1 K-1. Conservative Temperature is a more accurate measure of the &quot;heat content&quot; of sea water, by a factor of one hundred, than is potential temperature. Because of this, it can be regarded as being proportional to the heat content of sea water per unit mass. Reference: www.teos-10.org; McDougall, 2003 doi: 10.1175/1520-0485(2003)033&lt;0945:PEACOV&gt;2.0.CO;2. The specification of a physical process by the phrase due_to_process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. &quot;Dianeutral mixing&quot; means mixing across surfaces of neutral buoyancy. &quot;Parameterized&quot; means the part due to a scheme representing processes which are not explicitly resolved by the model.</description>
-   </entry>
-
-   <entry id="tendency_of_sea_water_conservative_temperature_expressed_as_heat_content_due_to_parameterized_eddy_advection">
-      <canonical_units>W m-2</canonical_units>
-      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. The phrase &quot;expressed_as_heat_content&quot; means that this quantity is calculated as the specific heat capacity times density of sea water multiplied by the conservative temperature of the sea water in the grid cell and integrated over depth. If used for a layer heat content, coordinate bounds should be used to define the extent of the layers. If no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is sea water the integral is assumed to be calculated over the full depth of the ocean. Conservative Temperature is defined as part of the Thermodynamic Equation of Seawater 2010 (TEOS-10) which was adopted in 2010 by the International Oceanographic Commission (IOC). Conservative Temperature is specific potential enthalpy (which has the standard name sea_water_specific_potential_enthalpy) divided by a fixed value of the specific heat capacity of sea water, namely cp_0 = 3991.86795711963 J kg-1 K-1. Conservative Temperature is a more accurate measure of the &quot;heat content&quot; of sea water, by a factor of one hundred, than is potential temperature. Because of this, it can be regarded as being proportional to the heat content of sea water per unit mass. Reference: www.teos-10.org; McDougall, 2003 doi: 10.1175/1520-0485(2003)033&lt;0945:PEACOV&gt;2.0.CO;2. The specification of a physical process by the phrase due_to_process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. Parameterized eddy advection in an ocean model means the part due to a scheme representing parameterized eddy-induced advective effects not included in the resolved model velocity field. Parameterized eddy advection can be represented on various spatial scales and there are standard names for parameterized_mesoscale_eddy_advection and parameterized_submesoscale_eddy_advection which both contribute to the total parameterized eddy advection. Additionally, when the parameterized advective process is represented in the model as a skew-diffusion rather than an advection, then the parameterized skew diffusion should be included in this diagnostic. The convergence of a skew-flux is identical (in the continuous formulation) to the convergence of an advective flux, making their tendencies the same.</description>
-   </entry>
-
-   <entry id="tendency_of_sea_water_conservative_temperature_expressed_as_heat_content_due_to_parameterized_mesoscale_eddy_advection">
-      <canonical_units>W m-2</canonical_units>
-      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. The phrase &quot;expressed_as_heat_content&quot; means that this quantity is calculated as the specific heat capacity times density of sea water multiplied by the conservative temperature of the sea water in the grid cell and integrated over depth. If used for a layer heat content, coordinate bounds should be used to define the extent of the layers. If no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is sea water the integral is assumed to be calculated over the full depth of the ocean. Conservative Temperature is defined as part of the Thermodynamic Equation of Seawater 2010 (TEOS-10) which was adopted in 2010 by the International Oceanographic Commission (IOC). Conservative Temperature is specific potential enthalpy (which has the standard name sea_water_specific_potential_enthalpy) divided by a fixed value of the specific heat capacity of sea water, namely cp_0 = 3991.86795711963 J kg-1 K-1. Conservative Temperature is a more accurate measure of the &quot;heat content&quot; of sea water, by a factor of one hundred, than is potential temperature. Because of this, it can be regarded as being proportional to the heat content of sea water per unit mass. Reference: www.teos-10.org; McDougall, 2003 doi: 10.1175/1520-0485(2003)033&lt;0945:PEACOV&gt;2.0.CO;2. The specification of a physical process by the phrase due_to_process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. Parameterized eddy advection in an ocean model means the part due to a scheme representing parameterized eddy-induced advective effects not included in the resolved model velocity field. Parameterized mesoscale eddy advection occurs on a spatial scale of many tens of kilometres and an evolutionary time of weeks. Reference: James C. McWilliams 2016, Submesoscale currents in the ocean, Proceedings of the Royal Society A: Mathematical, Physical and Engineering Sciences, volume 472, issue 2189. DOI: 10.1098/rspa.2016.0117. Parameterized mesoscale eddy advection is represented in ocean models using schemes such as the Gent-McWilliams scheme. There are also standard names for parameterized_submesoscale_eddy_advection which, along with parameterized_mesoscale_eddy_advection, contributes to the total parameterized eddy advection. Additionally, when the parameterized advective process is represented in the model as a skew-diffusion rather than an advection, then the parameterized skew diffusion should be included in this diagnostic. The convergence of a skew-flux is identical (in the continuous formulation) to the convergence of an advective flux, making their tendencies the same.</description>
-   </entry>
-
-   <entry id="tendency_of_sea_water_conservative_temperature_expressed_as_heat_content_due_to_parameterized_mesoscale_eddy_diffusion">
-      <canonical_units>W m-2</canonical_units>
-      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. The phrase &quot;expressed_as_heat_content&quot; means that this quantity is calculated as the specific heat capacity times density of sea water multiplied by the conservative temperature of the sea water in the grid cell and integrated over depth. If used for a layer heat content, coordinate bounds should be used to define the extent of the layers. If no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is sea water the integral is assumed to be calculated over the full depth of the ocean. Conservative Temperature is defined as part of the Thermodynamic Equation of Seawater 2010 (TEOS-10) which was adopted in 2010 by the International Oceanographic Commission (IOC). Conservative Temperature is specific potential enthalpy (which has the standard name sea_water_specific_potential_enthalpy) divided by a fixed value of the specific heat capacity of sea water, namely cp_0 = 3991.86795711963 J kg-1 K-1. Conservative Temperature is a more accurate measure of the &quot;heat content&quot; of sea water, by a factor of one hundred, than is potential temperature. Because of this, it can be regarded as being proportional to the heat content of sea water per unit mass. Reference: www.teos-10.org; McDougall, 2003 doi: 10.1175/1520-0485(2003)033&lt;0945:PEACOV&gt;2.0.CO;2. The specification of a physical process by the phrase due_to_process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. Parameterized mesoscale eddy diffusive processes include diffusion along neutral directions in the interior of the ocean and horizontal diffusion in the surface boundary layer. The processes occur on a spatial scale of many tens of kilometres and an evolutionary time of weeks. The phrase &quot;expressed_as_heat_content&quot; means that this quantity is calculated as the specific heat capacity times density of sea water multiplied by the conservative temperature of the sea water in the grid cell.</description>
-   </entry>
-
-   <entry id="tendency_of_sea_water_conservative_temperature_expressed_as_heat_content_due_to_parameterized_submesoscale_eddy_advection">
-      <canonical_units>W m-2</canonical_units>
-      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. The phrase &quot;expressed_as_heat_content&quot; means that this quantity is calculated as the specific heat capacity times density of sea water multiplied by the conservative temperature of the sea water in the grid cell and integrated over depth. If used for a layer heat content, coordinate bounds should be used to define the extent of the layers. If no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is sea water the integral is assumed to be calculated over the full depth of the ocean. Conservative Temperature is defined as part of the Thermodynamic Equation of Seawater 2010 (TEOS-10) which was adopted in 2010 by the International Oceanographic Commission (IOC). Conservative Temperature is specific potential enthalpy (which has the standard name sea_water_specific_potential_enthalpy) divided by a fixed value of the specific heat capacity of sea water, namely cp_0 = 3991.86795711963 J kg-1 K-1. Conservative Temperature is a more accurate measure of the &quot;heat content&quot; of sea water, by a factor of one hundred, than is potential temperature. Because of this, it can be regarded as being proportional to the heat content of sea water per unit mass. Reference: www.teos-10.org; McDougall, 2003 doi: 10.1175/1520-0485(2003)033&lt;0945:PEACOV&gt;2.0.CO;2. The specification of a physical process by the phrase due_to_process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. Parameterized eddy advection in an ocean model means the part due to a scheme representing parameterized eddy-induced advective effects not included in the resolved model velocity field. Parameterized submesoscale eddy advection occurs on a spatial scale of the order of 1 km horizontally. Reference: James C. McWilliams 2016, Submesoscale currents in the ocean, Proceedings of the Royal Society A: Mathematical, Physical and Engineering Sciences, volume 472, issue 2189. DOI: 10.1098/rspa.2016.0117. There are also standard names for parameterized_mesoscale_eddy_advection which, along with parameterized_submesoscale_eddy_advection, contributes to the total parameterized eddy advection. Additionally, when the parameterized advective process is represented in the model as a skew-diffusion rather than an advection, then the parameterized skew diffusion should be included in this diagnostic. The convergence of a skew-flux is identical (in the continuous formulation) to the convergence of an advective flux, making their tendencies the same.</description>
-   </entry>
-
-   <entry id="tendency_of_sea_water_conservative_temperature_expressed_as_heat_content_due_to_residual_mean_advection">
-      <canonical_units>W m-2</canonical_units>
-      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. The phrase &quot;expressed_as_heat_content&quot; means that this quantity is calculated as the specific heat capacity times density of sea water multiplied by the conservative temperature of the sea water in the grid cell and integrated over depth. If used for a layer heat content, coordinate bounds should be used to define the extent of the layers. If no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is sea water the integral is assumed to be calculated over the full depth of the ocean. Conservative Temperature is defined as part of the Thermodynamic Equation of Seawater 2010 (TEOS-10) which was adopted in 2010 by the International Oceanographic Commission (IOC). Conservative Temperature is specific potential enthalpy (which has the standard name sea_water_specific_potential_enthalpy) divided by a fixed value of the specific heat capacity of sea water, namely cp_0 = 3991.86795711963 J kg-1 K-1. Conservative Temperature is a more accurate measure of the &quot;heat content&quot; of sea water, by a factor of one hundred, than is potential temperature. Because of this, it can be regarded as being proportional to the heat content of sea water per unit mass. Reference: www.teos-10.org; McDougall, 2003 doi: 10.1175/1520-0485(2003)033&lt;0945:PEACOV&gt;2.0.CO;2. The specification of a physical process by the phrase due_to_process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. The phrase &quot;residual_mean_advection&quot; refers to the sum of the model&#x27;s resolved advective transport plus any parameterized advective transport. Parameterized advective transport includes processes such as parameterized mesoscale and submesoscale transport, as well as any other advectively parameterized transport. When the parameterized advective transport is represented in the model as a skew-diffusion rather than an advection, then the parameterized skew diffusion should be included in this diagnostic, since the convergence of skew-fluxes are identical (in the continuous formulation) to the convergence of advective fluxes.</description>
-   </entry>
-
-   <entry id="tendency_of_sea_water_potential_temperature_expressed_as_heat_content">
-      <canonical_units>W m-2</canonical_units>
-      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. This tendency encompasses all processes that impact on the time changes for the heat content within a grid cell. The phrase &quot;expressed_as_heat_content&quot; means that this quantity is calculated as the specific heat capacity times density of sea water multiplied by the potential temperature of the sea water in the grid cell and integrated over depth. If used for a layer heat content, coordinate bounds should be used to define the extent of the layers. If no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is sea water the integral is assumed to be calculated over the full depth of the ocean. Potential temperature is the temperature a parcel of air or sea water would have if moved adiabatically to sea level pressure.</description>
-   </entry>
-
-   <entry id="tendency_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_dianeutral_mixing">
-      <canonical_units>W m-2</canonical_units>
-      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. The phrase &quot;expressed_as_heat_content&quot; means that this quantity is calculated as the specific heat capacity times density of sea water multiplied by the potential temperature of the sea water in the grid cell and integrated over depth. If used for a layer heat content, coordinate bounds should be used to define the extent of the layers. If no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is sea water the integral is assumed to be calculated over the full depth of the ocean. Potential temperature is the temperature a parcel of air or sea water would have if moved adiabatically to sea level pressure. The specification of a physical process by the phrase due_to_process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. &quot;Dianeutral mixing&quot; means mixing across surfaces of neutral buoyancy. &quot;Parameterized&quot; means the part due to a scheme representing processes which are not explicitly resolved by the model.</description>
-   </entry>
-
-   <entry id="tendency_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_eddy_advection">
-      <canonical_units>W m-2</canonical_units>
-      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. The phrase &quot;expressed_as_heat_content&quot; means that this quantity is calculated as the specific heat capacity times density of sea water multiplied by the potential temperature of the sea water in the grid cell and integrated over depth. If used for a layer heat content, coordinate bounds should be used to define the extent of the layers. If no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is sea water the integral is assumed to be calculated over the full depth of the ocean. Potential temperature is the temperature a parcel of air or sea water would have if moved adiabatically to sea level pressure. The specification of a physical process by the phrase due_to_process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. Parameterized eddy advection in an ocean model means the part due to a scheme representing parameterized eddy-induced advective effects not included in the resolved model velocity field. Parameterized eddy advection can be represented on various spatial scales and there are standard names for parameterized_mesoscale_eddy_advection and parameterized_submesoscale_eddy_advection which both contribute to the total parameterized eddy advection. Additionally, when the parameterized advective process is represented in the model as a skew-diffusion rather than an advection, then the parameterized skew diffusion should be included in this diagnostic. The convergence of a skew-flux is identical (in the continuous formulation) to the convergence of an advective flux, making their tendencies the same.</description>
-   </entry>
-
-   <entry id="tendency_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_mesoscale_eddy_advection">
-      <canonical_units>W m-2</canonical_units>
-      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. The phrase &quot;expressed_as_heat_content&quot; means that this quantity is calculated as the specific heat capacity times density of sea water multiplied by the potential temperature of the sea water in the grid cell and integrated over depth. If used for a layer heat content, coordinate bounds should be used to define the extent of the layers. If no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is sea water the integral is assumed to be calculated over the full depth of the ocean. Potential temperature is the temperature a parcel of air or sea water would have if moved adiabatically to sea level pressure. The specification of a physical process by the phrase due_to_process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. Parameterized eddy advection in an ocean model means the part due to a scheme representing parameterized eddy-induced advective effects not included in the resolved model velocity field. Parameterized mesoscale eddy advection occurs on a spatial scale of many tens of kilometres and an evolutionary time of weeks. Reference: James C. McWilliams 2016, Submesoscale currents in the ocean, Proceedings of the Royal Society A: Mathematical, Physical and Engineering Sciences, volume 472, issue 2189. DOI: 10.1098/rspa.2016.0117. Parameterized mesoscale eddy advection is represented in ocean models using schemes such as the Gent-McWilliams scheme. There are also standard names for parameterized_submesoscale_eddy_advection which, along with parameterized_mesoscale_eddy_advection, contributes to the total parameterized eddy advection. Additionally, when the parameterized advective process is represented in the model as a skew-diffusion rather than an advection, then the parameterized skew diffusion should be included in this diagnostic. The convergence of a skew-flux is identical (in the continuous formulation) to the convergence of an advective flux, making their tendencies the same.</description>
-   </entry>
-
-   <entry id="tendency_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_mesoscale_eddy_diffusion">
-      <canonical_units>W m-2</canonical_units>
-      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. The phrase &quot;expressed_as_heat_content&quot; means that this quantity is calculated as the specific heat capacity times density of sea water multiplied by the potential temperature of the sea water in the grid cell and integrated over depth. If used for a layer heat content, coordinate bounds should be used to define the extent of the layers. If no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is sea water the integral is assumed to be calculated over the full depth of the ocean. Potential temperature is the temperature a parcel of air or sea water would have if moved adiabatically to sea level pressure. The specification of a physical process by the phrase due_to_process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. Parameterized mesoscale eddy diffusive processes include diffusion along neutral directions in the interior of the ocean and horizontal diffusion in the surface boundary layer. The processes occur on a spatial scale of many tens of kilometres and an evolutionary time of weeks.</description>
-   </entry>
-
-   <entry id="tendency_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_submesoscale_eddy_advection">
-      <canonical_units>W m-2</canonical_units>
-      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. The phrase &quot;expressed_as_heat_content&quot; means that this quantity is calculated as the specific heat capacity times density of sea water multiplied by the potential temperature of the sea water in the grid cell and integrated over depth. If used for a layer heat content, coordinate bounds should be used to define the extent of the layers. If no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is sea water the integral is assumed to be calculated over the full depth of the ocean. Potential temperature is the temperature a parcel of air or sea water would have if moved adiabatically to sea level pressure. The specification of a physical process by the phrase due_to_process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. Parameterized eddy advection in an ocean model means the part due to a scheme representing parameterized eddy-induced advective effects not included in the resolved model velocity field. Parameterized submesoscale eddy advection occurs on a spatial scale of the order of 1 km horizontally. Reference: James C. McWilliams 2016, Submesoscale currents in the ocean, Proceedings of the Royal Society A: Mathematical, Physical and Engineering Sciences, volume 472, issue 2189. DOI: 10.1098/rspa.2016.0117. There are also standard names for parameterized_mesoscale_eddy_advection which, along with parameterized_submesoscale_eddy_advection, contributes to the total parameterized eddy advection. Additionally, when the parameterized advective process is represented in the model as a skew-diffusion rather than an advection, then the parameterized skew diffusion should be included in this diagnostic. The convergence of a skew-flux is identical (in the continuous formulation) to the convergence of an advective flux, making their tendencies the same.</description>
-   </entry>
-
-   <entry id="tendency_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_residual_mean_advection">
-      <canonical_units>W m-2</canonical_units>
-      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. The phrase &quot;expressed_as_heat_content&quot; means that this quantity is calculated as the specific heat capacity times density of sea water multiplied by the potential temperature of the sea water in the grid cell and integrated over depth. If used for a layer heat content, coordinate bounds should be used to define the extent of the layers. If no coordinate bounds are specified, it is assumed that the integral is calculated over the entire vertical extent of the medium, e.g, if the medium is sea water the integral is assumed to be calculated over the full depth of the ocean. Potential temperature is the temperature a parcel of air or sea water would have if moved adiabatically to sea level pressure. The specification of a physical process by the phrase due_to_process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. The phrase &quot;residual_mean_advection&quot; refers to the sum of the model&#x27;s resolved advective transport plus any parameterized advective transport. Parameterized advective transport includes processes such as parameterized mesoscale and submesoscale transport, as well as any other advectively parameterized transport. When the parameterized advective transport is represented in the model as a skew-diffusion rather than an advection, then the parameterized skew diffusion should be included in this diagnostic, since the convergence of skew-fluxes are identical (in the continuous formulation) to the convergence of advective fluxes.</description>
-   </entry>
-
    <entry id="tendency_of_sea_water_salinity">
       <canonical_units>1e-3 s-1</canonical_units>
       <description>&quot;tendency_of_X&quot; means derivative of X with respect to time. Sea water salinity is the salt content of sea water, often on the Practical Salinity Scale of 1978. However, the unqualified term &#x27;salinity&#x27; is generic and does not necessarily imply any particular method of calculation. The units of salinity are dimensionless and normally given as 1e-3 or 0.001 i.e. parts per thousand. There are standard names for the more precisely defined salinity quantities: sea_water_knudsen_salinity, S_K (used for salinity observations between 1901 and 1966), sea_water_cox_salinity, S_C (used for salinity observations between 1967 and 1977), sea_water_practical_salinity, S_P (used for salinity observations from 1978 to the present day), sea_water_absolute_salinity, S_A, sea_water_preformed_salinity, S_*, and sea_water_reference_salinity. Practical Salinity is reported on the Practical Salinity Scale of 1978 (PSS-78), and is usually based on the electrical conductivity of sea water in observations since the 1960s. Conversion of data between the observed scales follows: S_P = (S_K - 0.03) * (1.80655 / 1.805) and S_P = S_C, however the accuracy of the latter is dependent on whether chlorinity or conductivity was used to determine the S_C value, with this inconsistency driving the development of PSS-78. The more precise standard names should be used where appropriate for both modelled and observed salinities. In particular, the use of sea_water_salinity to describe salinity observations made from 1978 onwards is now deprecated in favor of the term sea_water_practical_salinity which is the salinity quantity stored by national data centers for post-1978 observations. The only exception to this is where the observed salinities are definitely known not to be recorded on the Practical Salinity Scale. The unit &quot;parts per thousand&quot; was used for sea_water_knudsen_salinity and sea_water_cox_salinity.</description>
@@ -22624,41 +22709,6 @@ http://vocab.nerc.ac.uk/collection/P01/current/TPHSDSZZ/6/.</description>
       <description>&quot;tendency_of_X&quot; means derivative of X with respect to time. The specification of a physical process by the phrase due_to_process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. &quot;Vertical mixing&quot; means any vertical transport other than by advection and parameterized eddy advection, represented by a combination of vertical diffusion, turbulent mixing and convection in ocean models. Sea water salinity is the salt content of sea water, often on the Practical Salinity Scale of 1978. However, the unqualified term &#x27;salinity&#x27; is generic and does not necessarily imply any particular method of calculation. The units of salinity are dimensionless and normally given as 1e-3 or 0.001 i.e. parts per thousand. There are standard names for the more precisely defined salinity quantities: sea_water_knudsen_salinity, S_K (used for salinity observations between 1901 and 1966), sea_water_cox_salinity, S_C (used for salinity observations between 1967 and 1977), sea_water_practical_salinity, S_P (used for salinity observations from 1978 to the present day), sea_water_absolute_salinity, S_A, sea_water_preformed_salinity, S_*, and sea_water_reference_salinity. Practical Salinity is reported on the Practical Salinity Scale of 1978 (PSS-78), and is usually based on the electrical conductivity of sea water in observations since the 1960s. Conversion of data between the observed scales follows: S_P = (S_K - 0.03) * (1.80655 / 1.805) and S_P = S_C, however the accuracy of the latter is dependent on whether chlorinity or conductivity was used to determine the S_C value, with this inconsistency driving the development of PSS-78. The more precise standard names should be used where appropriate for both modelled and observed salinities. In particular, the use of sea_water_salinity to describe salinity observations made from 1978 onwards is now deprecated in favor of the term sea_water_practical_salinity which is the salinity quantity stored by national data centers for post-1978 observations. The only exception to this is where the observed salinities are definitely known not to be recorded on the Practical Salinity Scale. The unit &quot;parts per thousand&quot; was used for sea_water_knudsen_salinity and sea_water_cox_salinity.</description>
    </entry>
 
-   <entry id="tendency_of_sea_water_salinity_expressed_as_salt_content">
-      <canonical_units>kg m-2 s-1</canonical_units>
-      <description>&quot;Content&quot; indicates a quantity per unit area. &quot;tendency_of_X&quot; means derivative of X with respect to time. This tendency encompasses all processes that impact on the time changes for the salt content within a grid cell.</description>
-   </entry>
-
-   <entry id="tendency_of_sea_water_salinity_expressed_as_salt_content_due_to_parameterized_dianeutral_mixing">
-      <canonical_units>kg m-2 s-1</canonical_units>
-      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. &quot;Content&quot; indicates a quantity per unit area. The specification of a physical process by the phrase due_to_process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. &quot;Dianeutral mixing&quot; means mixing across surfaces of neutral buoyancy. &quot;Parameterized&quot; means the part due to a scheme representing processes which are not explicitly resolved by the model.</description>
-   </entry>
-
-   <entry id="tendency_of_sea_water_salinity_expressed_as_salt_content_due_to_parameterized_eddy_advection">
-      <canonical_units>kg m-2 s-1</canonical_units>
-      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. &quot;Content&quot; indicates a quantity per unit area. The specification of a physical process by the phrase due_to_process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. Parameterized eddy advection in an ocean model means the part due to a scheme representing parameterized eddy-induced advective effects not included in the resolved model velocity field. Parameterized eddy advection can be represented on various spatial scales and there are standard names for parameterized_mesoscale_eddy_advection and parameterized_submesoscale_eddy_advection which both contribute to the total parameterized eddy advection. Additionally, when the parameterized advective process is represented in the model as a skew-diffusion rather than an advection, then the parameterized skew diffusion should be included in this diagnostic. The convergence of a skew-flux is identical (in the continuous formulation) to the convergence of an advective flux, making their tendencies the same.</description>
-   </entry>
-
-   <entry id="tendency_of_sea_water_salinity_expressed_as_salt_content_due_to_parameterized_mesoscale_eddy_advection">
-      <canonical_units>kg m-2 s-1</canonical_units>
-      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. &quot;Content&quot; indicates a quantity per unit area. The specification of a physical process by the phrase due_to_process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. Parameterized eddy advection in an ocean model means the part due to a scheme representing parameterized eddy-induced advective effects not included in the resolved model velocity field. Parameterized mesoscale eddy advection occurs on a spatial scale of many tens of kilometres and an evolutionary time of weeks. Reference: James C. McWilliams 2016, Submesoscale currents in the ocean, Proceedings of the Royal Society A: Mathematical, Physical and Engineering Sciences, volume 472, issue 2189. DOI: 10.1098/rspa.2016.0117. Parameterized mesoscale eddy advection is represented in ocean models using schemes such as the Gent-McWilliams scheme. There are also standard names for parameterized_submesoscale_eddy_advection which, along with parameterized_mesoscale_eddy_advection, contributes to the total parameterized eddy advection. Additionally, when the parameterized advective process is represented in the model as a skew-diffusion rather than an advection, then the parameterized skew diffusion should be included in this diagnostic. The convergence of a skew-flux is identical (in the continuous formulation) to the convergence of an advective flux, making their tendencies the same.</description>
-   </entry>
-
-   <entry id="tendency_of_sea_water_salinity_expressed_as_salt_content_due_to_parameterized_mesoscale_eddy_diffusion">
-      <canonical_units>kg m-2 s-1</canonical_units>
-      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. &quot;Content&quot; indicates a quantity per unit area. The specification of a physical process by the phrase due_to_process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. Parameterized mesoscale eddy diffusive processes include diffusion along neutral directions in the interior of the ocean and horizontal diffusion in the surface boundary layer. The processes occur on a spatial scale of many tens of kilometres and an evolutionary time of weeks.</description>
-   </entry>
-
-   <entry id="tendency_of_sea_water_salinity_expressed_as_salt_content_due_to_parameterized_submesoscale_eddy_advection">
-      <canonical_units>kg m-2 s-1</canonical_units>
-      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. &quot;Content&quot; indicates a quantity per unit area. The specification of a physical process by the phrase due_to_process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. Parameterized eddy advection in an ocean model means the part due to a scheme representing parameterized eddy-induced advective effects not included in the resolved model velocity field. Parameterized submesoscale eddy advection occurs on a spatial scale of the order of 1 km horizontally. Reference: James C. McWilliams 2016, Submesoscale currents in the ocean, Proceedings of the Royal Society A: Mathematical, Physical and Engineering Sciences, volume 472, issue 2189. DOI: 10.1098/rspa.2016.0117. There are also standard names for parameterized_mesoscale_eddy_advection which, along with parameterized_submesoscale_eddy_advection, contributes to the total parameterized eddy advection. Additionally, when the parameterized advective process is represented in the model as a skew-diffusion rather than an advection, then the parameterized skew diffusion should be included in this diagnostic. The convergence of a skew-flux is identical (in the continuous formulation) to the convergence of an advective flux, making their tendencies the same.</description>
-   </entry>
-
-   <entry id="tendency_of_sea_water_salinity_expressed_as_salt_content_due_to_residual_mean_advection">
-      <canonical_units>kg m-2 s-1</canonical_units>
-      <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. &quot;Content&quot; indicates a quantity per unit area. The specification of a physical process by the phrase due_to_process means that the quantity named is a single term in a sum of terms which together compose the general quantity named by omitting the phrase. The phrase &quot;residual_mean_advection&quot; refers to the sum of the model&#x27;s resolved advective transport plus any parameterized advective transport. Parameterized advective transport includes processes such as parameterized mesoscale and submesoscale transport, as well as any other advectively parameterized transport. When the parameterized advective transport is represented in the model as a skew-diffusion rather than an advection, then the parameterized skew diffusion should be included in this diagnostic, since the convergence of skew-fluxes are identical (in the continuous formulation) to the convergence of advective fluxes.</description>
-   </entry>
-
    <entry id="tendency_of_sea_water_temperature">
       <canonical_units>K s-1</canonical_units>
       <description>The phrase &quot;tendency_of_X&quot; means derivative of X with respect to time. Sea water temperature is the in situ temperature of the sea water. For observed data, depending on the period during which the observation was made, the measured in situ temperature was recorded against standard &quot;scales&quot;. These historical scales include the International Practical Temperature Scale of 1948 (IPTS-48; 1948-1967), the International Practical Temperature Scale of 1968 (IPTS-68, Barber, 1969; 1968-1989) and the International Temperature Scale of 1990 (ITS-90, Saunders 1990; 1990 onwards). Conversion of data between these scales follows t68 = t48 - (4.4 x 10e-6) * t48(100 - t - 48); t90 = 0.99976 * t68. Observations made prior to 1948 (IPTS-48) have not been documented and therefore a conversion cannot be certain. Differences between t90 and t68 can be up to 0.01 at temperatures of 40 C and above; differences of 0.002-0.007 occur across the standard range of ocean temperatures (-10 - 30 C). The International Equation of State of Seawater 1980 (EOS-80, UNESCO, 1981) and the Practical Salinity Scale (PSS-78) were both based on IPTS-68, while the Thermodynamic Equation of Seawater 2010 (TEOS-10) is based on ITS-90. References: Barber, 1969, doi: 10.1088/0026-1394/5/2/001; UNESCO, 1981; Saunders, 1990, WOCE Newsletter, 10, September 1990. It is strongly recommended that a variable with this standard name should have the attribute units_metadata=&quot;temperature: difference&quot;, meaning that it refers to temperature differences and implying that the origin of the temperature scale is irrelevant, because it is essential to know whether a temperature is on-scale or a difference in order to convert the units correctly (cf. https://cfconventions.org/cf-conventions/cf-conventions.html#temperature-units).</description>
@@ -26337,16 +26387,6 @@ http://vocab.nerc.ac.uk/collection/P01/current/TPHSDSZZ/6/.</description>
 
   </alias>
 
-  <alias id="integral_wrt_depth_of_sea_water_potential_temperature_expressed_as_heat_content">
-    <entry_id>sea_water_potential_temperature_expressed_as_heat_content</entry_id>
-
-  </alias>
-
-  <alias id="integral_of_sea_water_potential_temperature_wrt_depth_expressed_as_heat_content">
-    <entry_id>sea_water_potential_temperature_expressed_as_heat_content</entry_id>
-
-  </alias>
-
   <alias id="river_water_volume_transport_into_cell">
     <entry_id>incoming_water_volume_transport_along_river_channel</entry_id>
 
@@ -26972,21 +27012,6 @@ http://vocab.nerc.ac.uk/collection/P01/current/TPHSDSZZ/6/.</description>
 
   </alias>
 
-  <alias id="tendency_of_sea_water_conservative_temperature_expressed_as_heat_content_due_to_parameterized_eddy_dianeutral_mixing">
-    <entry_id>tendency_of_sea_water_conservative_temperature_expressed_as_heat_content_due_to_parameterized_dianeutral_mixing</entry_id>
-
-  </alias>
-
-  <alias id="tendency_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_eddy_dianeutral_mixing">
-    <entry_id>tendency_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_dianeutral_mixing</entry_id>
-
-  </alias>
-
-  <alias id="tendency_of_sea_water_salinity_expressed_as_salt_content_due_to_parameterized_eddy_dianeutral_mixing">
-    <entry_id>tendency_of_sea_water_salinity_expressed_as_salt_content_due_to_parameterized_dianeutral_mixing</entry_id>
-
-  </alias>
-
   <alias id="product_of_geopotential_height_and_omega">
     <entry_id>product_of_lagrangian_tendency_of_air_pressure_and_geopotential_height</entry_id>
 
@@ -27432,5 +27457,135 @@ http://vocab.nerc.ac.uk/collection/P01/current/TPHSDSZZ/6/.</description>
 
   </alias>
 
+  <alias id="sea_water_potential_temperature_expressed_as_heat_content">
+    <entry_id>integral_wrt_depth_of_sea_water_potential_temperature_expressed_as_heat_content</entry_id>
+
+  </alias>
+
+  <alias id="integral_of_sea_water_potential_temperature_wrt_depth_expressed_as_heat_content">
+    <entry_id>integral_wrt_depth_of_sea_water_potential_temperature_expressed_as_heat_content</entry_id>
+
+  </alias>
+
+  <alias id="tendency_of_sea_water_potential_temperature_expressed_as_heat_content">
+    <entry_id>tendency_of_integral_wrt_depth_of_sea_water_potential_temperature_expressed_as_heat_content</entry_id>
+
+  </alias>
+
+  <alias id="tendency_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_dianeutral_mixing">
+    <entry_id>tendency_of_integral_wrt_depth_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_dianeutral_mixing</entry_id>
+
+  </alias>
+
+  <alias id="tendency_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_eddy_dianeutral_mixing">
+    <entry_id>tendency_of_integral_wrt_depth_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_dianeutral_mixing</entry_id>
+
+  </alias>
+
+  <alias id="tendency_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_eddy_advection">
+    <entry_id>tendency_of_integral_wrt_depth_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_eddy_advection</entry_id>
+
+  </alias>
+
+  <alias id="tendency_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_mesoscale_eddy_advection">
+    <entry_id>tendency_of_integral_wrt_depth_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_mesoscale_eddy_advection</entry_id>
+
+  </alias>
+
+  <alias id="tendency_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_mesoscale_eddy_diffusion">
+    <entry_id>tendency_of_integral_wrt_depth_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_mesoscale_eddy_diffusion</entry_id>
+
+  </alias>
+
+  <alias id="tendency_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_submesoscale_eddy_advection">
+    <entry_id>tendency_of_integral_wrt_depth_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_parameterized_submesoscale_eddy_advection</entry_id>
+
+  </alias>
+
+  <alias id="tendency_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_residual_mean_advection">
+    <entry_id>tendency_of_integral_wrt_depth_of_sea_water_potential_temperature_expressed_as_heat_content_due_to_residual_mean_advection</entry_id>
+
+  </alias>
+
+  <alias id="tendency_of_sea_water_salinity_expressed_as_salt_content_due_to_parameterized_eddy_advection">
+    <entry_id>tendency_of_integral_wrt_depth_of_sea_water_salinity_expressed_as_salt_mass_content_due_to_parameterized_eddy_advection</entry_id>
+
+  </alias>
+
+  <alias id="tendency_of_sea_water_salinity_expressed_as_salt_content">
+    <entry_id>tendency_of_integral_wrt_depth_of_sea_water_salinity_expressed_as_salt_mass_content</entry_id>
+
+  </alias>
+
+  <alias id="tendency_of_sea_water_salinity_expressed_as_salt_content_due_to_parameterized_dianeutral_mixing">
+    <entry_id>tendency_of_integral_wrt_depth_of_sea_water_salinity_expressed_as_salt_mass_content_due_to_parameterized_dianeutral_mixing</entry_id>
+
+  </alias>
+
+  <alias id="tendency_of_sea_water_salinity_expressed_as_salt_content_due_to_parameterized_eddy_dianeutral_mixing">
+    <entry_id>tendency_of_integral_wrt_depth_of_sea_water_salinity_expressed_as_salt_mass_content_due_to_parameterized_dianeutral_mixing</entry_id>
+
+  </alias>
+
+  <alias id="tendency_of_sea_water_salinity_expressed_as_salt_content_due_to_parameterized_mesoscale_eddy_advection">
+    <entry_id>tendency_of_integral_wrt_depth_of_sea_water_salinity_expressed_as_salt_mass_content_due_to_parameterized_mesoscale_eddy_advection</entry_id>
+
+  </alias>
+
+  <alias id="tendency_of_sea_water_salinity_expressed_as_salt_content_due_to_parameterized_mesoscale_eddy_diffusion">
+    <entry_id>tendency_of_integral_wrt_depth_of_sea_water_salinity_expressed_as_salt_mass_content_due_to_parameterized_mesoscale_eddy_diffusion</entry_id>
+
+  </alias>
+
+  <alias id="tendency_of_sea_water_salinity_expressed_as_salt_content_due_to_parameterized_submesoscale_eddy_advection">
+    <entry_id>tendency_of_integral_wrt_depth_of_sea_water_salinity_expressed_as_salt_mass_content_due_to_parameterized_submesoscale_eddy_advection</entry_id>
+
+  </alias>
+
+  <alias id="tendency_of_sea_water_salinity_expressed_as_salt_content_due_to_residual_mean_advection">
+    <entry_id>tendency_of_integral_wrt_depth_of_sea_water_salinity_expressed_as_salt_mass_content_due_to_residual_mean_advection</entry_id>
+
+  </alias>
+
+  <alias id="tendency_of_sea_water_conservative_temperature_expressed_as_heat_content_due_to_parameterized_dianeutral_mixing">
+    <entry_id>tendency_of_integral_wrt_depth_of_sea_water_conservative_temperature_expressed_as_heat_content_due_to_parameterized_dianeutral_mixing</entry_id>
+
+  </alias>
+
+  <alias id="tendency_of_sea_water_conservative_temperature_expressed_as_heat_content_due_to_parameterized_eddy_dianeutral_mixing">
+    <entry_id>tendency_of_integral_wrt_depth_of_sea_water_conservative_temperature_expressed_as_heat_content_due_to_parameterized_dianeutral_mixing</entry_id>
+
+  </alias>
+
+  <alias id="tendency_of_sea_water_conservative_temperature_expressed_as_heat_content_due_to_parameterized_mesoscale_eddy_diffusion">
+    <entry_id>tendency_of_integral_wrt_depth_of_sea_water_conservative_temperature_expressed_as_heat_content_due_to_parameterized_mesoscale_eddy_diffusion</entry_id>
+
+  </alias>
+
+  <alias id="tendency_of_sea_water_conservative_temperature_expressed_as_heat_content_due_to_parameterized_mesoscale_eddy_advection">
+    <entry_id>tendency_of_integral_wrt_depth_of_sea_water_conservative_temperature_expressed_as_heat_content_due_to_parameterized_mesoscale_eddy_advection</entry_id>
+
+  </alias>
+
+  <alias id="tendency_of_sea_water_conservative_temperature_expressed_as_heat_content">
+    <entry_id>tendency_of_integral_wrt_depth_of_sea_water_conservative_temperature_expressed_as_heat_content</entry_id>
+
+  </alias>
+
+  <alias id="tendency_of_sea_water_conservative_temperature_expressed_as_heat_content_due_to_residual_mean_advection">
+    <entry_id>tendency_of_integral_wrt_depth_of_sea_water_conservative_temperature_expressed_as_heat_content_due_to_residual_mean_advection</entry_id>
+
+  </alias>
+
+  <alias id="tendency_of_sea_water_conservative_temperature_expressed_as_heat_content_due_to_parameterized_submesoscale_eddy_advection">
+    <entry_id>tendency_of_integral_wrt_depth_of_sea_water_conservative_temperature_expressed_as_heat_content_due_to_parameterized_submesoscale_eddy_advection</entry_id>
+
+  </alias>
+
+  <alias id="tendency_of_sea_water_conservative_temperature_expressed_as_heat_content_due_to_parameterized_eddy_advection">
+    <entry_id>tendency_of_integral_wrt_depth_of_sea_water_conservative_temperature_expressed_as_heat_content_due_to_parameterized_eddy_advection</entry_id>
+
+  </alias>
+
 
 </standard_name_table>

cloudnetpy_qc/quality.py

@@ -5,10 +5,11 @@ import json
 import logging
 import os
 import re
+from collections.abc import Iterable
 from enum import Enum
 from os import PathLike
 from pathlib import Path
-from typing import Iterable, NamedTuple
+from typing import NamedTuple, TypedDict
 
 import netCDF4
 import numpy as np
@@ -70,8 +71,15 @@ class FileReport(NamedTuple):
         }
 
 
+class SiteMeta(TypedDict):
+    latitude: float | None
+    longitude: float | None
+    altitude: float | None
+
+
 def run_tests(
     filename: str | PathLike,
+    site_meta: SiteMeta,
     product: Product | str | None = None,
     ignore_tests: list[str] | None = None,
 ) -> FileReport:
@@ -84,8 +92,8 @@ def run_tests(
                 product = Product(nc.cloudnet_file_type)
             except AttributeError as exc:
                 raise ValueError(
-                    "No 'cloudnet_file_type' global attribute found, can not run tests. "
-                    "Is this a legacy file?"
+                    "No 'cloudnet_file_type' global attribute found, "
+                    "can not run tests. Is this a legacy file?"
                 ) from exc
         logging.debug(f"Filename: {filename.stem}")
         logging.debug(f"File type: {product}")
@@ -93,7 +101,7 @@ def run_tests(
         for cls in Test.__subclasses__():
             if ignore_tests and cls.__name__ in ignore_tests:
                 continue
-            test_instance = cls(nc, filename, product)
+            test_instance = cls(nc, filename, product, site_meta)
             if product not in test_instance.products:
                 continue
             try:
@@ -117,10 +125,13 @@ class Test:
     description: str
     products: Iterable[Product] = Product.all()
 
-    def __init__(self, nc: netCDF4.Dataset, filename: Path, product: Product):
+    def __init__(
+        self, nc: netCDF4.Dataset, filename: Path, product: Product, site_meta: SiteMeta
+    ):
         self.filename = filename
         self.nc = nc
         self.product = product
+        self.site_meta = site_meta
         self.report = TestReport(
             test_id=self.__class__.__name__,
             exceptions=[],
@@ -341,7 +352,7 @@ class TestVariableNamesDefined(Test):
     }
 
     def run(self):
-        for key in self.nc.variables.keys():
+        for key in self.nc.variables:
             if key not in VARIABLES:
                 self._add_info(f"'{key}' is not defined in cloudnetpy-qc.")
 
@@ -496,7 +507,7 @@ class TestMedianLwp(Test):
         mask_percentage = ma.count_masked(data) / data.size * 100
         if mask_percentage > 20:
             msg = (
-                f"{round(mask_percentage,1)} % of '{key}' data points are masked "
+                f"{round(mask_percentage, 1)} % of '{key}' data points are masked "
                 f"due to low quality data."
             )
             if mask_percentage > 60:
@@ -561,7 +572,8 @@ class TestUnexpectedMask(Test):
             elif np.any(data.mask):
                 percentage = np.sum(data.mask) / data.size * 100
                 self._add_warning(
-                    f"Variable '{key}' contains masked values ({percentage:.1f} % are masked)."
+                    f"Variable '{key}' contains masked values "
+                    f"({percentage:.1f} % are masked)."
                 )
 
 
@@ -808,7 +820,50 @@ class TestCoordinateVariables(Test):
             ):
                 received = "', '".join(variable.dimensions)
                 self._add_error(
-                    f"Expected variable '{key}' to have dimensions '{key}' but received '{received}'"
+                    f"Expected variable '{key}' to have dimensions '{key}'"
+                    f" but received '{received}'"
+                )
+
+
+class TestCoordinates(Test):
+    name = "Coordinates"
+    description = "Check that file coordinates match site coordinates."
+
+    def run(self):
+        required_vars = {"latitude", "longitude"}
+        if self.nc.cloudnet_file_type != "model":
+            required_vars.add("altitude")
+        for key in required_vars:
+            if key not in self.nc.variables:
+                self._add_error(f"Variable '{key}' is missing")
+
+        if "latitude" in self.nc.variables and "longitude" in self.nc.variables:
+            site_lat = self.site_meta["latitude"]
+            site_lon = self.site_meta["longitude"]
+            file_lat = np.atleast_1d(self.nc["latitude"][:])
+            file_lon = np.atleast_1d(self.nc["longitude"][:])
+            dist = utils.haversine(site_lat, site_lon, file_lat, file_lon)
+            i = np.argmax(dist)
+            max_dist = 100 if self.nc.cloudnet_file_type == "model" else 10
+            if dist[i] > max_dist:
+                self._add_error(
+                    f"Variables 'latitude' and 'longitude' do not match "
+                    f"the site coordinates: "
+                    f"expected ({site_lat:.3f},\u00a0{site_lon:.3f}) "
+                    f"but received ({file_lat[i]:.3f},\u00a0{file_lon[i]:.3}), "
+                    f"distance {round(dist[i])}\u00a0km"
+                )
+
+        if "altitude" in self.nc.variables:
+            site_alt = self.site_meta["altitude"]
+            file_alt = np.atleast_1d(self.nc["altitude"][:])
+            diff_alt = np.abs(site_alt - file_alt)
+            i = np.argmax(diff_alt)
+            if diff_alt[i] > 100:
+                self._add_error(
+                    f"Variable 'altitude' doesn't match the site altitude: "
+                    f"expected {round(site_alt)}\u00a0m "
+                    f"but received {round(file_alt[i])}\u00a0m"
                 )
 
 
@@ -822,7 +877,7 @@ class TestCFConvention(Test):
     description = "Test compliance with the CF metadata conventions."
 
     def run(self):
-        from cfchecker import cfchecks  # pylint: disable=import-outside-toplevel
+        from cfchecker import cfchecks
 
         cf_version = "1.8"
         inst = cfchecks.CFChecker(
@@ -927,7 +982,8 @@ class TestInstrumentPid(Test):
                     self._add_error(msg)
                 return
         self._add_warning(
-            f"No serial number was defined in instrument PID but found '{received}' in the file."
+            f"No serial number was defined in instrument PID "
+            f"but found '{received}' in the file."
         )
 
     def _check_model_name(self):

cloudnetpy_qc/utils.py

@@ -5,6 +5,7 @@ import re
 from functools import lru_cache
 
 import numpy as np
+import numpy.typing as npt
 import requests
 
 PID_FORMAT = r"https?://hdl\.handle\.net/(.+)"
@@ -59,13 +60,14 @@ def create_out_of_bounds_msg(
     value: str | int | float,
 ) -> str:
     return (
-        f"Value {format_value(value)} exceeds expected limits {format_value(lower_limit)} ... "
-        f"{format_value(upper_limit)} with variable '{variable}'"
+        f"Value {format_value(value)} exceeds expected limits "
+        f"{format_value(lower_limit)} ... {format_value(upper_limit)} "
+        f"with variable '{variable}'"
     )
 
 
 def format_value(value: str | int | float) -> str:
-    return "{:,g}".format(float(value)).replace(",", "\u202f")
+    return f"{float(value):,g}".replace(",", "\u202f")
 
 
 @lru_cache
@@ -80,8 +82,8 @@ def fetch_pid(pid: str) -> dict:
 
 
 def integer_ranges(ints: list[int]) -> list[str]:
-    """
-    Convert given integers to list of ranges.
+    """Convert given integers to list of ranges.
+
     >>> integer_ranges([1,2,3,5,7,8,9])
     ['1–3', '5', '7–9']
     """
@@ -98,8 +100,7 @@ def integer_ranges(ints: list[int]) -> list[str]:
 
 
 def calc_pressure(altitude: float) -> float:
-    """
-    Calculate atmospheric pressure in International Standard Atmosphere.
+    """Calculate atmospheric pressure in International Standard Atmosphere.
 
     Args:
         altitude: Geopotential altitude above mean sea level (m)
@@ -115,3 +116,28 @@ def calc_pressure(altitude: float) -> float:
     g = 9.80665  # Gravitational acceleration (m s-2)
     R = 287.0528  # Specific gas constant (J kg-1 K-1)
     return P0 * (1 - L * altitude / T0) ** (g / (R * L))
+
+
+def haversine(
+    lat1: float | npt.ArrayLike,
+    lon1: float | npt.ArrayLike,
+    lat2: float | npt.ArrayLike,
+    lon2: float | npt.ArrayLike,
+) -> npt.NDArray:
+    """Calculate the great-circle distance between coordinates on Earth.
+
+    Returns:
+        Distance in kilometers.
+    """
+    r = 6371  # Radius of Earth (km)
+
+    lat1 = np.radians(lat1)
+    lon1 = np.radians(lon1)
+    lat2 = np.radians(lat2)
+    lon2 = np.radians(lon2)
+
+    dlat = lat2 - lat1
+    dlon = lon2 - lon1
+
+    a = np.sin(dlat / 2) ** 2 + np.cos(lat1) * np.cos(lat2) * np.sin(dlon / 2) ** 2
+    return 2 * r * np.arcsin(np.sqrt(a))

cloudnetpy_qc/variables.py

@@ -1,11 +1,10 @@
-"""Variable definitions"""
+"""Variable definitions."""
 
-# pylint: disable=too-many-lines
 from __future__ import annotations
 
-from collections.abc import Callable
+from collections.abc import Callable, Iterable
 from enum import Enum
-from typing import Iterable, Literal, NamedTuple
+from typing import Literal, NamedTuple
 
 import netCDF4
 
@@ -36,7 +35,7 @@ class Product(Enum):
     DRIZZLE = "drizzle"
     MWR_SINGLE = "mwr-single"
     MWR_MULTI = "mwr-multi"
-    EPSILON_LIDAR= "epsilon-lidar"
+    EPSILON_LIDAR = "epsilon-lidar"
     # Level 3
     L3_CF = "l3-cf"
     L3_IWC = "l3-iwc"
@@ -832,12 +831,17 @@ VARIABLES = {
         required=[Product.CPR],
     ),
     "vm_sat_vel": Variable(
-        long_name="Convolved and integrated mean Doppler velocity with satellite motion error",
+        long_name=(
+            "Convolved and integrated mean Doppler velocity with satellite motion error"
+        ),
         units="m s-1",
         required=[Product.CPR],
     ),
     "vm_sat_noise": Variable(
-        long_name="Convolved and integrated mean Doppler velocity with noise and satellite motion error",
+        long_name=(
+            "Convolved and integrated mean Doppler velocity "
+            "with noise and satellite motion error"
+        ),
         units="m s-1",
         required=[Product.CPR],
     ),
@@ -1605,8 +1609,9 @@ VARIABLES = {
     "snr_355_nr": Variable(
         long_name="Signal-to-Noise Ratio (355 nm near range)",
     ),
+    # rv-polarstern categorize specific
     "lidar_depolarisation": Variable(
-        long_name="Calibrated volume depolarisation (532 nm)"  # in rv-polarstern categorize files
+        long_name="Calibrated volume depolarisation (532 nm)"
     ),
     "beamwidthV": Variable(
         long_name="Vertical angular beamwidth",
@@ -1678,15 +1683,9 @@ VARIABLES = {
     "polariser_bleed_through": Variable(
         long_name="Polariser bleed-through",
     ),
-    "pulses_per_ray": Variable(
-        long_name="Pulses per ray",
-        units="1",
-        dtype=Dtype.INT
-    ),
+    "pulses_per_ray": Variable(long_name="Pulses per ray", units="1", dtype=Dtype.INT),
     "ray_accumulation_time": Variable(
-        long_name="Ray accumulation time",
-        units="s",
-        dtype=Dtype.FLOAT
+        long_name="Ray accumulation time", units="s", dtype=Dtype.FLOAT
     ),
     "lifted_index": Variable(
         long_name="Lifted index",

cloudnetpy_qc/version.py

@@ -1,6 +1,6 @@
 """Cloudnetpy-QC version."""
 
 MAJOR = 1
-MINOR = 23
-PATCH = 0
+MINOR = 24
+PATCH = 1
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy_qc-1.23.0.dist-info → cloudnetpy_qc-1.24.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy_qc
-Version: 1.23.0
+Version: 1.24.1
 Summary: Quality control routines for CloudnetPy products
 Author-email: Finnish Meteorological Institute <actris-cloudnet@fmi.fi>
 License: MIT License
@@ -69,7 +69,8 @@ $ pip3 install cloudnetpy-qc
 ```python
 import json
 from cloudnetpy_qc import quality
-report = quality.run_tests('cloudnet-file.nc')
+site_meta = {"latitude": 61.844, "longitude": 24.287, "altitude": 150}
+report = quality.run_tests('cloudnet-file.nc', site_meta)
 json_object = json.dumps(report.to_dict(), indent=2)
 print(json_object)
 ```
@@ -137,6 +138,7 @@ print(json_object)
 | `TestCFConvention`          | Test compliance with the CF metadata conventions.                                       |
 | `TestComment`               | Check that variables have expected comments.                                            |
 | `TestCoordinateVariables`   | Test dimensions of coordinate variables are correct.                                    |
+| `TestCoordinates`           | Check that file coordinates match site coordinates.                                     |
 | `TestDataCoverage`          | Test that file contains enough data.                                                    |
 | `TestDataModel`             | Test netCDF data model.                                                                 |
 | `TestDataTypes`             | Check that variables have expected data types.                                          |

cloudnetpy_qc-1.24.1.dist-info/RECORD

@@ -0,0 +1,15 @@
+cloudnetpy_qc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cloudnetpy_qc/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+cloudnetpy_qc/quality.py,sha256=qW4L8XSbgyQ4GM4yE7niUGjweXX38bsFfuFd_KhbsPQ,37447
+cloudnetpy_qc/utils.py,sha256=q_zD91g4eA4tBsW7M7y_UTKVkUZETDWT3NhAYPMOvcc,3909
+cloudnetpy_qc/variables.py,sha256=YrOw2qCdY8eTT3nlExpdtFU5YmVCC-yF9c0VQ-wWDzw,50851
+cloudnetpy_qc/version.py,sha256=zDxiiGzCQ8LJGHXUIE7EkKM8aryt7__J0q9daBnaHaY,102
+cloudnetpy_qc/data/area-type-table.xml,sha256=LQGp6rk8d-jZVjeFWPK_NjG2Kk1atvLlQXmV4UXggKI,17788
+cloudnetpy_qc/data/cf-standard-name-table.xml,sha256=NvW9oPvPwMR1YRIwxajTwvF83oarcwsxkUqnQgqPO3k,4406495
+cloudnetpy_qc/data/data_quality_config.ini,sha256=URRc93Du2_YFX6Q7GxMHptKIVl6kwxXw-kVyftmsEJk,1242
+cloudnetpy_qc/data/standardized-region-list.xml,sha256=gLRE2G7RQLD9hmvW5dTzyK7XPhORxWv2bfbrvAp5Uto,6426
+cloudnetpy_qc-1.24.1.dist-info/licenses/LICENSE,sha256=P0wszB7Cq2M390SKaqT4DGvECfwGOMdTTdxsWBpEUUc,1094
+cloudnetpy_qc-1.24.1.dist-info/METADATA,sha256=h_-RPzXoO2lm40oBO5ch23ibetNEO6Or1vJmdzA3SeE,8168
+cloudnetpy_qc-1.24.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+cloudnetpy_qc-1.24.1.dist-info/top_level.txt,sha256=shrf8A1KyrrnhbHocc4gHmTl38YY-DHflgf-gXiKnKs,14
+cloudnetpy_qc-1.24.1.dist-info/RECORD,,

cloudnetpy_qc-1.23.0.dist-info/RECORD

@@ -1,15 +0,0 @@
-cloudnetpy_qc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cloudnetpy_qc/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cloudnetpy_qc/quality.py,sha256=b0V0t0wyKhkHqsRQYx_RaR7xxI2rSvwgmNJB5OZ9Zhs,35313
-cloudnetpy_qc/utils.py,sha256=ssRqu8Auz7YpfZ79mTKmms4DkP9_ExLthbIpQGNq4jc,3270
-cloudnetpy_qc/variables.py,sha256=xDNjk2urxULN8cbTlOCDysgtaqt4tzVouBC0adyFDWc,50862
-cloudnetpy_qc/version.py,sha256=vcC-7aXpO_rnscCrcXHPgds8PHw_3OpsbpHgneXb03M,102
-cloudnetpy_qc/data/area-type-table.xml,sha256=F3lzCQR5LjmsB7qhlBt3CpZRNAH3UZoYJs6fmkvmCCM,17203
-cloudnetpy_qc/data/cf-standard-name-table.xml,sha256=BO6fEXQB6SRDeyP0wb7nyv3koKflM1s-0dIlgNF0KAI,4374043
-cloudnetpy_qc/data/data_quality_config.ini,sha256=URRc93Du2_YFX6Q7GxMHptKIVl6kwxXw-kVyftmsEJk,1242
-cloudnetpy_qc/data/standardized-region-list.xml,sha256=gLRE2G7RQLD9hmvW5dTzyK7XPhORxWv2bfbrvAp5Uto,6426
-cloudnetpy_qc-1.23.0.dist-info/licenses/LICENSE,sha256=P0wszB7Cq2M390SKaqT4DGvECfwGOMdTTdxsWBpEUUc,1094
-cloudnetpy_qc-1.23.0.dist-info/METADATA,sha256=8MugHHN6x-0FbGMnvx_QLkxEpAttD3MeKtIFshGB8ZY,7964
-cloudnetpy_qc-1.23.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-cloudnetpy_qc-1.23.0.dist-info/top_level.txt,sha256=shrf8A1KyrrnhbHocc4gHmTl38YY-DHflgf-gXiKnKs,14
-cloudnetpy_qc-1.23.0.dist-info/RECORD,,