Add precip snow and energy flux to bmi

PyStemmusScope/bmi/variable_reference.py

@@ -28,24 +28,58 @@ class BmiVariable:
         keys=["fluxes", "Resp"],
     ),
     BmiVariable(
-        name="precipitation",
+        name="precipitation_total",
         dtype="float64",
         input=True,
         output=False,
         units="cm s-1",
         grid=0,
-        keys=["ForcingData", "Precip_msr"],
-        all_timesteps=True,
+        keys=["ForcingData", "Precip_totalLiquid"],
     ),
     BmiVariable(
-        name="applied_infiltration",
+        name="precipitation_liquid",
         dtype="float64",
         input=False,
         output=True,
         units="cm s-1",
         grid=0,
-        keys=["ForcingData", "applied_inf"],
-        all_timesteps=True,
+        keys=["ForcingData", "Precip_liquid"],
+    ),
+    BmiVariable(
+        name="precipitation_snow",
+        dtype="float64",
+        input=False,
+        output=True,
+        units="cm s-1",
+        grid=0,
+        keys=["ForcingData", "Precip_snow"],
+    ),    
+    BmiVariable(
+        name="precipitation_snow_accumulated",
+        dtype="float64",
+        input=False,
+        output=True,
+        units="cm s-1",
+        grid=0,
+        keys=["ForcingData", "Precip_snowAccum"],
+    ),
+    BmiVariable(
+        name="precipitation_snowmelt",
+        dtype="float64",
+        input=False,
+        output=True,
+        units="cm s-1",
+        grid=0,
+        keys=["ForcingData", "Precip_snowmelt"],
+    ),
+    BmiVariable(
+        name="effective_precipitation",
+        dtype="float64",
+        input=False,
+        output=True,
+        units="cm s-1",
+        grid=0,
+        keys=["ForcingData", "effectivePrecip"],
     ),
     BmiVariable(
         name="soil_evaporation",
@@ -101,7 +135,7 @@ class BmiVariable:
         output=True,
         units="cm s-1",
         grid=0,
-        keys=["RS"],
+        keys=["ForcingData", "runoff"],
     ),
     BmiVariable(
         name="surface_runoff_hortonian",
@@ -110,8 +144,7 @@ class BmiVariable:
         output=True,
         units="cm s-1",
         grid=0,
-        keys=["ForcingData", "R_Dunn"],
-        all_timesteps=True,
+        keys=["ForcingData", "runoffHort"],
     ),
     BmiVariable(
         name="surface_runoff_dunnian",
@@ -120,8 +153,7 @@ class BmiVariable:
         output=True,
         units="cm s-1",
         grid=0,
-        keys=["ForcingData", "R_Hort"],
-        all_timesteps=True,
+        keys=["ForcingData", "runoffDunn"],
     ),
     # groundwater vars (STEMMUS_SCOPE)
     BmiVariable(
@@ -151,6 +183,24 @@ class BmiVariable:
         grid=0,
         keys=["gwfluxes", "indxRchrg"],
     ),
+    BmiVariable(
+        name="energy_top_flux",
+        dtype="float64",
+        input=False,
+        output=True,
+        units="w s-1",
+        grid=0,
+        keys=["gwfluxes", "energyTopflux"],
+    ),
+    BmiVariable(
+        name="energy_bottom_flux",
+        dtype="float64",
+        input=False,
+        output=True,
+        units="w s-1",
+        grid=0,
+        keys=["gwfluxes", "energyBotmflux"],
+    ),    
     # groundwater (coupling) vars
     BmiVariable(
         name="groundwater_coupling_enabled",