Merge remote-tracking branch 'upstream/main' into release/v1

I thought this was achieved by ESCOMP#127 but apparently I missed some conflicts

Author: mkavulich

Metadata-standard-names.md

@@ -692,10 +692,10 @@ Note that appending '_on_previous_timestep' to standard_names in this section yi
     * `real(kind=kind_phys)`: units = kg kg-1
 * `mass_fraction_of_dust_accumulation_aerosol_particles_in_air`: Mass fraction of dust accumulation aerosol particles in air
     * `real(kind=kind_phys)`: units = kg kg-1
-* `number_fraction_of_coarse_aerosol_particles_in_air`: Number fraction of coarse aerosol particles in air
-    * `real(kind=kind_phys)`: units = 1
-* `number_fraction_of_accumulation_aerosol_particles_in_air`: Number fraction of accumulation aerosol particles in air
-    * `real(kind=kind_phys)`: units = 1
+* `number_fraction_of_coarse_aerosol_particles_in_air`: Ratio of number concentration of coarse mode dust aerosol particles to the molecular concentration of air
+    * `real(kind=kind_phys)`: units = particles molecules-1
+* `number_fraction_of_accumulation_aerosol_particles_in_air`: Ratio of number concentration of accumulation mode dust aerosol particles to the molecular concentration of air
+    * `real(kind=kind_phys)`: units = particles molecules-1
 ## emissions
 Emissions variables, contributed for the Community Emissions Data System (CEDS)
 * `emissions_of_co_due_to_anthropogenic_sources`: Carbon monoxide emissions from anthropogenic sources, total

Metadata-standard-names.yaml

@@ -1077,15 +1077,17 @@ sections:
     kind: kind_phys
     units: kg kg-1
   - name: number_fraction_of_coarse_aerosol_particles_in_air
-    description: Number fraction of coarse aerosol particles in air
+    description: Ratio of number concentration of coarse mode dust aerosol particles
+      to the molecular concentration of air
     type: real
     kind: kind_phys
-    units: 1
+    units: particles molecules-1
   - name: number_fraction_of_accumulation_aerosol_particles_in_air
-    description: Number fraction of accumulation aerosol particles in air
+    description: Ratio of number concentration of accumulation mode dust aerosol particles
+      to the molecular concentration of air
     type: real
     kind: kind_phys
-    units: 1
+    units: particles molecules-1
 - name: emissions
   comment: Emissions variables, contributed for the Community Emissions Data System
     (CEDS)

StandardNamesRules.rst

@@ -143,6 +143,13 @@ ESM Standard Name Rules
 
    **Preferred:** upward_virtual_potential_temperature_flux
 
+#. If there are two identical quantities from different schemes/processes that
+   need to be kept apart, suitable qualifiers are added to the names of the processes.
+   If one process is already established and more common than the other, then it is
+   sufficient to only prefix the new process with a suitable qualifier. Example:
+   ``due_to_convective_GWD`` and ``due_to_convenctive_whole_atmosphere_GWD``
+   as discussed in https://github.com/ESCOMP/ESMStandardNames/issues/79.
+
 #. Spell out acronyms unless they are obvious to a vast majority of
    scientists/developers who may come across them. A list of currently-used
    aliases is below. Whenever such an alias exist, use the alias in the
@@ -308,6 +315,7 @@ Suffixes
 | due_to_dry_convection
 | due_to_gwd
 | due_to_convective_gwd
+| due_to_convective_whole_atmosphere_gwd
 | due_to_orographic_gwd
 | due_to_gyre
 | due_to_isostatic_adjustment

standard_names.xml

@@ -1279,12 +1279,12 @@
       <type kind="kind_phys" units="kg kg-1">real</type>
     </standard_name>
     <standard_name name="number_fraction_of_coarse_aerosol_particles_in_air"
-                   long_name="Number fraction of coarse mode dust aerosol particles">
-      <type kind="kind_phys" units="1">real</type>
+                   description="Ratio of number concentration of coarse mode dust aerosol particles to the molecular concentration of air">
+      <type kind="kind_phys" units="particles molecules-1">real</type>
     </standard_name>
       <standard_name name="number_fraction_of_accumulation_aerosol_particles_in_air"
-                   long_name="Number fraction of accumulation mode dust aerosol particles">
-      <type kind="kind_phys" units="1">real</type>
+                   description="Ratio of number concentration of accumulation mode dust aerosol particles to the molecular concentration of air">
+      <type kind="kind_phys" units="particles molecules-1">real</type>
     </standard_name>
   </section>
   <section name="emissions"