NatLabRockies · kbenne · Mar 5, 2021 · Mar 5, 2021 · Mar 2, 2021 · Mar 5, 2021
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -560,11 +560,6 @@ endif()
 
 # EnergyPlus
 
-if((DEFINED ENERGYPLUS_EXE) AND NOT (ENERGYPLUS_EXE STREQUAL ""))
-  get_filename_component(OLD_ENERGYPLUS_EXTRACTED_DIR "${ENERGYPLUS_EXE}" DIRECTORY)
-  message("OLD_ENERGYPLUS_EXTRACTED_DIR=${OLD_ENERGYPLUS_EXTRACTED_DIR}")
-endif()
-
 if(UNIX)
   if(APPLE)
     set(ENERGYPLUS_EXPECTED_HASH 0bf64f4b153a87c3a4822321bc5878e1)
@@ -601,10 +596,6 @@ if(UNIX)
            EXPECTED_MD5 ${ENERGYPLUS_EXPECTED_HASH})
     endif()
 
-    # Remove the old extracted dir if exists
-    if(DEFINED OLD_ENERGYPLUS_EXTRACTED_DIR)
-      execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory "${OLD_ENERGYPLUS_EXTRACTED_DIR}")
-    endif()
     execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory "${PROJECT_BINARY_DIR}/${ENERGYPLUS_PATH}")
 
   endif()
@@ -630,16 +621,30 @@ elseif(WIN32)
          SHOW_PROGRESS
          EXPECTED_MD5 ${ENERGYPLUS_EXPECTED_HASH})
 
-    # Remove the old extracted dir if exists
-    if(DEFINED OLD_ENERGYPLUS_EXTRACTED_DIR)
-      execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory "${OLD_ENERGYPLUS_EXTRACTED_DIR}")
-    endif()
     execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory "${PROJECT_BINARY_DIR}/${ENERGYPLUS_PATH}")
 
   endif()
 
 endif()
 
+if((DEFINED ENERGYPLUS_EXE) AND NOT (ENERGYPLUS_EXE STREQUAL ""))
+  get_filename_component(OLD_ENERGYPLUS_EXTRACTED_DIR "${ENERGYPLUS_EXE}" DIRECTORY)
+  if(NOT "${OLD_ENERGYPLUS_EXTRACTED_DIR}" MATCHES ".*${ENERGYPLUS_PATH}.*")
+
+    message(STATUS "Removing old extracted dir = ${OLD_ENERGYPLUS_EXTRACTED_DIR}")
+    # Remove the old extracted dir
+    execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory "${OLD_ENERGYPLUS_EXTRACTED_DIR}")
+
+    # Unset variables so that FindEnergyPlus is called again
+    unset(ENERGYPLUS_FOUND CACHE)
+    unset(ENERGYPLUS_EXE CACHE)
+    unset(ENERGYPLUS_IDD CACHE)
+    unset(ENERGYPLUS_WEATHER_DIR CACHE)
+
+  endif()
+endif()
+
+
 # Allows placing the archive manually in the build dir too
 if (NOT EXISTS "${ENERGYPLUS_PATH}")
   unset(ENERGYPLUS_FOUND CACHE)

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
@@ -88,6 +88,7 @@ set(utilities_resources_src
   utilities/SqlFile/1ZoneEvapCooler-V9-2-0.sql
   utilities/SqlFile/1ZoneEvapCooler-V9-3-0.sql
   utilities/SqlFile/1ZoneEvapCooler-V9-4-0.sql
+  utilities/SqlFile/1ZoneEvapCooler-V9-5-0.sql
   utilities/Zip/test1.zip
 )
 

diff --git a/resources/energyplus/5ZoneAirCooled/in.idf b/resources/energyplus/5ZoneAirCooled/in.idf
@@ -100,7 +100,7 @@
 ! Environmental Emissions:        None
 ! Utility Tariffs:                None
 
-  Version,9.4;
+  Version,9.5;
 
   Building,
     Building,                !- Name

