Merge develop; resolve known conflicts

.decent_ci-Linux.yaml

@@ -1,39 +1,13 @@
 compilers:
   - name: "gcc"
     version: "7.5"
-    build_package_generator:
-     - "STGZ"
-     - "TGZ"
-     - "IFW"
-    release_build_cmake_extra_flags: -DENABLE_REGRESSION_TESTING:BOOL=ON -DBUILD_DOCS:BOOL=ON
-    cmake_extra_flags: -DLINK_WITH_PYTHON=ON -DDOCUMENTATION_BUILD="BuildWithAll" -DTEX_INTERACTION="nonstopmode" -DBUILD_FORTRAN=ON -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DENABLE_REGRESSION_TESTING:BOOL=ON -DREGRESSION_BASELINE_PATH:PATH=$REGRESSION_BASELINE -DREGRESSION_SCRIPT_PATH:PATH=$REGRESSION_DIR -DREGRESSION_BASELINE_SHA:STRING=$REGRESSION_BASELINE_SHA -DCOMMIT_SHA=$COMMIT_SHA -DENABLE_GTEST_DEBUG_MODE:BOOL=OFF -DBUILD_PERFORMANCE_TESTS:BOOL=ON -DVALGRIND_ANALYZE_PERFORMANCE_TESTS:BOOL=ON
+    cmake_extra_flags: -DLINK_WITH_PYTHON=ON -DBUILD_FORTRAN=ON -DBUILD_TESTING:BOOL=ON -DENABLE_REGRESSION_TESTING:BOOL=ON -DREGRESSION_BASELINE_PATH:PATH=$REGRESSION_BASELINE -DREGRESSION_SCRIPT_PATH:PATH=$REGRESSION_DIR -DREGRESSION_BASELINE_SHA:STRING=$REGRESSION_BASELINE_SHA -DCOMMIT_SHA=$COMMIT_SHA -DENABLE_GTEST_DEBUG_MODE:BOOL=OFF -DBUILD_PERFORMANCE_TESTS:BOOL=ON -DVALGRIND_ANALYZE_PERFORMANCE_TESTS:BOOL=ON
     collect_performance_results: true
-    s3_upload: doc/pdf
     s3_upload_bucket: energyplus
 
-  - name: cppcheck
-    compiler_extra_flags: --suppress="*:*third_party*" --suppress="*:*tst/EnergyPlus*" --suppress="uninitvar:*"  # need to rip these last two band-aids soon
-
-  - name: custom_check
-    commands:
-      - ./scripts/dev/license-check.py
-      - ./scripts/dev/verify_formatting.sh
-      - ./scripts/dev/check_stray_fields_in_idd.py
-      - ./scripts/dev/verify_idfs_in_cmake.py
-      - ./scripts/dev/check_non_utf8.py
-      - ./scripts/dev/check_pr_labels.py
-      - ./scripts/dev/verify_file_encodings.py
-      - ./scripts/dev/validate_idd_units.py
-      - ./scripts/dev/find_byref_bool_override.py
-      - ./scripts/dev/check_for_tabs_in_idfs.py
-      - ./scripts/dev/check_for_bom_in_idfs.py
-      - ./scripts/dev/verify_cmake_dirs.py
-      - ./scripts/dev/find_included_cc_files.py
-
   - name: "gcc"
     version: "7.5"
     build_type: Debug
-    build_package_generator: "STGZ"
     cmake_extra_flags: -DLINK_WITH_PYTHON=ON -DBUILD_FORTRAN=ON -DBUILD_TESTING:BOOL=ON -DENABLE_REGRESSION_TESTING:BOOL=OFF -DCOMMIT_SHA=$COMMIT_SHA -DENABLE_COVERAGE:BOOL=ON -DENABLE_GTEST_DEBUG_MODE:BOOL=OFF
     coverage_enabled: true
     coverage_base_dir: src/EnergyPlus
@@ -48,7 +22,6 @@ compilers:
   - name: "gcc"
     version: "7.5"
     build_type: Debug
-    build_package_generator: "STGZ"
     cmake_extra_flags: -DLINK_WITH_PYTHON=ON -DBUILD_FORTRAN=ON -DBUILD_TESTING:BOOL=ON -DENABLE_REGRESSION_TESTING:BOOL=OFF -DCOMMIT_SHA=$COMMIT_SHA -DENABLE_COVERAGE:BOOL=ON -DENABLE_GTEST_DEBUG_MODE:BOOL=OFF
     coverage_enabled: true
     coverage_base_dir: src/EnergyPlus

