Skip to content

Commit fa13d1c

Browse files
Merge branch 'develop' into fix-ems-var-init-after-ref
2 parents 58cddd5 + fb18757 commit fa13d1c

File tree

1,095 files changed

+2276
-2201
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,095 files changed

+2276
-2201
lines changed

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
EnergyPlus, Copyright (c) 1996-2026, 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 Energy Innovation, LLC, and other contributors. All rights reserved.
1+
EnergyPlus, Copyright (c) 1996-present, 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 Energy Innovation, LLC, and other contributors. All rights reserved.
22

33
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.
44

cmake/PythonCopyStandardLib.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# EnergyPlus, Copyright (c) 1996-2026, The Board of Trustees of the University
2-
# of Illinois, The Regents of the University of California, through Lawrence
3-
# Berkeley National Laboratory (subject to receipt of any required approvals
4-
# from the U.S. Dept. of Energy), Oak Ridge National Laboratory, managed by UT-
5-
# Battelle, Alliance for Energy Innovation, LLC, and other contributors. All
6-
# rights reserved.
1+
# EnergyPlus, Copyright (c) 1996-present, The Board of Trustees of the
2+
# University of Illinois, The Regents of the University of California, through
3+
# Lawrence Berkeley National Laboratory (subject to receipt of any required
4+
# approvals from the U.S. Dept. of Energy), Oak Ridge National Laboratory,
5+
# managed by UT-Battelle, Alliance for Energy Innovation, LLC, and other
6+
# contributors. All rights reserved.
77
#
88
# NOTICE: This Software was developed under funding from the U.S. Department of
99
# Energy and the U.S. Government consequently retains certain rights. As such,

cmake/PythonFixUpTclTk.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# EnergyPlus, Copyright (c) 1996-2026, The Board of Trustees of the University
2-
# of Illinois, The Regents of the University of California, through Lawrence
3-
# Berkeley National Laboratory (subject to receipt of any required approvals
4-
# from the U.S. Dept. of Energy), Oak Ridge National Laboratory, managed by UT-
5-
# Battelle, Alliance for Energy Innovation, LLC, and other contributors. All
6-
# rights reserved.
1+
# EnergyPlus, Copyright (c) 1996-present, The Board of Trustees of the
2+
# University of Illinois, The Regents of the University of California, through
3+
# Lawrence Berkeley National Laboratory (subject to receipt of any required
4+
# approvals from the U.S. Dept. of Energy), Oak Ridge National Laboratory,
5+
# managed by UT-Battelle, Alliance for Energy Innovation, LLC, and other
6+
# contributors. All rights reserved.
77
#
88
# NOTICE: This Software was developed under funding from the U.S. Department of
99
# Energy and the U.S. Government consequently retains certain rights. As such,

cmake/PythonGetBitSize.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# EnergyPlus, Copyright (c) 1996-2026, The Board of Trustees of the University
2-
# of Illinois, The Regents of the University of California, through Lawrence
3-
# Berkeley National Laboratory (subject to receipt of any required approvals
4-
# from the U.S. Dept. of Energy), Oak Ridge National Laboratory, managed by UT-
5-
# Battelle, Alliance for Energy Innovation, LLC, and other contributors. All
6-
# rights reserved.
1+
# EnergyPlus, Copyright (c) 1996-present, The Board of Trustees of the
2+
# University of Illinois, The Regents of the University of California, through
3+
# Lawrence Berkeley National Laboratory (subject to receipt of any required
4+
# approvals from the U.S. Dept. of Energy), Oak Ridge National Laboratory,
5+
# managed by UT-Battelle, Alliance for Energy Innovation, LLC, and other
6+
# contributors. All rights reserved.
77
#
88
# NOTICE: This Software was developed under funding from the U.S. Department of
99
# Energy and the U.S. Government consequently retains certain rights. As such,

cmake/PythonInstallCLITools.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# EnergyPlus, Copyright (c) 1996-2026, The Board of Trustees of the University
2-
# of Illinois, The Regents of the University of California, through Lawrence
3-
# Berkeley National Laboratory (subject to receipt of any required approvals
4-
# from the U.S. Dept. of Energy), Oak Ridge National Laboratory, managed by UT-
5-
# Battelle, Alliance for Energy Innovation, LLC, and other contributors. All
6-
# rights reserved.
1+
# EnergyPlus, Copyright (c) 1996-present, The Board of Trustees of the
2+
# University of Illinois, The Regents of the University of California, through
3+
# Lawrence Berkeley National Laboratory (subject to receipt of any required
4+
# approvals from the U.S. Dept. of Energy), Oak Ridge National Laboratory,
5+
# managed by UT-Battelle, Alliance for Energy Innovation, LLC, and other
6+
# contributors. All rights reserved.
77
#
88
# NOTICE: This Software was developed under funding from the U.S. Department of
99
# Energy and the U.S. Government consequently retains certain rights. As such,