diff --git a/resources/energyplus/BestestEx/in.idf b/resources/energyplus/BestestEx/in.idf
@@ -5,7 +5,7 @@
 !BESTEST-EX Case L200EX-PH BASE-CASE, developed by NREL
 !Use EnergyPlus IDFEditor to view inputs in IP units
 
-  Version,9.4;
+  Version,9.5;
 
   SimulationControl,
     No,                      !- Do Zone Sizing Calculation

diff --git a/resources/energyplus/Daylighting_Office/in.idf b/resources/energyplus/Daylighting_Office/in.idf
@@ -140,7 +140,7 @@
 ! schedule types, always on schedule, misc
 ! ***GENERAL SIMULATION PARAMETERS***
 
-  Version,9.4;
+  Version,9.5;
 
   SimulationControl,
     YES,                     !- Do Zone Sizing Calculation

diff --git a/resources/energyplus/Daylighting_School/in.idf b/resources/energyplus/Daylighting_School/in.idf
@@ -33,7 +33,7 @@
 ! WeatherFileName=USA_CO_Boulder_TMY2.epw
 ! End SimMetaData
 
-  Version,9.4;
+  Version,9.5;
 
   Timestep,6;
 

diff --git a/resources/energyplus/HospitalBaseline/in.idf b/resources/energyplus/HospitalBaseline/in.idf
@@ -100,7 +100,7 @@
 ! End SimMetaData
 ! Number of Zones: 130
 
-  Version,9.4;
+  Version,9.5;
 
   Timestep,6;
 

diff --git a/resources/energyplus/NewFileTemplate.idf b/resources/energyplus/NewFileTemplate.idf
@@ -1,6 +1,6 @@
 !-   ===========  ALL OBJECTS IN CLASS: VERSION ===========
 
-  Version,9.4;
+  Version,9.5;
 
 !-   ===========  ALL OBJECTS IN CLASS: BUILDING ===========
 

diff --git a/resources/energyplus/Office_With_Many_HVAC_Types/in.idf b/resources/energyplus/Office_With_Many_HVAC_Types/in.idf
@@ -1,4 +1,4 @@
-  Version,9.4;
+  Version,9.5;
 
   Building,
     Building 1,              !- Name

diff --git a/resources/energyplus/RefLargeOffice/RefBldgLargeOfficeNew2004_Chicago.idf b/resources/energyplus/RefLargeOffice/RefBldgLargeOfficeNew2004_Chicago.idf
@@ -68,7 +68,7 @@
 ! ***GENERAL SIMULATION PARAMETERS***
 ! Number of Zones: 19
 
-  Version,9.4;
+  Version,9.5;
 
   SimulationControl,
     YES,                     !- Do Zone Sizing Calculation

diff --git a/resources/energyplus/ScheduleFile/in.idf b/resources/energyplus/ScheduleFile/in.idf
@@ -1,4 +1,4 @@
-  Version,9.4;
+  Version,9.5;
 
   Timestep,4;
 

diff --git a/resources/energyplus/SimpleSurfaces/4ZoneWithShading_Simple_2.idf b/resources/energyplus/SimpleSurfaces/4ZoneWithShading_Simple_2.idf
@@ -81,7 +81,7 @@
 ! Environmental Emissions:        None
 ! Utility Tariffs:                None
 
-  Version,9.4;
+  Version,9.5;
 
   Timestep,4;
 

diff --git a/resources/energyplus/SimpleSurfaces/SimpleSurfaces_Reference.idf b/resources/energyplus/SimpleSurfaces/SimpleSurfaces_Reference.idf
@@ -1,7 +1,7 @@
 ! Basecase reference for SimpleSurfaces_Test
 !-   ===========  ALL OBJECTS IN CLASS: VERSION ===========
 
-  Version,9.4;
+  Version,9.5;
 
 !-   ===========  ALL OBJECTS IN CLASS: BUILDING ===========
 

diff --git a/resources/energyplus/SimpleSurfaces/SimpleSurfaces_Relative.idf b/resources/energyplus/SimpleSurfaces/SimpleSurfaces_Relative.idf
@@ -1,7 +1,7 @@
 ! File to test the import of simple surfaces
 !-   ===========  ALL OBJECTS IN CLASS: VERSION ===========
 
