Fix header field issue (NOAA-OWP#504)

stcui007 · Aug 30, 2023 · 9881ba6 · 9881ba6
1 parent beeb1bf
commit 9881ba6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/include/forcing/AorcForcing.hpp b/include/forcing/AorcForcing.hpp
@@ -84,7 +84,7 @@ namespace data_access {
         {"TMP_2maboveground", { CSDMS_STD_NAME_SURFACE_TEMP, "K" } }, 
         {"UGRD_10maboveground", { CSDMS_STD_NAME_WIND_U_X, "m s-1" } }, 
         {"VGRD_10maboveground", { CSDMS_STD_NAME_WIND_V_Y, "m s-1" } }, 
-        {"RAINRATE", { CSDMS_STD_NAME_LIQUID_EQ_PRECIP_RATE , "mm s^-1" } }, 
+        {"RAINRATE", { CSDMS_STD_NAME_LIQUID_EQ_PRECIP_RATE, "mm s^-1" } }, 
         {"T2D", { CSDMS_STD_NAME_SURFACE_TEMP, "K" } }, 
         {"Q2D", { NGEN_STD_NAME_SPECIFIC_HUMIDITY, "kg kg-1" } }, 
         {"U2D", { CSDMS_STD_NAME_WIND_U_X, "m s-1" } }, 

diff --git a/include/realizations/catchment/Bmi_Multi_Formulation.hpp b/include/realizations/catchment/Bmi_Multi_Formulation.hpp
@@ -245,6 +245,10 @@ namespace realization {
                 for(std::map<std::string,std::shared_ptr<data_access::GenericDataProvider>>::iterator iter = availableData.begin(); iter != availableData.end(); ++iter)
                 {
                     var_name = iter->first;
+                    auto it = std::find(forcing->get_available_variable_names().begin(), forcing->get_available_variable_names().end(), var_name);
+                    if (it == forcing->get_available_variable_names().end()) {
+                        var_name = forcing->get_available_variable_names()[0];
+                    }
                     //TODO: Find a probably more performant way than trial and exception here.
                     try {
                         time_t rv = availableData[var_name]->get_data_start_time();