cmake/ReverseDDPostProcess.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
# EnergyPlus, Copyright (c) 1996-2026, The Board of Trustees of the University
2-
# of Illinois, The Regents of the University of California, through Lawrence
3-
# Berkeley National Laboratory (subject to receipt of any required approvals
4-
# from the U.S. Dept. of Energy), Oak Ridge National Laboratory, managed by UT-
5-
# Battelle, Alliance for Energy Innovation, LLC, and other contributors. All
6-
# rights reserved.
1+
# EnergyPlus, Copyright (c) 1996-present, The Board of Trustees of the
2+
# University of Illinois, The Regents of the University of California, through
3+
# Lawrence Berkeley National Laboratory (subject to receipt of any required
4+
# approvals from the U.S. Dept. of Energy), Oak Ridge National Laboratory,
5+
# managed by UT-Battelle, Alliance for Energy Innovation, LLC, and other
6+
# contributors. All rights reserved.
77
#
88
# NOTICE: This Software was developed under funding from the U.S. Department of
99
# Energy and the U.S. Government consequently retains certain rights. As such,

cmake/codesign_doc/conf.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#!/usr/bin/env python3
2-
# EnergyPlus, Copyright (c) 1996-2026, The Board of Trustees of the University
3-
# of Illinois, The Regents of the University of California, through Lawrence
4-
# Berkeley National Laboratory (subject to receipt of any required approvals
5-
# from the U.S. Dept. of Energy), Oak Ridge National Laboratory, managed by UT-
6-
# Battelle, Alliance for Energy Innovation, LLC, and other contributors. All
7-
# rights reserved.
2+
# EnergyPlus, Copyright (c) 1996-present, The Board of Trustees of the
3+
# University of Illinois, The Regents of the University of California, through
4+
# Lawrence Berkeley National Laboratory (subject to receipt of any required
5+
# approvals from the U.S. Dept. of Energy), Oak Ridge National Laboratory,
6+
# managed by UT-Battelle, Alliance for Energy Innovation, LLC, and other
7+
# contributors. All rights reserved.
88
#
99
# NOTICE: This Software was developed under funding from the U.S. Department of
1010
# Energy and the U.S. Government consequently retains certain rights. As such,

doc/engineering-reference/src/integrated-solution-manager/basis-for-the-zone-and-air-system-integration.tex

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ \section{Basis for the Zone and Air System Integration}\label{basis-for-the-zone
2121

2222
${C_z}\frac{dT_z}{dt} =$ energy stored in zone air
2323

24-
C\(_{z}\) = $\rho$\(_{air}\)C\(_{p}\)C\(_{T}\)
24+
C\(_{z}\) = $V_{z}$$\rho$\(_{air}\)C\(_{p}\)C\(_{T}\)
25+
26+
\(V_{z}\) = zone air volume
2527

2628
$\rho$\(_{air}\) = zone air density
2729

doc/tools/create_changelog.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#!/usr/bin/python
2-
# EnergyPlus, Copyright (c) 1996-2026, The Board of Trustees of the University
3-
# of Illinois, The Regents of the University of California, through Lawrence
4-
# Berkeley National Laboratory (subject to receipt of any required approvals
5-
# from the U.S. Dept. of Energy), Oak Ridge National Laboratory, managed by UT-
6-
# Battelle, Alliance for Energy Innovation, LLC, and other contributors. All
7-
# rights reserved.
2+
# EnergyPlus, Copyright (c) 1996-present, The Board of Trustees of the
3+
# University of Illinois, The Regents of the University of California, through
4+
# Lawrence Berkeley National Laboratory (subject to receipt of any required
5+
# approvals from the U.S. Dept. of Energy), Oak Ridge National Laboratory,
6+
# managed by UT-Battelle, Alliance for Energy Innovation, LLC, and other
7+
# contributors. All rights reserved.
88
#
99
# NOTICE: This Software was developed under funding from the U.S. Department of
1010
# Energy and the U.S. Government consequently retains certain rights. As such,

doc/tools/example_file_objects.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#!/usr/bin/python
2-
# EnergyPlus, Copyright (c) 1996-2026, The Board of Trustees of the University
3-
# of Illinois, The Regents of the University of California, through Lawrence
4-
# Berkeley National Laboratory (subject to receipt of any required approvals
5-
# from the U.S. Dept. of Energy), Oak Ridge National Laboratory, managed by UT-
6-
# Battelle, Alliance for Energy Innovation, LLC, and other contributors. All
7-
# rights reserved.
2+
# EnergyPlus, Copyright (c) 1996-present, The Board of Trustees of the
3+
# University of Illinois, The Regents of the University of California, through
4+
# Lawrence Berkeley National Laboratory (subject to receipt of any required
5+
# approvals from the U.S. Dept. of Energy), Oak Ridge National Laboratory,
6+
# managed by UT-Battelle, Alliance for Energy Innovation, LLC, and other
7+
# contributors. All rights reserved.
88
#
99
# NOTICE: This Software was developed under funding from the U.S. Department of
1010
# Energy and the U.S. Government consequently retains certain rights. As such,

0 commit comments

Comments
 (0)