From dc7b04a9d6c56c66e457892e1efc365c2cacba6b Mon Sep 17 00:00:00 2001
From: Courtney Peverley <courtneyp@izumi.cgd.ucar.edu>
Date: Wed, 25 Sep 2024 14:32:31 -0600
Subject: [PATCH] fix air composition standard names; add more water species to
 registry

---
 src/data/air_composition.F90 |  6 +++---
 src/data/registry.xml        | 12 ++++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/data/air_composition.F90 b/src/data/air_composition.F90
index f202ae97..e84fc837 100644
--- a/src/data/air_composition.F90
+++ b/src/data/air_composition.F90
@@ -346,8 +346,8 @@ subroutine air_composition_init()
             !
             ! CLDICE
             !
-         case('cloud_ice_water_mixing_ratio_wrt_moist_air_and_condensed_water')
-            call air_species_info('cloud_ice_water_mixing_ratio_wrt_moist_air_and_condensed_water', &
+         case('cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water')
+            call air_species_info('cloud_ice_mixing_ratio_wrt_moist_air_and_condensed_water', &
                                   ix, mw)
             thermodynamic_active_species_idx(icnst) = ix
             thermodynamic_active_species_cp (icnst) = cpice
@@ -408,7 +408,7 @@ subroutine air_composition_init()
             !
             ! GRAUQM
             !
-         case('graupel_water_mixing_ratio_wrt_moist_air_and_conedensed_water')
+         case('graupel_water_mixing_ratio_wrt_moist_air_and_condensed_water')
             call air_species_info('graupel_water_mixing_ratio_wrt_moist_air_and_condensed_water', &
                                   ix, mw)
             thermodynamic_active_species_idx(icnst) = ix
diff --git a/src/data/registry.xml b/src/data/registry.xml
index 57a9ae3b..e22dabf5 100644
--- a/src/data/registry.xml
+++ b/src/data/registry.xml
@@ -406,5 +406,17 @@
       <long_name>rain mass mixing ratio with respect to moist air plus all airborne condensates</long_name>
       <ic_file_input_names>RAINQM cnst_RAINQM</ic_file_input_names>
     </variable>
+    <variable local_name="snowqm"
+              standard_name="snow_mixing_ratio_wrt_moist_air_and_condensed_water"
+              units="kg kg-1" type="real" constituent="true">
+      <long_name>snow mass mixing ratio with respect to moist air plus all airborne condensates</long_name>
+      <ic_file_input_names>SNOWQM cnst_SNOWQM</ic_file_input_names>
+    </variable>
+    <variable local_name="grauqm"
+              standard_name="graupel_water_mixing_ratio_wrt_moist_air_and_condensed_water"
+              units="kg kg-1" type="real" constituent="true">
+      <long_name>graupel mass mixing ratio with respect to moist air plus all airborne condensates</long_name>
+      <ic_file_input_names>GRAUQM cnst_GRAUQM</ic_file_input_names>
+    </variable>
   </file>
 </registry>