-
Notifications
You must be signed in to change notification settings - Fork 425
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' of https://github.com/NREL/EnergyPlus into con…
…servation-tests
- Loading branch information
Showing
8,337 changed files
with
2,265,574 additions
and
497,911 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,4 @@ | ||
EnergyPlus, Copyright (c) 1996-2016, The Board of Trustees of the University of Illinois and 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). All rights reserved. | ||
|
||
If you have questions about your rights to use or distribute this software, please contact Berkeley Lab's Innovation & Partnerships Office at [email protected]. | ||
EnergyPlus, Copyright (c) 1996-2017, The Board of Trustees of the University of Illinois and 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). 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. | ||
|
||
|
@@ -12,8 +10,6 @@ Redistribution and use in source and binary forms, with or without modification, | |
|
||
(3) Neither the name of the University of California, Lawrence Berkeley National Laboratory, the University of Illinois, U.S. Dept. of Energy nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. | ||
|
||
(4) Use of EnergyPlus(TM) Name. If Licensee (i) distributes the software in stand-alone form without changes from the version obtained under this License, or (ii) Licensee makes a reference solely to the software portion of its product, Licensee must refer to the software as "EnergyPlus version X" software, where "X" is the version number Licensee obtained under this License and may not use a different name for the software. Except as specifically required in this Section (4), Licensee shall not use in a company name, a product name, in advertising, publicity, or other promotional activities any name, trade name, trademark, logo, or other designation of "EnergyPlus", "E+", "e+" or confusingly similar designation, without Lawrence Berkeley National Laboratory's prior written consent. | ||
(4) Use of EnergyPlus(TM) Name. If Licensee (i) distributes the software in stand-alone form without changes from the version obtained under this License, or (ii) Licensee makes a reference solely to the software portion of its product, Licensee must refer to the software as "EnergyPlus version X" software, where "X" is the version number Licensee obtained under this License and may not use a different name for the software. Except as specifically required in this Section (4), Licensee shall not use in a company name, a product name, in advertising, publicity, or other promotional activities any name, trade name, trademark, logo, or other designation of "EnergyPlus", "E+", "e+" or confusingly similar designation, without the U.S. Department of Energy's prior written consent. | ||
|
||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
||
You are under no obligation whatsoever to provide any bug fixes, patches, or upgrades to the features, functionality or performance of the source code ("Enhancements") to anyone; however, if you choose to make your Enhancements available either publicly, or directly to Lawrence Berkeley National Laboratory, without imposing a separate written license agreement for such Enhancements, then you hereby grant the following license: a non-exclusive, royalty-free perpetual license to install, use, modify, prepare derivative works, incorporate into other computer software, distribute, and sublicense such enhancements or derivative works thereof, in binary and source code form. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
VarSpeedCoolCapFt | ||
0.476428E+00,0.401147E-01,0.226411E-03,-0.827136E-03,-0.732240E-05,-0.446278E-03 | ||
12.777778,23.888889 | ||
23.888889,46.111111 | ||
19.444444,35.0 | ||
2.777778 | ||
|
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
VarSpeedCoolCapFt | ||
-0.29382,0.0222213,0.00006988,0.0040928,-0.00000226,-0.00013774 | ||
55.,75. | ||
75.,115. | ||
67.0,95.0 | ||
5. | ||
VarSpeedEIRFt | ||
0.603982,-0.0100620,0.00015672,0.0099508,0.00008421,-0.00020963 | ||
55.,75. | ||
75.,115. | ||
67.0,95.0 | ||
5. | ||
VarSpeedCoolCapLSFt | ||
-0.29382,0.0222213,0.00006988,0.0040928,-0.00000226,-0.00013774 | ||
55.,75. | ||
75.,115. | ||
67.0,95.0 | ||
5. | ||
VarSpeedEIRLSFt | ||
-0.29382,0.0222213,0.00006988,0.0040928,-0.00000226,-0.00013774 | ||
55.,75. | ||
75.,115. | ||
67.0,95.0 | ||
5. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
: CoeffCheck Batch File for EP-Launch Program | ||
: Utilities distributed with EnergyPlus | ||
: Created on: 13 Feb 2007 by J. Glazer | ||
: Based on: EPL-Conv.bat | ||
: Revised: | ||
: | ||
: This batch file executes CoeffCheck with an optional paramter. If a parameters is used | ||
: the environmental variable below is ignored. If a parameter is used it is %inout% | ||
: | ||
: %inout% contains the file with full path and no extensions for input and output files | ||
: | ||
: 1. Use input parameters | ||
IF "%3" NEQ "PARAM" SET io=%inout% | ||
IF "%3" EQU "PARAM" SET io=%~1 | ||
|
||
: 2. Clean up working directory | ||
IF EXIST CoeffCheckInput.txt DEL CoeffCheckInput.txt | ||
IF EXIST CoeffCheckOutput.txt DEL CoeffCheckOutput.txt | ||
|
||
: 3. Copy input data file to working directory | ||
IF EXIST "%io%.cci" COPY "%io%.cci" CoeffCheckInput.txt | ||
|
||
: 4. Execute CoeffConv | ||
CoeffCheck.exe | ||
|
||
: 5. Remove old version of the output file | ||
IF EXIST "%io%.cco" DEL "%io%.cco" | ||
|
||
: 6. Copy output files to input/output path | ||
IF EXIST CoeffCheckOutput.txt MOVE CoeffCheckOutput.txt "%io%.cco" | ||
|
||
: 7. Clean up directory. | ||
IF EXIST CoeffCheckInput.txt DEL CoeffCheckInput.txt | ||
IF EXIST CoeffCheckOutput.txt DEL CoeffCheckOutput.txt | ||
|
||
: 8. Finished |
Oops, something went wrong.
2c8016c
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
conservation-tests (rraustad) - x86_64-MacOS-10.9-clang: OK (2572 of 2575 tests passed, 0 test warnings)
Messages:
Failures:
regression Test Summary
2c8016c
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
conservation-tests (rraustad) - i386-Windows-7-VisualStudio-14: OK (2577 of 2581 tests passed, 0 test warnings)
Messages:
Failures:
regression Test Summary
2c8016c
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
conservation-tests (rraustad) - Win64-Windows-7-VisualStudio-14: OK (2577 of 2581 tests passed, 0 test warnings)
Messages:
Failures:
regression Test Summary
2c8016c
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unhandled Failure
2c8016c
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
conservation-tests (rraustad) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed, 0 test warnings)
2c8016c
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
conservation-tests (rraustad) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-UnitTestsCoverage-Debug: OK (1373 of 1373 tests passed, 0 test warnings)
2c8016c
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
conservation-tests (rraustad) - x86_64-Linux-Ubuntu-14.04-gcc-4.8-IntegrationCoverage-Debug: OK (1978 of 1978 tests passed, 0 test warnings)
2c8016c
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
conservation-tests (rraustad) - x86_64-Linux-Ubuntu-14.04-custom_check: OK (0 of 0 tests passed, 0 test warnings)