Merge pull request #38 from MayeulDestouches/feature/specific_humidity

Rename `specific_humidity`

Metadata-standard-names.md

@@ -235,7 +235,9 @@ Note that appending '_on_previous_timestep' to standard_names in this section yi
     * `integer(kind=kind_phys)`: units = count
 * `number_of_tracers`: Number of tracers
     * `integer(kind=kind_phys)`: units = count
-* `specific_humidity`: Specific humidity
+* `water_vapor_mixing_ratio_wrt_moist_air`: Ratio of the mass of water vapor to the mass of moist air
+    * `real(kind=kind_phys)`: units = kg kg-1
+* `water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water`: Ratio of the mass of water vapor to the mass of moist air and hydrometeors
     * `real(kind=kind_phys)`: units = kg kg-1
 * `mole_fraction_of_water_vapor`: Mole fraction of water vapor
     * `real(kind=kind_phys)`: units = mol mol-1
@@ -1527,7 +1529,9 @@ Standard / required CCPP variables
     * `real(kind=kind_phys)`: units = K
 * `volumetric_soil_moisture_between_soil_bottom_and_water_table`: Volumetric soil moisture between soil bottom and water table
     * `real(kind=kind_phys)`: units = m3 m-3
-* `specific_humidity_at_2m`: Specific humidity at 2m
+* `water_vapor_mixing_ratio_wrt_moist_air_at_2m`: mixing ratio of the mass of water vapor to the mass of moist air, at two meters above surface
+    * `real(kind=kind_phys)`: units = kg kg-1
+* `water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water_at_2m`: mixing ratio of the mass of water vapor to the mass of moist air and hydrometeors, at two meters above surface
     * `real(kind=kind_phys)`: units = kg kg-1
 * `specified_surface_upward_specific_humidity_flux`: Specified surface upward specific humidity flux
     * `real(kind=kind_phys)`: units = kg kg-1 m s-1

StandardNamesRules.rst

@@ -60,11 +60,13 @@ CCPP Standard Name Rules
 #. By default, *mixing_ratio* refers to mass mixing ratios. The long name should
    explicitly specify that it refers to the *mass* mixing ratio.
    Mass mixing ratios should contain information regarding
-   with respect to what quantity they are defined, and options are *wrt_dry_air*, *wrt_moist_air*,
-   or *wrt_total_mass*, where *moist_air* refers to dry air plus vapor and *total_mass* refers
-   to dry air plus vapor and hydrometeors. A special case exists in the case of mixing ratio
-   of vapor: the standard name *specific_humidity* should be used instead of
-   *mixing_ratio_of_vapor_wrt_moist_air*.
+   with respect to what quantity they are defined, and options are *wrt_dry_air*,
+   *wrt_moist_air*, or *wrt_moist_air_and_condensed_water*, where *moist_air*
+   refers to dry air plus vapor and *moist_air_and_condensed_water* refers
+   to dry air plus vapor and hydrometeors. Use of *specific_humidity* should
+   be avoided as there is no consensus on whether it refers to
+   *mixing_ratio_of_water_vapor_wrt_moist_air* or
+   *mixing_ratio_of_water_vapor_wrt_moist_air_and_condensed_water*.
 
 #. Volume mixing ratios should be qualified as *volume_mixing_ratio*.
 

standard_names.xml

@@ -373,7 +373,12 @@
     <standard_name name="number_of_tracers">
       <type kind="kind_phys" units="count">integer</type>
     </standard_name>
-    <standard_name name="specific_humidity">
+    <standard_name name="water_vapor_mixing_ratio_wrt_moist_air"
+                   long_name="Ratio of the mass of water vapor to the mass of moist air">
+      <type kind="kind_phys" units="kg kg-1">real</type>
+    </standard_name>
+    <standard_name name="water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water"
+                   long_name="Ratio of the mass of water vapor to the mass of moist air and hydrometeors">
       <type kind="kind_phys" units="kg kg-1">real</type>
     </standard_name>
     <standard_name name="mole_fraction_of_water_vapor">
@@ -2330,7 +2335,12 @@
       <standard_name name="volumetric_soil_moisture_between_soil_bottom_and_water_table">
          <type kind="kind_phys" units="m3 m-3">real</type>
       </standard_name>
-      <standard_name name="specific_humidity_at_2m">
+      <standard_name name="water_vapor_mixing_ratio_wrt_moist_air_at_2m"
+                     long_name="mixing ratio of the mass of water vapor to the mass of moist air, at two meters above surface">
+         <type kind="kind_phys" units="kg kg-1">real</type>
+      </standard_name>
+      <standard_name name="water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water_at_2m"
+                     long_name="mixing ratio of the mass of water vapor to the mass of moist air and hydrometeors, at two meters above surface">
          <type kind="kind_phys" units="kg kg-1">real</type>
       </standard_name>
       <standard_name name="specified_surface_upward_specific_humidity_flux">