Fix when Compiling with non-standard CMake Configurations

.github/workflows/mac_build.yml

@@ -0,0 +1,172 @@
+name: Mac Build
+
+on: [push]
+
+jobs:
+  python_no_psychcach:
+    runs-on: macos-10.15
+
+    steps:
+    - uses: actions/checkout@v2
+#
+    - name: Set up Python 3.7
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.7
+
+    - name: Create Build Directory
+      run: cmake -E make_directory ${{runner.workspace}}/EnergyPlus/build
+
+    - name: Configure CMake
+      shell: bash
+      working-directory: ${{runner.workspace}}/EnergyPlus/build
+      run: cmake -DCMAKE_BUILD_TYPE=Release -DLINK_WITH_PYTHON=ON -DUSE_PSYCHROMETRICS_CACHING=OFF ..
+
+    - name: Build EnergyPlus
+      working-directory: ${{runner.workspace}}/EnergyPlus/build
+      shell: bash
+      run: cmake --build . --target energyplus -j 2
+
+  no_python_psychcach:
+    runs-on: macos-10.15
+
+    steps:
+      - uses: actions/checkout@v2
+      #
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+
+      - name: Create Build Directory
+        run: cmake -E make_directory ${{runner.workspace}}/EnergyPlus/build
+
+      - name: Configure CMake
+        shell: bash
+        working-directory: ${{runner.workspace}}/EnergyPlus/build
+        run: cmake -DCMAKE_BUILD_TYPE=Release -DLINK_WITH_PYTHON=OFF -DUSE_PSYCHROMETRICS_CACHING=ON ..
+
+      - name: Build EnergyPlus
+        working-directory: ${{runner.workspace}}/EnergyPlus/build
+        shell: bash
+        run: cmake --build . --target energyplus -j 2
+
+  no_python_no_psychcach:
+    runs-on: macos-10.15
+
+    steps:
+      - uses: actions/checkout@v2
+      #
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+
+      - name: Create Build Directory
+        run: cmake -E make_directory ${{runner.workspace}}/EnergyPlus/build
+
+      - name: Configure CMake
+        shell: bash
+        working-directory: ${{runner.workspace}}/EnergyPlus/build
+        run: cmake -DCMAKE_BUILD_TYPE=Release -DLINK_WITH_PYTHON=OFF -DUSE_PSYCHROMETRICS_CACHING=OFF ..
+
+      - name: Build EnergyPlus
+        working-directory: ${{runner.workspace}}/EnergyPlus/build
+        shell: bash
+        run: cmake --build . --target energyplus -j 2
+
+  no_glcol_cache:
+    runs-on: macos-10.15
+
+    steps:
+      - uses: actions/checkout@v2
+      #
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+
+      - name: Create Build Directory
+        run: cmake -E make_directory ${{runner.workspace}}/EnergyPlus/build
+
+      - name: Configure CMake
+        shell: bash
+        working-directory: ${{runner.workspace}}/EnergyPlus/build
+        run: cmake -DCMAKE_BUILD_TYPE=Release -DUSE_GLYCOL_CACHING=OFF ..
+
+      - name: Build EnergyPlus
+        working-directory: ${{runner.workspace}}/EnergyPlus/build
+        shell: bash
+        run: cmake --build . --target energyplus -j 2
+
+  no_opengl:
+    runs-on: macos-10.15
+
+    steps:
+      - uses: actions/checkout@v2
+      #
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+
+      - name: Create Build Directory
+        run: cmake -E make_directory ${{runner.workspace}}/EnergyPlus/build
+
+      - name: Configure CMake
+        shell: bash
+        working-directory: ${{runner.workspace}}/EnergyPlus/build
+        run: cmake -DCMAKE_BUILD_TYPE=Release -OPENGL_REQUIRED=OFF ..
+
+      - name: Build EnergyPlus
+        working-directory: ${{runner.workspace}}/EnergyPlus/build
+        shell: bash
+        run: cmake --build . --target energyplus -j 2
+
+  use_psych_stats:
+    runs-on: macos-10.15
+
+    steps:
+      - uses: actions/checkout@v2
+      #
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+
+      - name: Create Build Directory
+        run: cmake -E make_directory ${{runner.workspace}}/EnergyPlus/build
+
+      - name: Configure CMake
+        shell: bash
+        working-directory: ${{runner.workspace}}/EnergyPlus/build
+        run: cmake -DCMAKE_BUILD_TYPE=Release -USE_PSYCH_STATS=ON ..
+
+      - name: Build EnergyPlus
+        working-directory: ${{runner.workspace}}/EnergyPlus/build
+        shell: bash
+        run: cmake --build . --target energyplus -j 2
+
+  no_use_psych_errors:
+    runs-on: macos-10.15
+
+    steps:
+      - uses: actions/checkout@v2
+      #
+      - name: Set up Python 3.7
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.7
+
+      - name: Create Build Directory
+        run: cmake -E make_directory ${{runner.workspace}}/EnergyPlus/build
+
+      - name: Configure CMake
+        shell: bash
+        working-directory: ${{runner.workspace}}/EnergyPlus/build
+        run: cmake -DCMAKE_BUILD_TYPE=Release -USE_PSYCH_ERRORS=OFF ..
+
+      - name: Build EnergyPlus
+        working-directory: ${{runner.workspace}}/EnergyPlus/build
+        shell: bash
+        run: cmake --build . --target energyplus -j 2

CMakeLists.txt

