Merge pull request #4589 from NREL/space-ft-default

Switch to E+ Space FT by default
NREL · May 19, 2022 · 6b968d5 · 6b968d5
2 parents 93c5e61 + b91d908
commit 6b968d5
Show file tree

Hide file tree

Showing 8 changed files with 36,569 additions and 115 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,7 @@ if(CCACHE_PROGRAM)
 endif()
 
 # Project macro can only take digits in the version, it splits these out to specific variables
-project(OpenStudio VERSION 3.4.0)
+project(OpenStudio VERSION 3.4.1)
 
 # The RT Manifest file and C# SDK only support the digit portion of patch
 string(APPEND PROJECT_VERSION_PATCH_DIGIT ${PROJECT_VERSION_PATCH})

diff --git a/developer/doc/ReleaseNotes/ReleaseNotes.md b/developer/doc/ReleaseNotes/ReleaseNotes.md
diff --git a/resources/model/OpenStudio.idd b/resources/model/OpenStudio.idd
@@ -1,4 +1,4 @@
-!IDD_Version 3.4.0
+!IDD_Version 3.4.1
 ! *****************************************************************************
 ! This file is the Input Data Dictionary (IDD) for OpenStudio Model.
 !
@@ -40,7 +40,7 @@ OS:Version,
        \required-field
   A2, \field Version Identifier
        \type alpha
-       \default 3.3.1
+       \default 3.4.1
   A3; \field Prerelease Identifier
        \type alpha
 

diff --git a/src/energyplus/ForwardTranslator.cpp b/src/energyplus/ForwardTranslator.cpp
@@ -120,7 +120,7 @@ namespace energyplus {
     m_excludeSQliteOutputReport = false;
     m_excludeHTMLOutputReport = false;
     m_excludeVariableDictionary = false;
-    m_excludeSpaceTranslation = true;
+    m_excludeSpaceTranslation = false;  // At 3.4.1, this was changed to false.
   }
 
   Workspace ForwardTranslator::translateModel(const Model& model, ProgressBar* progressBar) {

diff --git a/src/energyplus/Test/SpaceInfiltrationDesignFlowRate_GTest.cpp b/src/energyplus/Test/SpaceInfiltrationDesignFlowRate_GTest.cpp
@@ -242,7 +242,7 @@ TEST_F(EnergyPlusFixture, ForwardTranslator_SpaceInfiltrationDesignFlowRate_Spac
       }
     }
 
-    EXPECT_EQ(0.687, totalInfiltration);
+    EXPECT_DOUBLE_EQ(0.687, totalInfiltration);
   }
 
   // When including Space translation (new E+ 9.6.0)

diff --git a/src/osversion/VersionTranslator.cpp b/src/osversion/VersionTranslator.cpp
@@ -146,7 +146,7 @@ namespace osversion {
     m_updateMethods[VersionString("3.2.1")] = &VersionTranslator::update_3_2_0_to_3_2_1;
     m_updateMethods[VersionString("3.3.0")] = &VersionTranslator::update_3_2_1_to_3_3_0;
     m_updateMethods[VersionString("3.4.0")] = &VersionTranslator::update_3_3_0_to_3_4_0;
-    //m_updateMethods[VersionString("3.3.0")] = &VersionTranslator::defaultUpdate;
+    m_updateMethods[VersionString("3.4.1")] = &VersionTranslator::defaultUpdate;
 
     // List of previous versions that may be updated to this one.
     //   - To increment the translator, add an entry for the version just released (branched for
@@ -303,7 +303,8 @@ namespace osversion {
     m_startVersions.push_back(VersionString("3.2.0"));
     m_startVersions.push_back(VersionString("3.2.1"));
     m_startVersions.push_back(VersionString("3.3.0"));
-    //m_startVersions.push_back(VersionString("3.4.0"));
+    m_startVersions.push_back(VersionString("3.4.0"));
+    //m_startVersions.push_back(VersionString("3.4.1"));
   }
 
   boost::optional<model::Model> VersionTranslator::loadModel(const openstudio::path& pathToOldOsm, ProgressBar* progressBar) {
@@ -6910,5 +6911,9 @@ namespace osversion {
 
   }  // end update_3_3_0_to_3_4_0
 
+  /*   std::string VersionTranslator::update_3_4_0_to_3_4_1(const IdfFile& idf_3_4_0, const IddFileAndFactoryWrapper& idd_3_4_1) {
+
+  }  // end update_3_4_0_to_3_4_1 */
+
 }  // namespace osversion
 }  // namespace openstudio
diff --git a/src/osversion/VersionTranslator.hpp b/src/osversion/VersionTranslator.hpp
@@ -251,6 +251,7 @@ namespace osversion {
     std::string update_3_2_0_to_3_2_1(const IdfFile& idf_3_2_0, const IddFileAndFactoryWrapper& idd_3_2_1);
     std::string update_3_2_1_to_3_3_0(const IdfFile& idf_3_2_1, const IddFileAndFactoryWrapper& idd_3_3_0);
     std::string update_3_3_0_to_3_4_0(const IdfFile& idf_3_3_0, const IddFileAndFactoryWrapper& idd_3_4_0);
+    //std::string update_3_4_0_to_3_4_1(const IdfFile& idf_3_4_0, const IddFileAndFactoryWrapper& idd_3_4_1);
 
     IdfObject updateUrlField_0_7_1_to_0_7_2(const IdfObject& object, unsigned index);