Update BMI C++ header to match upstream with virtual dtor and correct…

… namespace
NOAA-OWP · Jun 11, 2024 · 5b64baa · 5b64baa
1 parent cbd4ea4
commit 5b64baa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/bmi/bmi.hxx b/bmi/bmi.hxx
@@ -9,10 +9,10 @@
 #include <string>
 #include <vector>
 
-namespace bmixx {
+namespace bmi {
 
-  //const int BMI_SUCCESS = 0;
-  //  const int BMI_FAILURE = 1;
+  const int BMI_SUCCESS = 0;
+  const int BMI_FAILURE = 1;
 
   const int MAX_COMPONENT_NAME = 2048;
   const int MAX_VAR_NAME = 2048;
@@ -21,6 +21,8 @@ namespace bmixx {
 
   class Bmi {
     public:
+      virtual ~Bmi() { }
+
       // Model control functions.
       virtual void Initialize(std::string config_file) = 0;
       virtual void Update() = 0;

diff --git a/include/bmi_lgar.hxx b/include/bmi_lgar.hxx
@@ -27,7 +27,7 @@ class NotImplemented : public std::logic_error {
 
 }
 
-class BmiLGAR : public bmixx::Bmi {
+class BmiLGAR : public bmi::Bmi {
 public:
   BmiLGAR() {
     this->input_var_names[0] = "precipitation_rate";