.decent_ci-MacOS.yaml

@@ -1,8 +1,3 @@
 compilers:
   - name: clang
-    build_package_generator:
-     - IFW
-     - TGZ
-    release_build_cmake_extra_flags: -DBUILD_DOCS:BOOL=ON
-    cmake_extra_flags: -DBUILD_FORTRAN=ON -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DENABLE_REGRESSION_TESTING:BOOL=ON -DREGRESSION_BASELINE_PATH:PATH=$REGRESSION_BASELINE -DREGRESSION_SCRIPT_PATH:PATH=$REGRESSION_DIR -DREGRESSION_BASELINE_SHA:STRING=$REGRESSION_BASELINE_SHA -DCOMMIT_SHA=$COMMIT_SHA -DENABLE_GTEST_DEBUG_MODE:BOOL=OFF -DLINK_WITH_PYTHON=ON
-
+    cmake_extra_flags: -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 -DBUILD_FORTRAN=ON -DBUILD_TESTING:BOOL=ON -DENABLE_REGRESSION_TESTING:BOOL=ON -DREGRESSION_BASELINE_PATH:PATH=$REGRESSION_BASELINE -DREGRESSION_SCRIPT_PATH:PATH=$REGRESSION_DIR -DREGRESSION_BASELINE_SHA:STRING=$REGRESSION_BASELINE_SHA -DCOMMIT_SHA=$COMMIT_SHA -DENABLE_GTEST_DEBUG_MODE:BOOL=OFF -DLINK_WITH_PYTHON=ON

.decent_ci-Windows.yaml

@@ -1,21 +1,6 @@
 compilers:
-  - name: Visual Studio
-    version: 16
-    architecture: i386
-    release_only: true
-    build_package_generator:
-     - IFW
-    release_build_cmake_extra_flags: -DBUILD_DOCS:BOOL=ON -DTEX_INTERACTION="nonstopmode"
-    cmake_extra_flags: -DBUILD_FORTRAN:BOOL=ON -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DCOMMIT_SHA=%COMMIT_SHA% -DENABLE_GTEST_DEBUG_MODE:BOOL=OFF
-    skip_regression: true
-
   - name: Visual Studio
     version: 16
     architecture: Win64
-    build_package_generator:
-     - IFW
-     - ZIP
-    release_build_cmake_extra_flags: -DBUILD_DOCS:BOOL=ON -DTEX_INTERACTION="nonstopmode"
-    cmake_extra_flags: -DBUILD_FORTRAN:BOOL=ON -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DCOMMIT_SHA=%COMMIT_SHA% -DENABLE_GTEST_DEBUG_MODE:BOOL=OFF -DLINK_WITH_PYTHON=ON
+    cmake_extra_flags: -DBUILD_FORTRAN:BOOL=ON -DBUILD_TESTING:BOOL=ON -DCOMMIT_SHA=%COMMIT_SHA% -DENABLE_GTEST_DEBUG_MODE:BOOL=OFF -DLINK_WITH_PYTHON=ON
     skip_regression: true
-

.github/disabled-workflows/mac_test.yml

