Updates for externalfile and new ft tests.

NREL · Oct 26, 2023 · 4cc1a59 · 4cc1a59
1 parent 3001627
commit 4cc1a59
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/energyplus/Test/ScheduleInterval_GTest.cpp b/src/energyplus/Test/ScheduleInterval_GTest.cpp
@@ -1886,6 +1886,7 @@ TEST_F(EnergyPlusFixture, ScheduleFileRelativePath) {
 
     boost::optional<std::string> fileName = objects[0].getString(2);  // File Name
     ASSERT_TRUE(fileName);
+    EXPECT_FALSE(toPath(fileName.get()).is_relative());  // abs path
     EXPECT_EQ(externalfile.filePath(), fileName.get());  // abs path
   }
 
@@ -1918,6 +1919,7 @@ TEST_F(EnergyPlusFixture, ScheduleFileRelativePath) {
 
     boost::optional<std::string> fileName = objects[0].getString(2);  // File Name
     ASSERT_TRUE(fileName);
+    EXPECT_FALSE(toPath(fileName.get()).is_relative());  // abs path
     EXPECT_EQ(externalfile.filePath(), fileName.get());  // abs path
   }
 
@@ -1948,6 +1950,7 @@ TEST_F(EnergyPlusFixture, ScheduleFileRelativePath) {
 
     boost::optional<std::string> fileName = objects[0].getString(2);  // File Name
     ASSERT_TRUE(fileName);
+    EXPECT_FALSE(toPath(fileName.get()).is_relative());  // abs path
     EXPECT_EQ(externalfile.filePath(), fileName.get());  // abs path
   }
 
@@ -1978,6 +1981,7 @@ TEST_F(EnergyPlusFixture, ScheduleFileRelativePath) {
 
     boost::optional<std::string> fileName = objects[0].getString(2);  // File Name
     ASSERT_TRUE(fileName);
+    EXPECT_TRUE(toPath(fileName.get()).is_relative());   // rel path
     EXPECT_EQ(externalfile.filePath(), fileName.get());  // rel path
   }
 }
diff --git a/src/model/ExternalFile.cpp b/src/model/ExternalFile.cpp
@@ -112,7 +112,7 @@ namespace model {
     path ExternalFile_Impl::filePath() const {
       path result;
       path fname = toPath(fileName());
-      if (openstudio::filesystem::is_regular_file(fname)) {
+      if (openstudio::filesystem::is_regular_file(fname) || fname.is_relative()) {
         return fname;
       }
       std::vector<path> absoluteFilePaths = this->model().workflowJSON().absoluteFilePaths();
@@ -220,17 +220,15 @@ namespace model {
 
     // we expect all strings to be UTF-8 encoded
     path p = toPath(filename);
-    if (copyFile || !p.is_relative()) {
-      if (!exists(p)) {
-        boost::optional<path> op = workflow.findFile(filename);
-        if (!op) {
-          this->remove();
-          LOG_AND_THROW("Cannot find file \"" << filename << "\" for " << this->briefDescription());
-        }
-        p = op.get();
+    if (!exists(p)) {
+      boost::optional<path> op = workflow.findFile(filename);
+      if (!op) {
+        this->remove();
+        LOG_AND_THROW("Cannot find file \"" << filename << "\" for " << this->briefDescription());
       }
-      OS_ASSERT(exists(p));
+      p = op.get();
     }
+    OS_ASSERT(exists(p));
 
     bool ok;
     if (copyFile) {