Skip to content

Commit

Permalink
Merge branch 'develop' into 168168673_Issue7476
Browse files Browse the repository at this point in the history
  • Loading branch information
@mitchute
mitchute committed Jan 16, 2020
2 parents cd48e10 + ce98bde commit 3190416
Show file tree
Hide file tree
Showing 1,786 changed files with 319,376 additions and 114,720 deletions.
19 changes: 12 additions & 7 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,17 @@ endif()
set( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH} )

set( CMAKE_VERSION_MAJOR 9 )
set( CMAKE_VERSION_MINOR 2 )
set( CMAKE_VERSION_MINOR 3 )
set( CMAKE_VERSION_PATCH 0 )

set( PREV_RELEASE_SHA "08d2e30" )
set( CMAKE_POSITION_INDEPENDENT_CODE ON )

set( PREV_RELEASE_SHA "921312f" )

set( ENERGYPLUS_VERSION "${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}.${CMAKE_VERSION_PATCH}" )

string( TIMESTAMP CMAKE_YEAR "%Y")

set( CMAKE_VERSION_BUILD "Unknown" CACHE STRING "Build number" )
find_package(Git)

Expand Down Expand Up @@ -72,8 +76,8 @@ option( ENABLE_INSTALL_REMOTE "Enable install_remote and install_remote_plist co

mark_as_advanced( ENABLE_INSTALL_REMOTE )

# we are making python a required dependency, so find it here...starting off by requiring at least 2.7
find_package(PythonInterp 2.7 REQUIRED)
# we are making python a required dependency, so find it here
find_package(PythonInterp 3 REQUIRED)

if( BUILD_TESTING )
option( ENABLE_REGRESSION_TESTING "Enable Regression Tests" OFF )
Expand Down Expand Up @@ -179,6 +183,7 @@ ADD_SUBDIRECTORY(third_party/FMI)
ADD_SUBDIRECTORY(third_party/zlib)
ADD_SUBDIRECTORY(third_party/DElight)
ADD_SUBDIRECTORY(third_party/re2)
ADD_SUBDIRECTORY(third_party/fmt-6.1.2 )

ADD_SUBDIRECTORY(scripts/dev/generate_embeddable_epJSON_schema)
IF( NOT APPLE )
Expand Down Expand Up @@ -237,9 +242,9 @@ if( BUILD_FORTRAN )
cmake_add_fortran_subdirectory(src/ReadVars PROJECT ReadVars NO_EXTERNAL_INSTALL )
set(TRANSITION_EXTRA_FLAGS "-DCMAKE_VERSION_MAJOR:STRING=${CMAKE_VERSION_MAJOR}" "-DCMAKE_VERSION_MINOR:STRING=${CMAKE_VERSION_MINOR}" "-DCMAKE_VERSION_PATCH:STRING=${CMAKE_VERSION_PATCH}")
cmake_add_fortran_subdirectory(src/Transition PROJECT Transition CMAKE_COMMAND_LINE ${TRANSITION_EXTRA_FLAGS} NO_EXTERNAL_INSTALL )
file( COPY "idd/V9-1-0-Energy+.idd" DESTINATION "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" )
configure_file( idd/Energy+.idd.in "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/V9-2-0-Energy+.idd" )
file( COPY "src/Transition/SupportFiles/Report Variables 9-1-0 to 9-2-0.csv" DESTINATION "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" )
file( COPY "idd/V9-2-0-Energy+.idd" DESTINATION "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" )
configure_file( idd/Energy+.idd.in "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/V9-3-0-Energy+.idd" )
file( COPY "src/Transition/SupportFiles/Report Variables 9-2-0 to 9-3-0.csv" DESTINATION "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" )
cmake_add_fortran_subdirectory(src/Basement PROJECT Basement NO_EXTERNAL_INSTALL )
cmake_add_fortran_subdirectory(src/HVAC-Diagram PROJECT HVAC-Diagram NO_EXTERNAL_INSTALL )
cmake_add_fortran_subdirectory(src/ParametricPreprocessor PROJECT ParametricPreprocessor NO_EXTERNAL_INSTALL )
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
EnergyPlus, Copyright (c) 1996-2019, The Board of Trustees of the University of Illinois, The Regents of the University of California, through Lawrence Berkeley National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy), Oak Ridge National Laboratory, managed by UT-Battelle, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.
EnergyPlus, Copyright (c) 1996-2020, The Board of Trustees of the University of Illinois, The Regents of the University of California, through Lawrence Berkeley National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy), Oak Ridge National Laboratory, managed by UT-Battelle, Alliance for Sustainable Energy, LLC, and other contributors. All rights reserved.