@@ -0,0 +1,95 @@
+name: Mac Testing
+
+on: [push]
+
+env:
+  FC: /usr/local/bin/gfortran-9
+  DO_REGRESSIONS: false
+  INSTALL_DEPENDENCIES: true
+
+jobs:
+  build:
+    runs-on: macos-10.15
+
+    steps:
+    - name: Checkout Branch
+      uses: actions/checkout@v2
+      with:
+        path: 'clone_branch'
+
+    - name: Checkout Baseline
+      if: ${{ env.DO_REGRESSIONS == 'true' }}
+      uses: actions/checkout@v2
+      with:
+        repository: 'NREL/EnergyPlus'
+        ref: 'develop'
+        path: 'clone_baseline'
+        fetch-depth: '1'
+
+    - name: Checkout Regressions
+      if: ${{ env.DO_REGRESSIONS == 'true' }}
+      uses: actions/checkout@v2
+      with:
+        repository: 'NREL/EnergyPlusRegressionTool'
+        ref: 'master'
+        path: 'clone_regressions'
+        fetch-depth: '1'
+
+    - name: Set up Python 3.7
+      if: ${{ env.INSTALL_DEPENDENCIES == 'true' }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.7
+
+    - name: Install Python dependencies
+      if: ${{ env.INSTALL_DEPENDENCIES == 'true' && env.DO_REGRESSIONS == 'true'}}
+      run: |
+        python -m pip install --upgrade pip
+        pip install beautifulsoup4 soupsieve boto
+
+    - name: Create Baseline Build Directory
+      if: ${{ env.DO_REGRESSIONS == 'true' }}
+      run: cmake -E make_directory ${{runner.workspace}}/EnergyPlus/clone_baseline/build
+
+    - name: Configure Baseline
+      if: ${{ env.DO_REGRESSIONS == 'true' }}
+      shell: bash
+      working-directory: ${{runner.workspace}}/EnergyPlus/clone_baseline/build
+      run: cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_FORTRAN=ON -DBUILD_TESTING:BOOL=ON -DCOMMIT_SHA=$COMMIT_SHA -DENABLE_GTEST_DEBUG_MODE:BOOL=OFF -DLINK_WITH_PYTHON=ON $GITHUB_WORKSPACE/clone_baseline
+
+    - name: Build Baseline
+      if: ${{ env.DO_REGRESSIONS == 'true' }}
+      working-directory: ${{runner.workspace}}/EnergyPlus/clone_baseline/build
+      shell: bash
+      run: cmake --build . -j 2
+
+    - name: Test Baseline
+      if: ${{ env.DO_REGRESSIONS == 'true' }}
+      working-directory: ${{runner.workspace}}/EnergyPlus/clone_baseline/build
+      shell: bash
+      run: ctest -R 1ZoneUncontrolled
+
+    - name: Create Branch Build Directory
+      run: cmake -E make_directory ${{runner.workspace}}/EnergyPlus/clone_branch/build
+
+    - name: Configure Branch without Regressions
+      if: ${{ env.DO_REGRESSIONS != 'true' }}
+      shell: bash
+      working-directory: ${{runner.workspace}}/EnergyPlus/clone_branch/build
+      run: cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_FORTRAN=ON -DBUILD_TESTING:BOOL=ON -DENABLE_GTEST_DEBUG_MODE:BOOL=OFF -DLINK_WITH_PYTHON=ON ..
+
+    - name: Configure Branch with Regressions
+      if: ${{ env.DO_REGRESSIONS == 'true' }}
+      shell: bash
+      working-directory: ${{runner.workspace}}/EnergyPlus/clone_branch/build
+      run: cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_FORTRAN=ON -DBUILD_TESTING:BOOL=ON -DENABLE_REGRESSION_TESTING:BOOL=ON -DREGRESSION_BASELINE_PATH:PATH=${{runner.workspace}}/clone_baseline/build -DREGRESSION_SCRIPT_PATH:PATH=${{runner.workspace}}/clone_regressions/build -DREGRESSION_BASELINE_SHA:STRING=UNNKOWN_SHA -DCOMMIT_SHA=${{github.sha}} -DENABLE_GTEST_DEBUG_MODE:BOOL=OFF -DLINK_WITH_PYTHON=ON ..
+
+    - name: Build Branch
+      working-directory: ${{runner.workspace}}/EnergyPlus/clone_branch/build
+      shell: bash
+      run: cmake --build . -j 2
+
+    - name: Test Branch
+      working-directory: ${{runner.workspace}}/EnergyPlus/clone_branch/build
+      shell: bash
+      run: ctest -j 2

.github/disabled-workflows/windows_test.yml

@@ -0,0 +1,36 @@
+name: Windows 64-bit Testing
+
+on: [push]
+
+env:
+  CMAKE_Fortran_COMPILER: "/c/msys64/mingw64/bin/x86_64-w64-mingw32-gfortran.exe"
+
+jobs:
+  windows_test_64:
+    runs-on: windows-2019
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Python 3.7
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.7
+        architecture: 'x64'
+
+    - 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 -G "Visual Studio 16 2019" -A x64 -DLINK_WITH_PYTHON=ON -DBUILD_TESTING=ON -DBUILD_FORTRAN=ON ..
+
+    - name: Build EnergyPlus
+      working-directory: ${{runner.workspace}}/EnergyPlus/build
+      shell: bash
+      run: cmake --build . -j 2 --config Release
+
+    - name: Run Tests
+      working-directory: ${{runner.workspace}}/EnergyPlus/build
+      run: ctest -j 2 -C Release

.github/unfinished-workflows/linux_test.yml

@@ -0,0 +1,43 @@
+name: Linux Test - Release Mode
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-18.04
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Python 3.7
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.7
+
+    - name: Install APT dependencies
+      # install valgrind and performance test stuff
+      run: sudo apt-get update && sudo apt-get install libxkbcommon-x11-0 xorg-dev libgl1-mesa-dev
+
+    - name: Create Build Directory
+      run: cmake -E make_directory ${{runner.workspace}}/EnergyPlus/build
+
+    - name: Configure CMake
+      working-directory: ${{runner.workspace}}/EnergyPlus/build
+      # turn on performance testing
+      run: cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=ON -DLINK_WITH_PYTHON=ON -DDOCUMENTATION_BUILD="BuildWithAll" -DTEX_INTERACTION="batchmode" -DBUILD_FORTRAN=ON -DBUILD_PACKAGE:BOOL=ON ..
+
+    - name: Build EnergyPlus
+      working-directory: ${{runner.workspace}}/EnergyPlus/build
+      run: cmake --build . -j 2
+
+    - name: Run EnergyPlus Tests
+      working-directory: ${{runner.workspace}}/EnergyPlus/build
+      run: ctest -j 2
+
+    # collect performance results here, upload them
+
+    - name: Run EnergyPlus Integration Tests
+      working-directory: ${{runner.workspace}}/EnergyPlus/build
+      run: ctest -j 2 -R "integration.*"
+
+    # get coverage results here, upload them

.github/unfinished-workflows/linux_test_debug.yml

@@ -0,0 +1,45 @@
+name: Linux Test - Debug Mode
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-18.04
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Python 3.7
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.7
+
+    # install boto to upload coverage results
+
+    - name: Install APT dependencies
+      # install gcovr and coverage stuff
+      run: sudo apt-get update && sudo apt-get install libxkbcommon-x11-0 xorg-dev libgl1-mesa-dev
+
+    - name: Create Build Directory
+      run: cmake -E make_directory ${{runner.workspace}}/EnergyPlus/build
+
+    - name: Configure CMake
+      working-directory: ${{runner.workspace}}/EnergyPlus/build
+      # turn on ENABLE_COVERAGE
+      run: cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=ON -DLINK_WITH_PYTHON=ON -DDOCUMENTATION_BUILD="BuildWithAll" -DTEX_INTERACTION="batchmode" -DBUILD_FORTRAN=ON -DBUILD_PACKAGE:BOOL=ON ..
+
+    - name: Build EnergyPlus
+      working-directory: ${{runner.workspace}}/EnergyPlus/build
+      run: cmake --build . -j 2
+
+    - name: Run EnergyPlus Unit Tests
+      working-directory: ${{runner.workspace}}/EnergyPlus/build
+      run: ctest -j 2 -E "integration.*"
+
+    # get coverage results here, upload them, then clear them
+
+    - name: Run EnergyPlus Integration Tests
+      working-directory: ${{runner.workspace}}/EnergyPlus/build
+      run: ctest -j 2 -R "integration.*"
+
+    # get coverage results here, upload them

.github/workflows/cppcheck.yml

@@ -0,0 +1,18 @@
+name: CppCheck
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-18.04
+
+    steps:
+    - name: Checkout EnergyPlus
+      uses: actions/checkout@v2
+
+    - name: Install CppCheck
+      run: sudo apt-get install cppcheck
+
+    - name: Run CppCheck
+      working-directory: ${{runner.workspace}}/EnergyPlus/src
+      run: cppcheck --template='[{file}]:{line}:{severity}:{message}' --suppress="uninitvar:*" .

.github/workflows/custom_check.yml

@@ -0,0 +1,22 @@
+name: Custom Check
+
+on: [push]
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-18.04]
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Python 3.7
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.7
+
+    - name: Custom Check
+      shell: bash
+      run: ./scripts/dev/custom_check.sh .