Skip to content

Commit a57b258

Browse files
authored
Add copyright (#569)
* add copyright and license * fix white space
1 parent 110f428 commit a57b258

File tree

3 files changed

+52
-30
lines changed

3 files changed

+52
-30
lines changed

copyright.txt

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
Energy Research and Forecasting (ERF) Copyright (c) 2022, The
2+
Regents of the University of California, through Lawrence Berkeley
3+
National Laboratory, National Renewable Energy Laboratory,
4+
Lawrence Livermore National Laboratory and Argonne National
5+
Laboratory (subject to receipt of any required approvals from the
6+
U.S. Dept. of Energy). All rights reserved.
7+
8+
If you have questions about your rights to use or distribute this software,
9+
please contact Berkeley Lab's Intellectual Property Office at
10+
11+
12+
NOTICE. This Software was developed under funding from the U.S. Department
13+
of Energy and the U.S. Government consequently retains certain rights. As
14+
such, the U.S. Government has been granted for itself and others acting on
15+
its behalf a paid-up, nonexclusive, irrevocable, worldwide license in the
16+
Software to reproduce, distribute copies to the public, prepare derivative
17+
works, and perform publicly and display publicly, and to permit others to do so.

license.txt

+34-29
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,46 @@
1-
ERF Copyright (c) 2020. All rights reserved.
1+
Energy Research and Forecasting (ERF) Copyright (c) 2022, The
2+
Regents of the University of California, through Lawrence Berkeley
3+
National Laboratory, National Renewable Energy Laboratory,
4+
Lawrence Livermore National Laboratory and Argonne National
5+
Laboratory (subject to receipt of any required approvals from the
6+
U.S. Dept. of Energy). All rights reserved.
27

38
Redistribution and use in source and binary forms, with or without
4-
modification, are permitted provided that the following conditions are
5-
met:
9+
modification, are permitted provided that the following conditions are met:
610

7-
(1) Redistributions of source code must retain the above copyright
8-
notice, this list of conditions and the following disclaimer.
11+
(1) Redistributions of source code must retain the above copyright notice,
12+
this list of conditions and the following disclaimer.
913

1014
(2) Redistributions in binary form must reproduce the above copyright
1115
notice, this list of conditions and the following disclaimer in the
1216
documentation and/or other materials provided with the distribution.
1317

14-
(3) Neither the name of the University of California, Lawrence
15-
Berkeley National Laboratory, Alliance for Sustainable Energy, LLC.,
16-
National Renewable Energy Laboratory, U.S. Dept. of Energy nor the
17-
names of its contributors may be used to endorse or promote products
18-
derived from this software without specific prior written permission.
18+
(3) Neither the name of the University of California, Lawrence Berkeley
19+
National Laboratory, National Renewable Energy Laboratory, Lawrence
20+
Livermore National Laboratory, Argonne National Laboratory, U.S. Dept.
21+
of Energy nor the names of its contributors may be used to endorse or
22+
promote products derived from this software without specific prior written
23+
permission.
1924

20-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
21-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
22-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
23-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
24-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
25-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
26-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
27-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
28-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
29-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
30-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
26+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
27+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
28+
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
29+
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
30+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
31+
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
32+
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
33+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
34+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
35+
POSSIBILITY OF SUCH DAMAGE.
3136

32-
You are under no obligation whatsoever to provide any bug fixes,
33-
patches, or upgrades to the features, functionality or performance of
34-
the source code ("Enhancements") to anyone; however, if you choose to
35-
make your Enhancements available publicly
36-
without imposing a separate written license agreement for
37-
such Enhancements, then you hereby grant the following license: a
37+
You are under no obligation whatsoever to provide any bug fixes, patches,
38+
or upgrades to the features, functionality or performance of the source
39+
code ("Enhancements") to anyone; however, if you choose to make your
40+
Enhancements available either publicly, or directly to Lawrence Berkeley
41+
National Laboratory, without imposing a separate written license agreement
42+
for such Enhancements, then you hereby grant the following license: a
3843
non-exclusive, royalty-free perpetual license to install, use, modify,
3944
prepare derivative works, incorporate into other computer software,
40-
distribute, and sublicense such enhancements or derivative works
41-
thereof, in binary and source code form.
45+
distribute, and sublicense such enhancements or derivative works thereof,
46+
in binary and source code form.

0 commit comments

Comments
 (0)