@@ -42,6 +42,10 @@ endif()
 option( BUILD_PACKAGE "Build package" OFF )
 option( BUILD_TESTING "Build testing targets" OFF )
 option( BUILD_FORTRAN "Build Fortran stuff" OFF )
+option( USE_PSYCHROMETRICS_CACHING "Use psychrometrics cashing routines" ON )
+option( USE_GLYCOL_CACHING "Use glycol cashing routines" ON )
+option( USE_PSYCH_STATS "Compute psychrometric stats" OFF )
+option( USE_PSYCH_ERRORS "Report psychrometric errors " ON )
 
 #######################################################################
 
@@ -392,3 +396,7 @@ mark_as_advanced(BUILD_GMOCK)
 mark_as_advanced(BUILD_GTEST)
 mark_as_advanced(gmock_build_tests)
 mark_as_advanced(BUILD_WCE_TESTING)
+mark_as_advanced(USE_PSYCHROMETRICS_CACHING)
+mark_as_advanced(USE_GLYCOL_CACHING)
+mark_as_advanced(USE_PSYCH_STATS)
+mark_as_advanced(USE_PSYCH_ERRORS)

src/EnergyPlus/CMakeLists.txt

@@ -15,6 +15,24 @@ else()
   add_definitions("-DLINK_WITH_PYTHON=0")
 endif()
 
+if(USE_PSYCHROMETRICS_CACHING)
+  # Caching defaulted ON
+else()
+  add_definitions("-DEP_nocache_Psychrometrics")
+endif()
+
+if(USE_GLYCOL_CACHING)
+  add_definitions("-DEP_cache_GlycolSpecificHeat")
+endif()
+
+if(USE_PSYCH_STATS)
+  add_definitions("-DEP_psych_stats")
+endif()
+
+if(USE_PSYCH_ERRORS)
+  add_definitions("-DEP_psych_errors")
+endif()
+
 SET( SRC
   "${PROJECT_SOURCE_DIR}/third_party/milo/dtoa.h"
   "${PROJECT_SOURCE_DIR}/third_party/milo/itoa.h"

src/EnergyPlus/FluidProperties.cc

@@ -62,8 +62,6 @@
 #include <EnergyPlus/TempSolveRoot.hh>
 #include <EnergyPlus/UtilityRoutines.hh>
 
-#define EP_cache_GlycolSpecificHeat
-
 namespace EnergyPlus {
 
 namespace FluidProperties {

src/EnergyPlus/FluidProperties.hh

@@ -60,9 +60,6 @@
 #include <EnergyPlus/DataGlobals.hh>
 #include <EnergyPlus/EnergyPlus.hh>
 
-#define EP_cache_GlycolSpecificHeat
-
-
 namespace EnergyPlus {
 
 // Forward declarations
@@ -551,7 +548,8 @@ namespace FluidProperties {
         return cTsh.sh; // saturation pressure {Pascals}
     }
 #else
-    Real64 GetSpecificHeatGlycol(std::string const &Glycol,    // carries in substance name
+    Real64 GetSpecificHeatGlycol(EnergyPlusData &state,
+                                 std::string const &Glycol,    // carries in substance name
                                  Real64 const Temperature,     // actual temperature given as input
                                  int &GlycolIndex,             // Index to Glycol Properties
                                  std::string const &CalledFrom // routine this function was called from (error messages)

src/EnergyPlus/PluginManager.cc

@@ -132,7 +132,7 @@ namespace PluginManagement {
         return "Linked to Python Version: \"" + sVersion + "\"";
     }
 #else
-    std::string pythonStringForUsage(EnergyPlusData &state)
+    std::string pythonStringForUsage([[maybe_unused]] EnergyPlusData &state)
     {
         return "This version of EnergyPlus not linked to Python library.";
     }
@@ -1093,7 +1093,7 @@ namespace PluginManagement {
         }
     }
 #else
-    void PluginManager::addToPythonPath([[maybe_unused]] EnergyPlusData &state, const std::string &EP_UNUSED(path), bool EP_UNUSED(userDefinedPath))
+    void PluginManager::addToPythonPath([[maybe_unused]] EnergyPlusData &state, [[maybe_unused]] const std::string &path, [[maybe_unused]] bool userDefinedPath)
     {
     }
 #endif
@@ -1135,8 +1135,8 @@ namespace PluginManagement {
     }
 #else
     int PluginManager::getGlobalVariableHandle([[maybe_unused]] EnergyPlusData &state,
-                                               const std::string &EP_UNUSED(name),
-                                               bool const EP_UNUSED(suppress_warning))
+                                               [[maybe_unused]] const std::string &name,
+                                               [[maybe_unused]] bool const suppress_warning)
     {
         return -1;
     }
@@ -1306,7 +1306,7 @@ namespace PluginManagement {
         return 0.0;
     }
 #else
-    Real64 PluginManager::getGlobalVariableValue([[maybe_unused]] EnergyPlusData &state, int EP_UNUSED(handle))
+    Real64 PluginManager::getGlobalVariableValue([[maybe_unused]] EnergyPlusData &state, [[maybe_unused]] int handle)
     {
         return 0.0;
     }
@@ -1328,7 +1328,7 @@ namespace PluginManagement {
         }
     }
 #else
-    void PluginManager::setGlobalVariableValue([[maybe_unused]] EnergyPlusData &state, int EP_UNUSED(handle), Real64 EP_UNUSED(value))
+    void PluginManager::setGlobalVariableValue([[maybe_unused]] EnergyPlusData &state, [[maybe_unused]] int handle, [[maybe_unused]] Real64 value)
     {
     }
 #endif