-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #27 from lbl-srg/issue4_idd
Issue4 idd
- Loading branch information
Showing
40 changed files
with
2,184 additions
and
1,482 deletions.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,13 @@ | ||
| Acknowledgments | ||
| =============== | ||
|
|
||
| The development of this documentation was supported | ||
| by the Assistant Secretary for Energy Efficiency and Renewable Energy, | ||
| Office of Building Technologies of the U.S. Department of Energy, | ||
| The development of this documentation was supported | ||
| by the Assistant Secretary for Energy Efficiency and Renewable Energy, | ||
| Office of Building Technologies of the U.S. Department of Energy, | ||
| under contract No. DE-AC02-05CH11231. | ||
|
|
||
| The following people contributed to the development of this program: | ||
|
|
||
| - Thierry Stephane Nouidui, Lawrence Berkeley National Laboratory | ||
| - Thierry Stephane Nouidui, The United African University of Tanzania | ||
| - David M. Lorenzetti, Lawrence Berkeley National Laboratory | ||
| - Michael Wetter, Lawrence Berkeley National Laboratory | ||
|
|
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 |
|---|---|---|
|
|
@@ -2,32 +2,31 @@ Copyright and License | |
| ===================== | ||
|
|
||
|
|
||
| Functional Mock-up Unit Export of EnergyPlus 2018, The Regents of the University of California, through Lawrence Berkeley National Laboratory (subject to receipt of any required approvals from the U.S. Department of Energy). All rights reserved. | ||
| Functional Mock-up Unit Export of EnergyPlus 2019, The Regents of the University of California, through Lawrence Berkeley National Laboratory (subject to receipt of any required approvals from the U.S. Department of Energy). All rights reserved. | ||
|
|
||
| If you have questions about your rights to use or distribute this software, please contact Berkeley Lab's Technology Transfer Department at [email protected]. referring to "Functional Mock-up Unit Export of EnergyPlus (LBNL Ref 2013-088)". | ||
|
|
||
| NOTICE: This software was produced by The Regents of the University of California under Contract No. DE-AC02-05CH11231 with the Department of Energy. | ||
| For 5 years from November 1, 2012, the Government is granted for itself and others acting on its behalf a nonexclusive, paid-up, irrevocable worldwide license in this data to reproduce, prepare derivative works, and perform publicly and display publicly, by or on behalf of the Government. There is provision for the possible extension of the term of this license. | ||
| For 5 years from November 1, 2012, the Government is granted for itself and others acting on its behalf a nonexclusive, paid-up, irrevocable worldwide license in this data to reproduce, prepare derivative works, and perform publicly and display publicly, by or on behalf of the Government. There is provision for the possible extension of the term of this license. | ||
| Subsequent to that period or any extension granted, the Government is granted for itself and others acting on its behalf a nonexclusive, paid-up, irrevocable worldwide license in this data to reproduce, prepare derivative works, distribute copies to the public, perform publicly and display publicly, and to permit others to do so. The specific term of the license can be identified by inquiry made to Lawrence Berkeley National Laboratory or DOE. Neither the United States nor the United States Department of Energy, nor any of their employees, makes any warranty, express or implied, or assumes any legal liability or responsibility for the accuracy, completeness, or usefulness of any data, apparatus, product, or process disclosed, or represents that its use would not infringe privately owned rights. | ||
| Copyright (c) 2018, The Regents of the University of California, Department of Energy contract-operators of the Lawrence Berkeley National Laboratory. | ||
|
|
||
|
|
||
| Copyright (c) 2019, The Regents of the University of California, Department of Energy contract-operators of the Lawrence Berkeley National Laboratory. | ||
| All rights reserved. | ||
|
|
||
| 1. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: | ||
|
|
||
| (1) Redistributions of source code must retain the copyright notice, this list of conditions and the following disclaimer. | ||
|
|
||
| (2) Redistributions in binary form must reproduce the copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. | ||
|
|
||
| (3) Neither the name of the University of California, Lawrence Berkeley National Laboratory, 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. | ||
|
|
||
| 2. 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. | ||
|
|
||
| 3. 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. | ||
|
|
||
| NOTE: This license corresponds to the "revised BSD" or "3-clause BSD" | ||
| License and includes the following modification: Paragraph 3. has been added. | ||
|
|
||
| NOTE: This license corresponds to the "revised BSD" or "3-clause BSD" | ||
| License and includes the following modification: Paragraph 3. has been added. | ||
Oops, something went wrong.