NOTICE: This Software was developed under funding from the U.S. Department of Energy and the U.S. Government consequently retains certain rights. As such, the U.S. Government has been granted for itself and others acting on its behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software to reproduce, distribute copies to the public, prepare derivative works, and perform publicly and display publicly, and to permit others to do so.

Expand Down
Binary file modified bin/IDFEditor/IDFEditor.exe
View file
Binary file not shown.
6 changes: 3 additions & 3 deletions cmake/Install.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,15 +286,15 @@ INSTALL( DIRECTORY testfiles/ DESTINATION ExampleFiles/

# TODO Remove version from file name or generate
# These files names are stored in variables because they also appear as start menu shortcuts later.
set( RULES_XLS Rules9-1-0-to-9-2-0.md )
set( RULES_XLS Rules9-2-0-to-9-3-0.md )
install(FILES "${CMAKE_SOURCE_DIR}/release/Bugreprt.txt" DESTINATION "./")
install(FILES "${CMAKE_SOURCE_DIR}/release/favicon.png" DESTINATION "./")
install(FILES "${CMAKE_SOURCE_DIR}/release/readme.html" DESTINATION "./")
set(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/release/readme.html")

install(FILES "${CMAKE_SOURCE_DIR}/bin/CurveFitTools/IceStorageCurveFitTool.xlsm" DESTINATION "PreProcess/HVACCurveFitTool/")
install(FILES "${CMAKE_SOURCE_DIR}/idd/V9-1-0-Energy+.idd" DESTINATION "PreProcess/IDFVersionUpdater/")
install(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Energy+.idd" DESTINATION "PreProcess/IDFVersionUpdater/" RENAME "V9-2-0-Energy+.idd" )
install(FILES "${CMAKE_SOURCE_DIR}/idd/V9-2-0-Energy+.idd" DESTINATION "PreProcess/IDFVersionUpdater/")
install(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Energy+.idd" DESTINATION "PreProcess/IDFVersionUpdater/" RENAME "V9-3-0-Energy+.idd" )

# Workflow stuff, takes about 40KB, so not worth it proposing to not install it
install(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/workflows/app_g_postprocess.py" DESTINATION "workflows/") # COMPONENT Workflows)
Expand Down
16 changes: 8 additions & 8 deletions datasets/FossilFuelEnvironmentalImpactFactors.idf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
, !- Nuclear High Level Emission Factor Schedule Name
0; !- Nuclear Low Level Emission Factor {m3/MJ}

!NOTE: EnergyPlus does not yet include LPG as a fuel. Included here for future use.
!NOTE: EnergyPlus does not include LPG as a fuel type, use Propane as the resource name.
!
! USEPA Compilation of Air Pollutant Emission Factors, AP-42, Fifth Edition
! Volume I: Stationary Point and Area Sources
Expand All @@ -162,7 +162,7 @@
!

FuelFactors,
LPG, !- Existing Fuel Resource Name
Propane, !- Existing Fuel Resource Name
kg, !- Units of Measure
, !- Energy per Unit Factor
1, !- Source Energy Factor {J/J}
Expand Down Expand Up @@ -252,7 +252,7 @@
!

FuelFactors,
FuelOil#1, !- Existing Fuel Resource Name
FuelOilNo1, !- Existing Fuel Resource Name
kg, !- Units of Measure
, !- Energy per Unit Factor
1, !- Source Energy Factor {J/J}
Expand Down Expand Up @@ -297,7 +297,7 @@
!

FuelFactors,
FuelOil#2, !- Existing Fuel Resource Name
FuelOilNo2, !- Existing Fuel Resource Name
kg, !- Units of Measure
, !- Energy per Unit Factor
1, !- Source Energy Factor {J/J}
Expand Down Expand Up @@ -334,7 +334,7 @@
, !- Nuclear High Level Emission Factor Schedule Name
0; !- Nuclear Low Level Emission Factor {m3/MJ}

!NOTE: EnergyPlus does not yet include FuelOil#4 as a fuel. Included here for future use.
!NOTE: EnergyPlus does not include FuelOil#4 as a fuel, use OtherFuel1 as the resource name
!
! USEPA Compilation of Air Pollutant Emission Factors, AP-42, Fifth Edition
! Volume I: Stationary Point and Area Sources
Expand All @@ -344,7 +344,7 @@
!

FuelFactors,
FuelOil#4, !- Existing Fuel Resource Name
OtherFuel1, !- Existing Fuel Resource Name
kg, !- Units of Measure
, !- Energy per Unit Factor
1, !- Source Energy Factor {J/J}
Expand Down Expand Up @@ -381,7 +381,7 @@
, !- Nuclear High Level Emission Factor Schedule Name
0; !- Nuclear Low Level Emission Factor {m3/MJ}

!NOTE: EnergyPlus does not yet include FuelOil#6 as a fuel. Included here for future use.
!NOTE: EnergyPlus does not include FuelOil#6 as a fuel, use OtherFuel1 as the resource name
!
! USEPA Compilation of Air Pollutant Emission Factors, AP-42, Fifth Edition
! Volume I: Stationary Point and Area Sources
Expand All @@ -391,7 +391,7 @@
!

FuelFactors,
FuelOil#6, !- Existing Fuel Resource Name
OtherFuel1, !- Existing Fuel Resource Name
kg, !- Units of Measure
, !- Energy per Unit Factor
1, !- Source Energy Factor {J/J}
Expand Down
Loading

7 comments on commit 3190416

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

168168673_Issue7476 (mitchute) - x86_64-Linux-Ubuntu-18.04-cppcheck: OK (0 of 0 tests passed, 0 test warnings)

Build Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

168168673_Issue7476 (mitchute) - x86_64-Linux-Ubuntu-18.04-custom_check: OK (11 of 11 tests passed, 0 test warnings)

Build Badge

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

168168673_Issue7476 (mitchute) - x86_64-Linux-Ubuntu-18.04-gcc-7.4: OK (2630 of 2654 tests passed, 617 test warnings)

Messages:\n

  • 533 tests had: EIO diffs.
  • 609 tests had: ESO small diffs.
  • 414 tests had: Table small diffs.
  • 470 tests had: MTR small diffs.
  • 5 tests had: EDD diffs.
  • 14 tests had: ESO big diffs.
  • 8 tests had: MTR big diffs.
  • 20 tests had: Table big diffs.
  • 20 tests had: ERR diffs.
  • 12 tests had: SSZ small diffs.
  • 44 tests had: ZSZ small diffs.
  • 2 tests had: JSON big diffs.

Failures:\n

regression Test Summary

  • Passed: 668
  • Failed: 24

Build Badge Test Badge

@nrel-bot-2
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

168168673_Issue7476 (mitchute) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-UnitTestsCoverage-Debug: OK (1268 of 1268 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

168168673_Issue7476 (mitchute) - x86_64-Linux-Ubuntu-18.04-gcc-7.4-IntegrationCoverage-Debug: OK (676 of 677 tests passed, 0 test warnings)

Failures:\n

integration Test Summary

  • Passed: 676
  • Timeout: 1

Build Badge Test Badge Coverage Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

168168673_Issue7476 (mitchute) - Win64-Windows-10-VisualStudio-16: OK (2587 of 2614 tests passed, 613 test warnings)

Messages:\n

  • 523 tests had: EIO diffs.
  • 607 tests had: ESO small diffs.
  • 400 tests had: Table small diffs.
  • 469 tests had: MTR small diffs.
  • 5 tests had: EDD diffs.
  • 16 tests had: ESO big diffs.
  • 9 tests had: MTR big diffs.
  • 23 tests had: Table big diffs.
  • 42 tests had: ZSZ small diffs.
  • 38 tests had: BND diffs.
  • 15 tests had: ERR diffs.
  • 14 tests had: SSZ small diffs.
  • 2 tests had: SSZ big diffs.
  • 2 tests had: JSON big diffs.

Failures:\n

regression Test Summary

  • Passed: 645
  • Failed: 27

Build Badge Test Badge

@nrel-bot-3
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

168168673_Issue7476 (mitchute) - x86_64-MacOS-10.13-clang: OK (2590 of 2614 tests passed, 613 test warnings)

Messages:\n

  • 523 tests had: EIO diffs.
  • 5 tests had: EDD diffs.
  • 603 tests had: ESO small diffs.
  • 471 tests had: MTR small diffs.
  • 406 tests had: Table small diffs.
  • 17 tests had: ESO big diffs.
  • 19 tests had: Table big diffs.
  • 8 tests had: MTR big diffs.
  • 31 tests had: ZSZ small diffs.
  • 13 tests had: ERR diffs.
  • 9 tests had: SSZ small diffs.
  • 38 tests had: BND diffs.
  • 2 tests had: JSON big diffs.
  • 2 tests had: AUD diffs.

Failures:\n

regression Test Summary

  • Passed: 648
  • Failed: 24

Build Badge Test Badge

Please sign in to comment.