Try a different variable name.

NREL · Jun 4, 2024 · 2523e6e · 2523e6e
1 parent 5017a02
commit 2523e6e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/utilities/filetypes/EpwFile.cpp b/src/utilities/filetypes/EpwFile.cpp
@@ -3630,7 +3630,7 @@ std::vector<EpwDesignCondition> EpwFile::designConditions() {
  return m_designs;
 }
 
-boost::optional<TimeSeries> EpwFile::getTimeSeries(const std::string& name, bool isActual) {
+boost::optional<TimeSeries> EpwFile::getTimeSeries(const std::string& name, bool isActualOverride) {
  if (m_data.empty()) {
  if (!openstudio::filesystem::exists(m_path) || !openstudio::filesystem::is_regular_file(m_path)) {
  LOG_AND_THROW("Path '" << m_path << "' is not an EPW file");
@@ -3666,8 +3666,8 @@ boost::optional<TimeSeries> EpwFile::getTimeSeries(const std::string& name, bool
  // Time time=m_data[i].time();
  boost::optional<double> value = m_data[i].getField(id);
  if (value) {
- if (isActual() || isActual) {
- dates.push_back(DateTime(dateTime));
+ if (isActual() || isActualOverride) {
+  dates.push_back(DateTime(dateTime));
  } else {
  // Strip year
  dates.push_back(DateTime(Date(dateTime.date().monthOfYear(), dateTime.date().dayOfMonth()), dateTime.time()));

diff --git a/src/utilities/filetypes/EpwFile.hpp b/src/utilities/filetypes/EpwFile.hpp
@@ -921,7 +921,7 @@ class UTILITIES_API EpwFile
 
  /// get a time series of a particular weather field
  // This will probably need to include the period at some point, but for now just dump everything into a time series
- boost::optional<TimeSeries> getTimeSeries(const std::string& field, bool isActual = false);
+ boost::optional<TimeSeries> getTimeSeries(const std::string& field, bool isActualOverride = false);
  /// get a time series of a computed quantity
  boost::optional<TimeSeries> getComputedTimeSeries(const std::string& field);