-  Version,9.4;
+  Version,9.5;
 
 !-   ===========  ALL OBJECTS IN CLASS: BUILDING ===========
 

diff --git a/resources/energyplus/SmallOffice/SmallOffice.idf b/resources/energyplus/SmallOffice/SmallOffice.idf
@@ -67,7 +67,7 @@
 ! ExtWallConstruction=Mass
 ! End SimMetaData
 
-  Version,9.4;
+  Version,9.5;
 
   Timestep,6;
 
@@ -5814,7 +5814,7 @@
 
   UtilityCost:Tariff,
     IN_EIAMonthlyRateGas,    !- Name
-    NaturalGas:Facility,            !- Output Meter Name
+    NaturalGas:Facility,     !- Output Meter Name
     MCF,                     !- Conversion Factor Choice
     ,                        !- Energy Conversion Factor
     ,                        !- Demand Conversion Factor

diff --git a/resources/energyplus/ZoneBoundaryCondition/Bug_486_zone_bdr_test.idf b/resources/energyplus/ZoneBoundaryCondition/Bug_486_zone_bdr_test.idf
@@ -1,6 +1,6 @@
 !-   ===========  ALL OBJECTS IN CLASS: VERSION ===========
 
-  Version,9.4;
+  Version,9.5;
 
 !-   ===========  ALL OBJECTS IN CLASS: BUILDING ===========
 

diff --git a/resources/utilities/Idf/CommentTest.idf b/resources/utilities/Idf/CommentTest.idf
@@ -2,7 +2,7 @@
 ! Written by Elaine T. Hale, 15 September 2010
 ! Version object should keep up with EnergyPlus version number.
 
-  Version,9.4;
+  Version,9.5;
 
 ! Timestep should be > 1.
 

diff --git a/resources/utilities/Idf/DosLineEndingTest.idf b/resources/utilities/Idf/DosLineEndingTest.idf
@@ -2,7 +2,7 @@
 ! Written by Elaine T. Hale, 15 September 2010
 ! Version object should keep up with EnergyPlus version number.
 
-  Version,9.4;
+  Version,9.5;
 
 ! Timestep should be > 1.
 

diff --git a/resources/utilities/Idf/FormatPropertyTest_Formatted.idf b/resources/utilities/Idf/FormatPropertyTest_Formatted.idf
@@ -5,7 +5,7 @@
 !-   ===========  ALL OBJECTS IN CLASS: VERSION ===========
 ! \format singleLine
 
-  Version,9.4;
+  Version,9.5;
 
 !-   ===========  ALL OBJECTS IN CLASS: HEATBALANCEALGORITHM ===========
 ! \format singleLine

diff --git a/resources/utilities/Idf/FormatPropertyTest_Unformatted.idf b/resources/utilities/Idf/FormatPropertyTest_Unformatted.idf
@@ -5,7 +5,7 @@
 !-   ===========  ALL OBJECTS IN CLASS: VERSION ===========
 ! \format singleLine
 
-  Version,9.4;
+  Version,9.5;
 
 !-   ===========  ALL OBJECTS IN CLASS: HEATBALANCEALGORITHM ===========
 ! \format singleLine

diff --git a/resources/utilities/Idf/MixedLineEndingTest.idf b/resources/utilities/Idf/MixedLineEndingTest.idf
@@ -2,7 +2,7 @@
 ! Written by Elaine T. Hale, 15 September 2010
 ! Version object should keep up with EnergyPlus version number.
 
-  Version,9.4;
+  Version,9.5;
 
 ! Timestep should be > 1.
 

diff --git a/resources/utilities/Idf/UnixLineEndingTest.idf b/resources/utilities/Idf/UnixLineEndingTest.idf
@@ -2,7 +2,7 @@
 ! Written by Elaine T. Hale, 15 September 2010
 ! Version object should keep up with EnergyPlus version number.
 
-  Version,9.4;
+  Version,9.5;
 
 ! Timestep should be > 1.