Merge pull request #4548 from NREL/issue-4531

Addresses #4531, breaking changes
NREL · Mar 16, 2022 · 313107d · 313107d
2 parents 18c0272 + 591f144
commit 313107d
Show file tree

Hide file tree

Showing 16 changed files with 130 additions and 68 deletions.
diff --git a/src/model/CoolingTowerSingleSpeed.cpp b/src/model/CoolingTowerSingleSpeed.cpp
@@ -252,8 +252,10 @@ namespace model {
       return getObject<ModelObject>().getModelObjectTarget<Schedule>(OS_CoolingTower_SingleSpeedFields::BasinHeaterOperatingScheduleName);
     }
 
-    boost::optional<std::string> CoolingTowerSingleSpeed_Impl::evaporationLossMode() const {
-      return getString(OS_CoolingTower_SingleSpeedFields::EvaporationLossMode, true);
+    std::string CoolingTowerSingleSpeed_Impl::evaporationLossMode() const {
+      boost::optional<std::string> value = getString(OS_CoolingTower_SingleSpeedFields::EvaporationLossMode, true);
+      OS_ASSERT(value);
+      return value.get();
     }
 
     bool CoolingTowerSingleSpeed_Impl::isEvaporationLossModeDefaulted() const {
@@ -280,8 +282,10 @@ namespace model {
       return isEmpty(OS_CoolingTower_SingleSpeedFields::DriftLossPercent);
     }
 
-    boost::optional<std::string> CoolingTowerSingleSpeed_Impl::blowdownCalculationMode() const {
-      return getString(OS_CoolingTower_SingleSpeedFields::BlowdownCalculationMode, true);
+    std::string CoolingTowerSingleSpeed_Impl::blowdownCalculationMode() const {
+      boost::optional<std::string> value = getString(OS_CoolingTower_SingleSpeedFields::BlowdownCalculationMode, true);
+      OS_ASSERT(value);
+      return value.get();
     }
 
     bool CoolingTowerSingleSpeed_Impl::isBlowdownCalculationModeDefaulted() const {
@@ -1126,7 +1130,7 @@ namespace model {
     return getImpl<detail::CoolingTowerSingleSpeed_Impl>()->basinHeaterOperatingSchedule();
   }
 
-  boost::optional<std::string> CoolingTowerSingleSpeed::evaporationLossMode() const {
+  std::string CoolingTowerSingleSpeed::evaporationLossMode() const {
     return getImpl<detail::CoolingTowerSingleSpeed_Impl>()->evaporationLossMode();
   }
 
@@ -1150,7 +1154,7 @@ namespace model {
     return getImpl<detail::CoolingTowerSingleSpeed_Impl>()->isDriftLossPercentDefaulted();
   }
 
-  boost::optional<std::string> CoolingTowerSingleSpeed::blowdownCalculationMode() const {
+  std::string CoolingTowerSingleSpeed::blowdownCalculationMode() const {
     return getImpl<detail::CoolingTowerSingleSpeed_Impl>()->blowdownCalculationMode();
   }
 

diff --git a/src/model/CoolingTowerSingleSpeed.hpp b/src/model/CoolingTowerSingleSpeed.hpp
@@ -120,7 +120,7 @@ namespace model {
 
     boost::optional<Schedule> basinHeaterOperatingSchedule() const;
 
-    boost::optional<std::string> evaporationLossMode() const;
+    std::string evaporationLossMode() const;
 
     bool isEvaporationLossModeDefaulted() const;
 
@@ -132,7 +132,7 @@ namespace model {
 
     bool isDriftLossPercentDefaulted() const;
 
-    boost::optional<std::string> blowdownCalculationMode() const;
+    std::string blowdownCalculationMode() const;
 
     bool isBlowdownCalculationModeDefaulted() const;
 

diff --git a/src/model/CoolingTowerSingleSpeed_Impl.hpp b/src/model/CoolingTowerSingleSpeed_Impl.hpp
@@ -123,7 +123,7 @@ namespace model {
 
       boost::optional<Schedule> basinHeaterOperatingSchedule() const;
 
-      boost::optional<std::string> evaporationLossMode() const;
+      std::string evaporationLossMode() const;
 
       bool isEvaporationLossModeDefaulted() const;
 
@@ -135,7 +135,7 @@ namespace model {
 
       bool isDriftLossPercentDefaulted() const;
 
-      boost::optional<std::string> blowdownCalculationMode() const;
+      std::string blowdownCalculationMode() const;
 
       bool isBlowdownCalculationModeDefaulted() const;
 

diff --git a/src/model/CoolingTowerTwoSpeed.cpp b/src/model/CoolingTowerTwoSpeed.cpp
@@ -404,8 +404,10 @@ namespace model {
       return getObject<ModelObject>().getModelObjectTarget<Schedule>(OS_CoolingTower_TwoSpeedFields::BasinHeaterOperatingScheduleName);
     }
 
-    boost::optional<std::string> CoolingTowerTwoSpeed_Impl::evaporationLossMode() const {
-      return getString(OS_CoolingTower_TwoSpeedFields::EvaporationLossMode, true);
+    std::string CoolingTowerTwoSpeed_Impl::evaporationLossMode() const {
+      boost::optional<std::string> value = getString(OS_CoolingTower_TwoSpeedFields::EvaporationLossMode, true);
+      OS_ASSERT(value);
+      return value.get();
     }
 
     bool CoolingTowerTwoSpeed_Impl::isEvaporationLossModeDefaulted() const {
@@ -432,8 +434,10 @@ namespace model {
       return isEmpty(OS_CoolingTower_TwoSpeedFields::DriftLossPercent);
     }
 
-    boost::optional<std::string> CoolingTowerTwoSpeed_Impl::blowdownCalculationMode() const {
-      return getString(OS_CoolingTower_TwoSpeedFields::BlowdownCalculationMode, true);
+    std::string CoolingTowerTwoSpeed_Impl::blowdownCalculationMode() const {
+      boost::optional<std::string> value = getString(OS_CoolingTower_TwoSpeedFields::BlowdownCalculationMode, true);
+      OS_ASSERT(value);
+      return value.get();
     }
 
     bool CoolingTowerTwoSpeed_Impl::isBlowdownCalculationModeDefaulted() const {
@@ -1446,7 +1450,7 @@ namespace model {
     return getImpl<detail::CoolingTowerTwoSpeed_Impl>()->basinHeaterOperatingSchedule();
   }
 
-  boost::optional<std::string> CoolingTowerTwoSpeed::evaporationLossMode() const {
+  std::string CoolingTowerTwoSpeed::evaporationLossMode() const {
     return getImpl<detail::CoolingTowerTwoSpeed_Impl>()->evaporationLossMode();
   }
 
@@ -1470,7 +1474,7 @@ namespace model {
     return getImpl<detail::CoolingTowerTwoSpeed_Impl>()->isDriftLossPercentDefaulted();
   }
 
-  boost::optional<std::string> CoolingTowerTwoSpeed::blowdownCalculationMode() const {
+  std::string CoolingTowerTwoSpeed::blowdownCalculationMode() const {
     return getImpl<detail::CoolingTowerTwoSpeed_Impl>()->blowdownCalculationMode();
   }
 

diff --git a/src/model/CoolingTowerTwoSpeed.hpp b/src/model/CoolingTowerTwoSpeed.hpp
@@ -167,7 +167,7 @@ namespace model {
 
     boost::optional<Schedule> basinHeaterOperatingSchedule() const;
 
-    boost::optional<std::string> evaporationLossMode() const;
+    std::string evaporationLossMode() const;
 
     bool isEvaporationLossModeDefaulted() const;
 
@@ -179,7 +179,7 @@ namespace model {
 
     bool isDriftLossPercentDefaulted() const;
 
-    boost::optional<std::string> blowdownCalculationMode() const;
+    std::string blowdownCalculationMode() const;
 
     bool isBlowdownCalculationModeDefaulted() const;
 

diff --git a/src/model/CoolingTowerTwoSpeed_Impl.hpp b/src/model/CoolingTowerTwoSpeed_Impl.hpp
@@ -175,7 +175,7 @@ namespace model {
 
       boost::optional<Schedule> basinHeaterOperatingSchedule() const;
 
-      boost::optional<std::string> evaporationLossMode() const;
+      std::string evaporationLossMode() const;
 
       bool isEvaporationLossModeDefaulted() const;
 
@@ -187,7 +187,7 @@ namespace model {
 
       bool isDriftLossPercentDefaulted() const;
 
-      boost::optional<std::string> blowdownCalculationMode() const;
+      std::string blowdownCalculationMode() const;
 
       bool isBlowdownCalculationModeDefaulted() const;
 

diff --git a/src/model/CoolingTowerVariableSpeed.cpp b/src/model/CoolingTowerVariableSpeed.cpp
@@ -236,8 +236,10 @@ namespace model {
       return getObject<ModelObject>().getModelObjectTarget<Schedule>(OS_CoolingTower_VariableSpeedFields::BasinHeaterOperatingSchedule);
     }
 
-    boost::optional<std::string> CoolingTowerVariableSpeed_Impl::evaporationLossMode() const {
-      return getString(OS_CoolingTower_VariableSpeedFields::EvaporationLossMode, true);
+    std::string CoolingTowerVariableSpeed_Impl::evaporationLossMode() const {
+      boost::optional<std::string> value = getString(OS_CoolingTower_VariableSpeedFields::EvaporationLossMode, true);
+      OS_ASSERT(value);
+      return value.get();
     }
 
     bool CoolingTowerVariableSpeed_Impl::isEvaporationLossModeDefaulted() const {
@@ -258,8 +260,10 @@ namespace model {
       return getDouble(OS_CoolingTower_VariableSpeedFields::DriftLossPercent, true);
     }
 
-    boost::optional<std::string> CoolingTowerVariableSpeed_Impl::blowdownCalculationMode() const {
-      return getString(OS_CoolingTower_VariableSpeedFields::BlowdownCalculationMode, true);
+    std::string CoolingTowerVariableSpeed_Impl::blowdownCalculationMode() const {
+      boost::optional<std::string> value = getString(OS_CoolingTower_VariableSpeedFields::BlowdownCalculationMode, true);
+      OS_ASSERT(value);
+      return value.get();
     }
 
     bool CoolingTowerVariableSpeed_Impl::isBlowdownCalculationModeDefaulted() const {
@@ -278,8 +282,10 @@ namespace model {
       return getInt(OS_CoolingTower_VariableSpeedFields::NumberofCells, true);
     }
 
-    boost::optional<std::string> CoolingTowerVariableSpeed_Impl::cellControl() const {
-      return getString(OS_CoolingTower_VariableSpeedFields::CellControl, true);
+    std::string CoolingTowerVariableSpeed_Impl::cellControl() const {
+      boost::optional<std::string> value = getString(OS_CoolingTower_VariableSpeedFields::CellControl, true);
+      OS_ASSERT(value);
+      return value.get();
     }
 
     bool CoolingTowerVariableSpeed_Impl::isCellControlDefaulted() const {
@@ -865,7 +871,7 @@ namespace model {
     return getImpl<detail::CoolingTowerVariableSpeed_Impl>()->basinHeaterOperatingSchedule();
   }
 
-  boost::optional<std::string> CoolingTowerVariableSpeed::evaporationLossMode() const {
+  std::string CoolingTowerVariableSpeed::evaporationLossMode() const {
     return getImpl<detail::CoolingTowerVariableSpeed_Impl>()->evaporationLossMode();
   }
 
@@ -885,7 +891,7 @@ namespace model {
     return getImpl<detail::CoolingTowerVariableSpeed_Impl>()->driftLossPercent();
   }
 
-  boost::optional<std::string> CoolingTowerVariableSpeed::blowdownCalculationMode() const {
+  std::string CoolingTowerVariableSpeed::blowdownCalculationMode() const {
     return getImpl<detail::CoolingTowerVariableSpeed_Impl>()->blowdownCalculationMode();
   }
 
@@ -905,7 +911,7 @@ namespace model {
     return getImpl<detail::CoolingTowerVariableSpeed_Impl>()->numberofCells();
   }
 
-  boost::optional<std::string> CoolingTowerVariableSpeed::cellControl() const {
+  std::string CoolingTowerVariableSpeed::cellControl() const {
     return getImpl<detail::CoolingTowerVariableSpeed_Impl>()->cellControl();
   }
 

diff --git a/src/model/CoolingTowerVariableSpeed.hpp b/src/model/CoolingTowerVariableSpeed.hpp
@@ -158,7 +158,7 @@ namespace model {
 
     void resetBasinHeaterOperatingSchedule();
 
-    boost::optional<std::string> evaporationLossMode() const;
+    std::string evaporationLossMode() const;
 
     bool isEvaporationLossModeDefaulted() const;
 
@@ -180,7 +180,7 @@ namespace model {
 
     void resetDriftLossPercent();
 
-    boost::optional<std::string> blowdownCalculationMode() const;
+    std::string blowdownCalculationMode() const;
 
     bool isBlowdownCalculationModeDefaulted() const;
 
@@ -206,7 +206,7 @@ namespace model {
 
     void resetNumberofCells();
 
-    boost::optional<std::string> cellControl() const;
+    std::string cellControl() const;
 
     bool isCellControlDefaulted() const;
 

diff --git a/src/model/CoolingTowerVariableSpeed_Impl.hpp b/src/model/CoolingTowerVariableSpeed_Impl.hpp
@@ -109,7 +109,7 @@ namespace model {
 
       boost::optional<Schedule> basinHeaterOperatingSchedule() const;
 
-      boost::optional<std::string> evaporationLossMode() const;
+      std::string evaporationLossMode() const;
 
       bool isEvaporationLossModeDefaulted() const;
 
@@ -119,7 +119,7 @@ namespace model {
 
       boost::optional<double> driftLossPercent() const;
 
-      boost::optional<std::string> blowdownCalculationMode() const;
+      std::string blowdownCalculationMode() const;
 
       bool isBlowdownCalculationModeDefaulted() const;
 
@@ -129,7 +129,7 @@ namespace model {
 
       boost::optional<int> numberofCells() const;
 
-      boost::optional<std::string> cellControl() const;
+      std::string cellControl() const;
 
       bool isCellControlDefaulted() const;