Merge for 1.10.0 Release #830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

macumber merged 21 commits into master from develop

Jul 26, 2025

CMakeLists.txt

-Original file line number
+Diff line change
@@ Expand Up / @@ -272,7 +272,7 @@ endif() @@
     # TODO: Modify the more specific variables as needed to indicate prerelease, etc
     # Keep in beta in-between release cycles. Set to empty string (or comment out) for official)
-    set(PROJECT_VERSION_PRERELEASE "rc2")
+    set(PROJECT_VERSION_PRERELEASE "")
     # OpenStudio version: Only include Major.Minor.Patch, eg "3.0.0", even if you have a prerelease tag
     set(OPENSTUDIOAPPLICATION_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
@@ Expand Down @@

src/model_editor/PathWatcher.cpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -15,13 +15,17 @@ @@
     /// constructor
     PathWatcher::PathWatcher(const openstudio::path& p, int msec)
-      : m_enabled(true), m_exists(openstudio::filesystem::exists(p)), m_dirty(false), m_checksum(openstudio::checksum(p)), m_path(p), m_msec(msec) {
+      : m_enabled(true), m_exists(false), m_dirty(false), m_checksum(openstudio::checksum(p)), m_path(p), m_msec(msec) {
+      boost::system::error_code ec;
+      m_exists = openstudio::filesystem::exists(p, ec);
       // make sure a QApplication exists
       openstudio::Application::instance().application(false);
       openstudio::Application::instance().processEvents();
       const bool isDirectory =
-        (openstudio::filesystem::is_directory(p) || openstudio::toString(p.filename()) == "." || openstudio::toString(p.filename()) == "/");
+        (openstudio::filesystem::is_directory(p, ec) || openstudio::toString(p.filename()) == "." || openstudio::toString(p.filename()) == "/");
       if (isDirectory) {
         LOG_FREE_AND_THROW("openstudio.PathWatcher", "Watching Directory '" << openstudio::toString(p) << "' is not supported");
@@ Expand Down Expand Up / @@ -71,7 +75,8 @@ bool PathWatcher::dirty() const { @@
     }
     void PathWatcher::clearState() {
-      m_exists = openstudio::filesystem::exists(m_path);
+      boost::system::error_code ec;
+      m_exists = openstudio::filesystem::exists(m_path, ec);
       m_dirty = false;
       m_checksum = openstudio::checksum(m_path);
     }
@@ Expand All / @@ -87,7 +92,8 @@ void PathWatcher::fileChanged(const QString& path) { @@
     }
     void PathWatcher::checkFile() {
-      bool exists = openstudio::filesystem::exists(m_path);
+      boost::system::error_code ec;
+      bool exists = openstudio::filesystem::exists(m_path, ec);
       std::string checksum = openstudio::checksum(m_path);
       if (checksum == "00000000") {
@@ Expand Down @@

src/openstudio_app/OpenStudioApp.cpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -171,7 +171,8 @@ OpenStudioApp::OpenStudioApp(int& argc, char** argv) @@
       std::stringstream webenginePath;
       webenginePath << QCoreApplication::applicationDirPath().toStdString();
       webenginePath << "/../Frameworks/QtWebEngineCore.framework/Versions/A/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess";
-      if (filesystem::exists(filesystem::path(webenginePath.str()))) {
+      boost::system::error_code ec;
+      if (filesystem::exists(filesystem::path(webenginePath.str()), ec)) {
         setenv("QTWEBENGINEPROCESS_PATH", webenginePath.str().c_str(), true);
       }
@@ Expand Down Expand Up @@
           };
           for (const auto& scriptfolder : scriptfolders) {
-            if (openstudio::filesystem::exists(scriptfolder)) {
+            boost::system::error_code ec;
+            if (openstudio::filesystem::exists(scriptfolder, ec)) {
               removedScriptDirs = true;
-              openstudio::filesystem::remove_all(scriptfolder);
+              openstudio::filesystem::remove_all(scriptfolder, ec);
             }
           }
         }
@@ Expand Down Expand Up / @@ -1149,9 +1151,7 @@ void OpenStudioApp::readSettings() { @@
       setLastPath(settings.value("lastPath", QDir::homePath()).toString());
       setDviewPath(openstudio::toPath(settings.value("dviewPath", "").toString()));
       m_currLang = settings.value("language", "en").toString();
-      LOG_FREE(Debug, "OpenStudioApp",
-               "\n\n\nm_currLang=[" << m_currLang.toStdString() << "]"
-                                    << "\n\n\n");
+      LOG_FREE(Debug, "OpenStudioApp", "\n\n\nm_currLang=[" << m_currLang.toStdString() << "]" << "\n\n\n");
       if (m_currLang.isEmpty()) {
         m_currLang = "en";
       }
@@ Expand Down Expand Up / @@ -1554,7 +1554,8 @@ void OpenStudioApp::loadShoeboxModel() { @@
       auto filePath = resourcesPath() / toPath("ShoeboxModel/ShoeboxExample.osm");
       boost::optional<openstudio::model::Model> model_;
-      if (openstudio::filesystem::is_regular_file(filePath)) {
+      boost::system::error_code ec;
+      if (openstudio::filesystem::is_regular_file(filePath, ec)) {
         model_ = versionTranslator.loadModel(filePath);
       } else if (isOpenStudioApplicationRunningFromBuildDirectory()) {
         filePath = getOpenStudioCoalitionMeasuresSourceDirectory() / toPath("models/ShoeboxExample.osm");
@@ Expand Down Expand Up @@
         LOG_FREE(Debug, "OpenStudioApp", "setDViewPath t_dviewPath is not empty.");
         // check if exists?
-        if (openstudio::filesystem::exists(t_dviewPath) && !openstudio::filesystem::is_directory(t_dviewPath)) {
+        boost::system::error_code ec;
+        if (openstudio::filesystem::exists(t_dviewPath, ec) && !openstudio::filesystem::is_directory(t_dviewPath, ec)) {
           m_dviewPath = t_dviewPath;
         } else {
           LOG_FREE(Error, "OpenStudioApp", "setDViewPath: t_dviewPath doesn't not appear to be valid: '" << t_dviewPath << "'.");
@@ Expand Down @@

src/openstudio_app/Resources/default/hvac_library.osm

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -2387,7 +2387,7 @@ OS:WaterHeater:Sizing,
  
      {a5780efe-a3d2-4211-a0a1-66f758539f62}, !- WaterHeater Name

      PeakDraw,                               !- Design Mode

      0.538503,                               !- Time Storage Can Meet Peak Draw {hr}

      0,                                      !- Time for Tank Recovery {hr}

      1,                                      !- Time for Tank Recovery {hr}

      1;                                      !- Nominal Tank Volume for Autosizing Plant Connections {m3}

    OS:WaterHeater:HeatPump,

    @@ -2624,7 +2624,7 @@ OS:WaterHeater:Sizing,
  
      {db2fa640-2a72-4846-9027-769207ea3ebf}, !- WaterHeater Name

      PeakDraw,                               !- Design Mode

      0.538503,                               !- Time Storage Can Meet Peak Draw {hr}

      0,                                      !- Time for Tank Recovery {hr}

      1,                                      !- Time for Tank Recovery {hr}

      1;                                      !- Nominal Tank Volume for Autosizing Plant Connections {m3}

    OS:WaterHeater:Mixed,

    @@ -2677,7 +2677,7 @@ OS:WaterHeater:Sizing,
  
      {5a6a31ef-f662-4452-925d-855d251337c0}, !- WaterHeater Name

      PeakDraw,                               !- Design Mode

      0.538503,                               !- Time Storage Can Meet Peak Draw {hr}

      0,                                      !- Time for Tank Recovery {hr}

      1,                                      !- Time for Tank Recovery {hr}

      1;                                      !- Nominal Tank Volume for Autosizing Plant Connections {m3}

    OS:WaterHeater:HeatPump:WrappedCondenser,

    @@ -2868,7 +2868,7 @@ OS:WaterHeater:Sizing,
  
      {488acc4e-9be5-426c-a365-587633e98f6c}, !- WaterHeater Name

      PeakDraw,                               !- Design Mode

      0.538503,                               !- Time Storage Can Meet Peak Draw {hr}

      0,                                      !- Time for Tank Recovery {hr}

      1,                                      !- Time for Tank Recovery {hr}

      1;                                      !- Nominal Tank Volume for Autosizing Plant Connections {m3}

    OS:Schedule:Ruleset,

src/openstudio_lib/ApplyMeasureNowDialog.cpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -380,9 +380,7 @@ void ApplyMeasureNowDialog::runMeasure() { @@
       if (OSAppBase::instance()->currentDocument()->mainWindow()->useClassicCLI()) {
         arguments << "classic";
       }
-      arguments << "run"
-                << "-m"
-                << "-w" << toQString(*tempWorkflowJSONPath);
+      arguments << "run" << "-m" << "-w" << toQString(*tempWorkflowJSONPath);
       LOG(Debug, "openstudioExePath='" << toString(openstudioExePath) << "'");
       LOG(Debug, "run arguments" << arguments.join(";").toStdString());
@@ Expand All / @@ -408,7 +406,8 @@ void ApplyMeasureNowDialog::displayResults() { @@
       this->okButton()->setText(ACCEPT_CHANGES);
       this->okButton()->show();
-      if (boost::filesystem::exists(*m_reloadPath)) {
+      boost::system::error_code ec;
+      if (boost::filesystem::exists(*m_reloadPath, ec)) {
         this->okButton()->setEnabled(true);
       } else {
         this->okButton()->setEnabled(false);
@@ Expand Down @@

src/openstudio_lib/HVACSystemsController.cpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -26,6 +26,10 @@ @@
     #include <openstudio/model/ModelObject.hpp>
     #include <openstudio/model/HVACComponent.hpp>
     #include <openstudio/model/HVACComponent_Impl.hpp>
+    #include <openstudio/model/WaterHeaterMixed.hpp>
+    #include <openstudio/model/WaterHeaterMixed_Impl.hpp>
+    #include <openstudio/model/WaterHeaterSizing.hpp>
+    #include <openstudio/model/WaterHeaterSizing_Impl.hpp>
     #include <openstudio/model/WaterToAirComponent.hpp>
     #include <openstudio/model/WaterToAirComponent_Impl.hpp>
     #include <openstudio/model/WaterToWaterComponent.hpp>
@@ Expand Down Expand Up @@
         }
         case ADDTOMODEL_SHWLOOP: {
           loop = model::addSHWLoop(m_model);
+          // issue #831
+          for (auto component : loop->supplyComponents()) {
+            if (boost::optional<model::WaterHeaterMixed> waterHeader = component.optionalCast<model::WaterHeaterMixed>()) {
+              model::WaterHeaterSizing waterHeaterSizing = waterHeader->waterHeaterSizing();
+              if (waterHeaterSizing.designMode() && waterHeaterSizing.designMode().get() == "PeakDraw") {
+                if (!waterHeaterSizing.timeforTankRecovery() || waterHeaterSizing.timeforTankRecovery().get() == 0) {
+                  waterHeaterSizing.setTimeforTankRecovery(1);
+                }
+              }
+            }
+          }
           break;
         }
         case ADDTOMODEL_SYSTEM_TYPE_3: {
@@ Expand Down @@

src/openstudio_lib/LocationTabView.cpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -722,6 +722,7 @@ void LocationView::onWeatherFileBtnClicked() { @@
           if (!previousEPWPath.empty()) {
             if (previousEPWPath.filename() != newPath.filename()) {
+              // inside try/catch, allow exception
               if (openstudio::filesystem::exists(previousEPWPath)) {
                 openstudio::filesystem::remove_all(previousEPWPath);
               }
@@ Expand Down Expand Up / @@ -762,7 +763,8 @@ void LocationView::onWeatherFileBtnClicked() { @@
         } catch (...) {
-          openstudio::filesystem::remove_all(newPath);
+          boost::system::error_code ec;
+          openstudio::filesystem::remove_all(newPath, ec);
           QMessageBox box(QMessageBox::Warning, tr("Failed To Set Weather File"), tr("Failed To Set Weather File To ") + fileName, QMessageBox::Ok);
           box.setDetailedText(toQString(ss.string()));
@@ Expand Down @@

src/openstudio_lib/OSDocument.cpp

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -150,7 +150,8 @@ OSDocument::OSDocument(const openstudio::model::Model& library, const openstudio
  
      if (!m_savePath.isEmpty()) {

        auto p = toPath(m_savePath);

        modelTempDirPath = model::initializeModel(*model, p);

        m_mainWindow->setWindowTitle(toQString(p.filename()) + "[*]");

        m_mainWindow->setWindowFilePath(m_savePath);

        m_mainWindow->setWindowTitle(m_savePath + "[*]");

      } else {

        modelTempDirPath = model::initializeModel(*model);

        m_mainWindow->setWindowTitle("Untitled[*]");

    @@ -930,12 +931,13 @@ bool OSDocument::fixWeatherFileInTemp(bool opening) {
  
        epwPathAbsolute = true;

        epwInUserPath = *weatherFilePath;

        if (boost::filesystem::exists(epwInUserPath)) {

        boost::system::error_code ec;

        if (boost::filesystem::exists(epwInUserPath, ec)) {

          epwInUserPathChecksum = checksum(epwInUserPath);

        }

        epwInTempPath = tempFilesDir / epwInUserPath.filename();

        if (boost::filesystem::exists(epwInTempPath)) {

        if (boost::filesystem::exists(epwInTempPath, ec)) {

          epwInTempPathChecksum = checksum(epwInTempPath);

        }

    @@ -946,11 +948,12 @@ bool OSDocument::fixWeatherFileInTemp(bool opening) {
  
        // Look in temp model "resources" and "resources/files"

        epwInTempPath = tempResourcesDir / *weatherFilePath;

        if (boost::filesystem::exists(epwInTempPath)) {

        boost::system::error_code ec;

        if (boost::filesystem::exists(epwInTempPath, ec)) {

          epwInTempPathChecksum = checksum(epwInTempPath);

        } else {

          epwInTempPath = tempFilesDir / *weatherFilePath;

          if (boost::filesystem::exists(epwInTempPath)) {

          if (boost::filesystem::exists(epwInTempPath, ec)) {

            epwInTempPathChecksum = checksum(epwInTempPath);

          }

        }

    @@ -966,12 +969,12 @@ bool OSDocument::fixWeatherFileInTemp(bool opening) {
  
          // Expected location is companion_folder/files

          epwInUserPath = searchFilesDir / *weatherFilePath;

          if (boost::filesystem::exists(epwInUserPath)) {

          if (boost::filesystem::exists(epwInUserPath, ec)) {

            epwInUserPathChecksum = checksum(epwInUserPath);

          } else {

            // Just in case, we look in the companion_folder

            epwInUserPath = searchCompanionDir / *weatherFilePath;

            if (boost::filesystem::exists(epwInUserPath)) {

            if (boost::filesystem::exists(epwInUserPath, ec)) {

              epwInUserPathChecksum = checksum(epwInUserPath);

            }

          }

    @@ -1098,7 +1101,8 @@ bool OSDocument::fixWeatherFileInTemp(bool opening) {
  
        if (doCopy) {

          LOG(Debug, "Removing weather file at " << copyDest);

          boost::filesystem::remove_all(copyDest);

          boost::system::error_code ec;

          boost::filesystem::remove_all(copyDest, ec);

          LOG(Debug, "Removing weather file complete");

        }

    @@ -1510,9 +1514,10 @@ bool OSDocument::saveAs() {
  
        // remove old model

        if (!m_savePath.isEmpty()) {

          openstudio::path oldModelPath = toPath(m_modelTempDir) / toPath(m_savePath).filename();

          if (boost::filesystem::exists(oldModelPath)) {

          boost::system::error_code ec;

          if (boost::filesystem::exists(oldModelPath, ec)) {

            LOG(Debug, "Removing " << oldModelPath << " starting");

            boost::filesystem::remove(oldModelPath);

            boost::filesystem::remove(oldModelPath, ec);

            LOG(Debug, "Removing " << oldModelPath << " complete");

          }

        }

    @@ -1631,8 +1636,8 @@ boost::optional<model::Component> OSDocument::getComponent(const OSItemId& itemI
  
            }

    #endif

            //OS_ASSERT(openstudio::filesystem::exists(oscPath));

            //std::error_code ec;

            //OS_ASSERT(openstudio::filesystem::exists(oscPath, ec));

            osversion::VersionTranslator translator;

            //translator.setAllowNewerVersions(false); // DLM: allow to open newer versions?

    @@ -1734,9 +1739,7 @@ void OSDocument::updateWindowFilePath() {
  
      } else {

        // m_mainWindow->setWindowTitle();

        m_mainWindow->setWindowFilePath(m_savePath);

        QFileInfo fi(m_savePath);

        QString fileName = fi.fileName();

        m_mainWindow->setWindowTitle(fileName + "[*]");

        m_mainWindow->setWindowTitle(m_savePath + "[*]");

      }

    }

src/openstudio_lib/OSItem.cpp

-Original file line number
+Diff line change
@@ Expand Up @@
           result = new ModelObjectItem(*modelObject, itemId.isDefaulted(), osItemType);
         } else {
           openstudio::path p = openstudio::toPath(itemId.itemId());
-          if (openstudio::filesystem::exists(p)) {
+          boost::system::error_code ec;
+          if (openstudio::filesystem::exists(p, ec)) {
             result = new ScriptItem(p, osItemType);
           }
         }
@@ Expand Down @@

src/openstudio_lib/ResultsTabView.cpp

-Original file line number
+Diff line change
@@ Expand Up @@
       std::vector<openstudio::path> reports;
       // Check that the directory does exists first
-      if (openstudio::filesystem::is_directory(t_runDir) && openstudio::filesystem::exists(t_runDir)) {
+      boost::system::error_code ec;
+      if (openstudio::filesystem::is_directory(t_runDir, ec) && openstudio::filesystem::exists(t_runDir, ec)) {
         for (openstudio::filesystem::recursive_directory_iterator end, dir(t_runDir); dir != end; ++dir) {
           openstudio::path p = *dir;
           if (openstudio::toString(p.filename()) == "eplusout.sql") {
@@ Expand All @@
       LOG(Debug, "Looking for existing results in: " << openstudio::toString(t_reportsDir));
       // Check that the directory does exists first
-      if (openstudio::filesystem::is_directory(t_reportsDir) && openstudio::filesystem::exists(t_reportsDir)) {
+      if (openstudio::filesystem::is_directory(t_reportsDir, ec) && openstudio::filesystem::exists(t_reportsDir, ec)) {
         for (openstudio::filesystem::directory_iterator end, dir(t_reportsDir); dir != end; ++dir) {
           openstudio::path p = *dir;
           if (openstudio::toString(p.extension()) == ".html" || openstudio::toString(p.extension()) == ".htm") {
@@ Expand Down @@

src/openstudio_lib/ScheduleFileInspectorView.cpp

-Original file line number
+Diff line change
@@ Expand Up @@
       m_columnSeparator->bind<std::string>(
         *m_sch, static_cast<std::string (*)(const std::string&)>(&openstudio::toString),
         // ScheduleFile::columnSeparatorValues does not exist: https://github.com/NREL/OpenStudio/issues/5246
-        []() {
-          return std::vector<std::string>{"Comma", "Tab", "Space", "Semicolon"};
-        },
+        []() { return std::vector<std::string>{"Comma", "Tab", "Space", "Semicolon"}; },
         std::bind(&model::ScheduleFile::columnSeparator, m_sch.get_ptr()),
         [this](const std::string& value) -> bool {
           bool result = m_sch->setColumnSeparator(value);
@@ Expand Down Expand Up / @@ -424,7 +422,8 @@ void ScheduleFileInspectorView::refreshContent() { @@
       openstudio::path fpath = m_sch->externalFile().filePath();
       m_contentLines->clear();
-      if (openstudio::filesystem::is_regular_file(fpath)) {
+      boost::system::error_code ec;
+      if (openstudio::filesystem::is_regular_file(fpath, ec)) {
         const int rowstoSkipatTop = m_sch->rowstoSkipatTop();
         const int colNum = m_sch->columnNumber() - 1;  // Turn 1-indexed to 0-indexed
@@ Expand Down @@

src/openstudio_lib/ScriptItem.cpp

-Original file line number
+Diff line change
@@ Expand Up / @@ -128,9 +128,10 @@ void ScriptItem::saveArgumentsToDb() { @@
     void ScriptItem::deleteDb() {
       m_removed = true;
-      if (openstudio::filesystem::exists(argsDbPath())) {
-        openstudio::filesystem::remove(argsDbPath());
-        openstudio::filesystem::remove(toPath(toString((argsDbPath())) + "-journal"));
+      boost::system::error_code ec;
+      if (openstudio::filesystem::exists(argsDbPath(), ec)) {
+        openstudio::filesystem::remove(argsDbPath(), ec);
+        openstudio::filesystem::remove(toPath(toString((argsDbPath())) + "-journal"), ec);
       }
     }
@@ Expand Down @@

src/shared_gui_components/BCLMeasureDialog.cpp

-Original file line number
+Diff line change
@@ Expand Up @@
       openstudio::path measureDir = umd / toPath(folderName);
       // prompt user ???
-      if (openstudio::filesystem::exists(measureDir)) {
+      boost::system::error_code ec;
+      if (openstudio::filesystem::exists(measureDir, ec)) {
         int i = 1;
-        while (openstudio::filesystem::exists(measureDir)) {
+        while (openstudio::filesystem::exists(measureDir, ec)) {
           folderName = toQString(lowerClassName).append(" ").append(QString::number(i)).append("/");
           measureDir = umd / toPath(folderName);
           ++i;
@@ Expand Down @@

src/shared_gui_components/WorkflowController.cpp

-Original file line number
+Diff line change
@@ Expand Up @@
         // remove the measure
         if (canDeleteMeasure) {
           boost::optional<openstudio::path> measureDir = m_app->currentModel()->workflowJSON().findMeasure(step.measureDirName());
-          if (measureDir && openstudio::filesystem::exists(*measureDir)) {
-            openstudio::filesystem::remove_all(*measureDir);
+          boost::system::error_code ec;
+          if (measureDir && openstudio::filesystem::exists(*measureDir, ec)) {
+            openstudio::filesystem::remove_all(*measureDir, ec);
           }
         }
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge for 1.10.0 Release #830

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!