From d0b1b7d0310cfa6ebda2149a4b00efe757037d52 Mon Sep 17 00:00:00 2001 From: Edwin Lee Date: Mon, 28 Mar 2022 11:28:33 -0500 Subject: [PATCH 1/4] Check the epin parent directory to get eplaunch working --- src/EnergyPlus/PluginManager.cc | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/EnergyPlus/PluginManager.cc b/src/EnergyPlus/PluginManager.cc index a2a24a00beb..f4e4d24c85d 100644 --- a/src/EnergyPlus/PluginManager.cc +++ b/src/EnergyPlus/PluginManager.cc @@ -516,8 +516,9 @@ PluginManager::PluginManager(EnergyPlusData &state) : eplusRunningViaPythonAPI(s state, "PluginManager: Search path inputs requested adding epin variable to Python path, but epin variable was empty, skipping."); } else { - if (FileSystem::pathExists(epinPathObject)) { - fs::path sanitizedEnvInputDir = PluginManager::sanitizedPath(epinPathObject); + auto epinRootDir = FileSystem::getParentDirectoryPath(fs::path(epinPathObject)); + if (FileSystem::pathExists(epinRootDir)) { + fs::path sanitizedEnvInputDir = PluginManager::sanitizedPath(epinRootDir); PluginManager::addToPythonPath(state, sanitizedEnvInputDir, true); } else { EnergyPlus::ShowWarningMessage(state, @@ -541,6 +542,21 @@ PluginManager::PluginManager(EnergyPlusData &state) : eplusRunningViaPythonAPI(s // nothing to do here } } + } else { + // if no search path objects exist, we still need to do the default searching + PluginManager::addToPythonPath(state, ".", false); + fs::path sanitizedInputFileDir = PluginManager::sanitizedPath(state.dataStrGlobals->inputDirPath); + PluginManager::addToPythonPath(state, sanitizedInputFileDir, false); + std::string epin_path; + get_environment_variable("epin", epin_path); + fs::path epinPathObject = fs::path(epin_path); + if (!epinPathObject.empty()) { + auto epinRootDir = FileSystem::getParentDirectoryPath(fs::path(epinPathObject)); + if (FileSystem::pathExists(epinRootDir)) { + fs::path sanitizedEnvInputDir = PluginManager::sanitizedPath(epinRootDir); + PluginManager::addToPythonPath(state, sanitizedEnvInputDir, true); + } + } } // Now read all the actual plugins and interpret them From 31784d6528ef5b38a0df15f6becff695f1c8a4be Mon Sep 17 00:00:00 2001 From: Edwin Lee Date: Mon, 28 Mar 2022 12:47:18 -0500 Subject: [PATCH 2/4] Editorial readme tweaks [actions skip] --- release/readme.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/release/readme.html b/release/readme.html index 1a6247170d5..af9636d80a0 100644 --- a/release/readme.html +++ b/release/readme.html @@ -200,8 +200,8 @@

Multiple Version Conversions

energyplushelp.freshdesk.com) to request multiple - conversion set of programs. + Helpdesk to request + multiple conversion set of programs.

Documentation

@@ -230,7 +230,7 @@

Weather Data

EnergyPlus uses these files directly for annual simulations. The Weather Converter program that is part of EnergyPlus can read these weather files and provide .csv (comma separated variable) as well as statistics reports - about the included (or other) files. Weather data for more than 2100 locations in more than 100 countries can be + about the included (or other) files. Weather data for more than 3000 locations in more than 100 countries can be downloaded on the EnergyPlus Weather Page.

Highlights of this release (V22.1.0)

@@ -386,13 +386,13 @@

Platforms

Packages changed slightly as of the 9.4 release. We began building our packages on a new system which adds better support for newer platforms. During the change, we stepped away from some older OS versions. For example, we are - not testing on Windows 7 or 8, only 10. However, both our 32-bit and 64-bit packages now include the new + not testing on Windows 7 or 8, only 10 and 11. However, both our 32-bit and 64-bit packages now include the new Python plugin system, rather than just the 64-bit as previously. We have also added packaging and testing with Ubuntu 20.04 in addition to Ubuntu 18.04. On Mac, we are officially releasing an installer for OSX 10.15 and moving toward OSX 11 as well.