Fix #4692 - Modify Model::load to use the VersionTranslator

NREL · Jul 4, 2023 · e26f172 · e26f172
1 parent cf7aa0e
commit e26f172
Showing 1 changed file with 19 additions and 17 deletions.
diff --git a/src/model/Model.cpp b/src/model/Model.cpp
@@ -21,8 +21,11 @@
 #include <utilities/idd/IddEnums.hxx>
 #include <utilities/idd/OS_Version_FieldEnums.hxx>
 
+#include "../osversion/VersionTranslator.hpp"
+
 #include "../utilities/core/Assert.hpp"
 #include "../utilities/core/ContainersMove.hpp"
+#include "../utilities/core/Filesystem.hpp"
 #include "../utilities/core/PathHelpers.hpp"
 
 #include "../utilities/idd/IddEnums.hpp"
@@ -1840,27 +1843,26 @@ namespace model {
   }
 
   boost::optional<Model> Model::load(const path& osmPath) {
-    OptionalModel result;
-    OptionalIdfFile oIdfFile = IdfFile::load(osmPath, IddFileType::OpenStudio);
-    if (oIdfFile) {
-      try {
-        result = Model(*oIdfFile);
-      } catch (...) {
-      }
-    }
 
-    if (result) {
-      // Load the workflow.osw in the model's companion folder
-      path workflowJSONPath = getCompanionFolder(osmPath) / toPath("workflow.osw");
-      if (exists(workflowJSONPath)) {
-        boost::optional<WorkflowJSON> workflowJSON = WorkflowJSON::load(workflowJSONPath);
-        if (workflowJSON) {
-          result->setWorkflowJSON(*workflowJSON);
-        }
+    if (!openstudio::filesystem::is_regular_file(osmPath)) {
+      LOG(Warn, "Path is not a valid file: " << osmPath);
+      return boost::none;
+    }
+    openstudio::osversion::VersionTranslator vt;
+    boost::optional<openstudio::model::Model> model_ = vt.loadModel(osmPath);
+    if (!model_) {
+      LOG(Warn, "Failed to load model at " << osmPath);
+      return boost::none;
+    }
+    // Load the workflow.osw in the model's companion folder
+    const openstudio::path workflowJSONPath = getCompanionFolder(osmPath) / toPath("workflow.osw");
+    if (exists(workflowJSONPath)) {
+      if (boost::optional<WorkflowJSON> workflowJSON_ = WorkflowJSON::load(workflowJSONPath)) {
+        model_->setWorkflowJSON(*workflowJSON_);
       }
     }
 
-    return result;
+    return model_;
   }
 
   boost::optional<Model> Model::load(const path& osmPath, const path& workflowJSONPath) {