Improves performance in unconvirtable scenarios and cleans up logging…

… and `-DQUIET` compliance.
NOAA-OWP · Aug 24, 2022 · 35b86bb · 35b86bb
1 parent e310b57
commit 35b86bb
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/extern/topmodel/topmodel b/extern/topmodel/topmodel
diff --git a/include/forcing/CsvPerFeatureForcingProvider.hpp b/include/forcing/CsvPerFeatureForcingProvider.hpp
@@ -163,7 +163,7 @@ class CsvPerFeatureForcingProvider : public data_access::GenericDataProvider
         }
         catch (const std::runtime_error& e){
             #ifndef UDUNITS_QUIET
-            std::cerr<<"Unit conversion error: "<<std::endl<<e.what()<<std::endl<<"Returning unconverted value!"<<std::endl;
+            std::cerr<<"WARN: Unit conversion unsuccessful - Returning unconverted value! (\""<<e.what()<<"\")"<<std::endl;
             #endif
             return value;
         }

diff --git a/include/forcing/NetCDFPerFeatureDataProvider.hpp b/include/forcing/NetCDFPerFeatureDataProvider.hpp
@@ -471,7 +471,7 @@ namespace data_access
             catch (const std::runtime_error& e)
             {
                 #ifndef UDUNITS_QUIET
-                std::cerr<<"Unit conversion error: "<<std::endl<<e.what()<<std::endl<<"Returning unconverted value!"<<std::endl;
+                std::cerr<<"WARN: Unit conversion unsuccessful - Returning unconverted value! (\""<<e.what()<<"\")"<<std::endl;
                 #endif
                 return rvalue;
             }

diff --git a/include/realizations/catchment/Bmi_Module_Formulation.hpp b/include/realizations/catchment/Bmi_Module_Formulation.hpp
@@ -426,7 +426,9 @@ namespace realization {
                     return values;
                 }
                 catch (const std::runtime_error& e){
-                    std::cerr<<"Unit conversion error: "<<std::endl<<e.what()<<std::endl<<"Returning unconverted value!"<<std::endl;
+                    #ifndef UDUNITS_QUIET
+                    std::cerr<<"WARN: Unit conversion unsuccessful - Returning unconverted value! (\""<<e.what()<<"\")"<<std::endl;
+                    #endif
                     return values;
                 }
             }
@@ -487,7 +489,9 @@ namespace realization {
                     return UnitsHelper::get_converted_value(native_units, value, output_units);
                 }
                 catch (const std::runtime_error& e){
-                    std::cerr<<"Unit conversion error: "<<std::endl<<e.what()<<std::endl<<"Returning unconverted value!"<<std::endl;
+                    #ifndef UDUNITS_QUIET
+                    std::cerr<<"WARN: Unit conversion unsuccessful - Returning unconverted value! (\""<<e.what()<<"\")"<<std::endl;
+                    #endif
                     return value;
                 }
             }
@@ -835,12 +839,16 @@ namespace realization {
                         case geojson::PropertyType::Natural:
                             param.second.as_vector(long_vec);
                             value_ptr = get_values_as_type(type, long_vec.begin(), long_vec.end());
+                            #ifndef NGEN_QUIET
                             std::cout<<"NAT VALUE: "<<long_vec[0]<<std::endl;
+                            #endif
                             break;
                         case geojson::PropertyType::Real:
                             param.second.as_vector(double_vec);
                             value_ptr = get_values_as_type(type, double_vec.begin(), double_vec.end());
+                            #ifndef NGEN_QUIET
                             std::cout<<"REAL VALUE: "<<double_vec[0]<<std::endl;
+                            #endif
                             break;
                         /* Not currently supporting string parameter values
                         case geojson::PropertyType::String:

diff --git a/src/core/mediator/UnitsHelper.cpp b/src/core/mediator/UnitsHelper.cpp
@@ -16,6 +16,10 @@ std::shared_ptr<cv_converter> UnitsHelper::get_converter(const std::string& in_u
 
     std::string key = in_units + "|" + out_units; //Better solution? Good enough? Bother with nested maps?
     if(converters.count(key) == 1){
+        if(converters[key] == nullptr){
+            // same as last throw below
+            throw std::runtime_error("Unable to convert " + in_units + " to " + out_units);
+        }
         return converters[key];
     } else {
         ut_unit* from = ut_parse(unit_system, in_units.c_str(), in_encoding);
@@ -34,6 +38,7 @@ std::shared_ptr<cv_converter> UnitsHelper::get_converter(const std::string& in_u
         {
             ut_free(from);
             ut_free(to);
+            converters[key] = nullptr;
             throw std::runtime_error("Unable to convert " + in_units + " to " + out_units);
         }
         auto c = std::shared_ptr<cv_converter>(
+1 −1		.gitignore
+11 −1		README.md
+172 −32		docs/BMI_ADAPTION.md
+93 −0		docs/INPUT_FILES_EXPLAINED.md
+35 −0		docs/OUTPUT_FILES_EXPLAINED.md
+92 −0		docs/STAND_ALONE.md
+112 −0		docs/VARIABLE_ROLES.md
+ −		docs/img/bmi_topmod_compare_hyd.png
+ −		docs/img/bmi_topmod_compare_hyd_qobs.png
+ −		docs/img/bmi_topmod_compare_scatter.png
+ −		docs/img/hyd_out.PNG
+ −		docs/img/inputs_dat.PNG
+ −		docs/img/params_dat.PNG
+ −		docs/img/subcat_dat.PNG
+ −		docs/img/topmod_out.PNG
+ −		docs/img/topmod_run.PNG
+1 −1		include/topmodel.h
+8 −14		params/README.md
+976 −0		refs/original_code_c/demo_topmod.out
+71 −6		src/bmi_topmodel.c
+21 −18		src/topmodel.c
+2 −2		test/Makefile
+32 −20		test/README.md
+0 −1,431		test/data/inputs_100.dat
+1 −1		test/data/subcat.dat
+0 −7		test/data/topmod_100.run
+7 −7		test/data/topmod_unit_test.run
+23 −14		test/main_unit_test_bmi.c