Skip to content

Commit a05e2e5

Browse files
lindstrolindstro
committed
Update license info per LLNL guidelines
1 parent bcea893 commit a05e2e5

File tree

4 files changed

+55
-104
lines changed

4 files changed

+55
-104
lines changed

‎LICENSE

+19-47
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,29 @@
1-
Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC.
2-
Produced at the Lawrence Livermore National Laboratory.
3-
Written by Peter Lindstrom, Markus Salasoo, Matt Larsen, and Stephen Herbein.
4-
LLNL-CODE-663824.
5-
All rights reserved.
1+
BSD 3-Clause License
62

7-
This file is part of the zfp library.
8-
For details, see http://computing.llnl.gov/casc/zfp/.
3+
Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC
4+
All rights reserved.
95

106
Redistribution and use in source and binary forms, with or without
117
modification, are permitted provided that the following conditions are met:
128

13-
1. Redistributions of source code must retain the above copyright notice,
14-
this list of conditions and the disclaimer below.
9+
* Redistributions of source code must retain the above copyright notice, this
10+
list of conditions and the following disclaimer.
1511

16-
2. Redistributions in binary form must reproduce the above copyright notice,
17-
this list of conditions and the disclaimer (as noted below) in the
18-
documentation and/or other materials provided with the distribution.
12+
* Redistributions in binary form must reproduce the above copyright notice,
13+
this list of conditions and the following disclaimer in the documentation
14+
and/or other materials provided with the distribution.
1915

20-
3. Neither the name of the LLNS/LLNL nor the names of its contributors may
21-
be used to endorse or promote products derived from this software without
22-
specific prior written permission.
16+
* Neither the name of the copyright holder nor the names of its
17+
contributors may be used to endorse or promote products derived from
18+
this software without specific prior written permission.
2319

2420
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
2521
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
26-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
27-
ARE DISCLAIMED. IN NO EVENT SHALL LAWRENCE LIVERMORE NATIONAL SECURITY,
28-
LLC, THE U.S. DEPARTMENT OF ENERGY OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
29-
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
30-
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
31-
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
32-
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
33-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
34-
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
35-
36-
37-
Additional BSD Notice
38-
39-
1. This notice is required to be provided under our contract with the U.S.
40-
Department of Energy (DOE). This work was produced at Lawrence Livermore
41-
National Laboratory under Contract No. DE-AC52-07NA27344 with the DOE.
42-
43-
2. Neither the United States Government nor Lawrence Livermore National
44-
Security, LLC nor any of their employees, makes any warranty, express or
45-
implied, or assumes any liability or responsibility for the accuracy,
46-
completeness, or usefulness of any information, apparatus, product, or
47-
process disclosed, or represents that its use would not infringe
48-
privately-owned rights.
49-
50-
3. Also, reference herein to any specific commercial products, process, or
51-
services by trade name, trademark, manufacturer or otherwise does not
52-
necessarily constitute or imply its endorsement, recommendation, or
53-
favoring by the United States Government or Lawrence Livermore National
54-
Security, LLC. The views and opinions of authors expressed herein do not
55-
necessarily state or reflect those of the United States Government or
56-
Lawrence Livermore National Security, LLC, and shall not be used for
57-
advertising or product endorsement purposes.
22+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
23+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
24+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
26+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
27+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
28+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

‎NOTICE

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
This work was produced under the auspices of the U.S. Department of
2+
Energy by Lawrence Livermore National Laboratory under Contract
3+
DE-AC52-07NA27344.
4+
5+
This work was prepared as an account of work sponsored by an agency of
6+
the United States Government. Neither the United States Government nor
7+
Lawrence Livermore National Security, LLC, nor any of their employees
8+
makes any warranty, expressed or implied, or assumes any legal liability
9+
or responsibility for the accuracy, completeness, or usefulness of any
10+
information, apparatus, product, or process disclosed, or represents that
11+
its use would not infringe privately owned rights.
12+
13+
Reference herein to any specific commercial product, process, or service
14+
by trade name, trademark, manufacturer, or otherwise does not necessarily
15+
constitute or imply its endorsement, recommendation, or favoring by the
16+
United States Government or Lawrence Livermore National Security, LLC.
17+
18+
The views and opinions of authors expressed herein do not necessarily
19+
state or reflect those of the United States Government or Lawrence
20+
Livermore National Security, LLC, and shall not be used for advertising
21+
or product endorsement purposes.

‎README.md

+12
Original file line numberDiff line numberDiff line change
@@ -140,3 +140,15 @@ compressed, which will be indicated by checksum errors. If most tests
140140
succeed and the failures result in byte sizes and error values reasonably
141141
close to the expected values, then it is likely that the compressor is
142142
working correctly.
143+
144+
145+
LICENSE
146+
-------
147+
148+
zfp is distributed under the terms of the BSD 3-Clause license. See the
149+
files [LICENSE](https://github.com/LLNL/zfp/blob/develop/LICENSE) and
150+
[NOTICE](https://github.com/LLNL/zfp/blob/develop/NOTICE) for details.
151+
152+
SPDX-License-Identifier: BSD-3-Clause
153+
154+
LLNL-CODE-663824

‎include/zfp.h

+3-57
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,7 @@
11
/*
2-
** Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC.
3-
** Produced at the Lawrence Livermore National Laboratory.
4-
** Authors: Peter Lindstrom, Markus Salasoo, Matt Larsen, Stephen Herbein.
5-
** LLNL-CODE-663824.
6-
** All rights reserved.
7-
**
8-
** This file is part of the zfp library.
9-
** For details, see http://computing.llnl.gov/casc/zfp/.
10-
**
11-
** Redistribution and use in source and binary forms, with or without
12-
** modification, are permitted provided that the following conditions are met:
13-
**
14-
** 1. Redistributions of source code must retain the above copyright notice,
15-
** this list of conditions and the disclaimer below.
16-
**
17-
** 2. Redistributions in binary form must reproduce the above copyright notice,
18-
** this list of conditions and the disclaimer (as noted below) in the
19-
** documentation and/or other materials provided with the distribution.
20-
**
21-
** 3. Neither the name of the LLNS/LLNL nor the names of its contributors may
22-
** be used to endorse or promote products derived from this software without
23-
** specific prior written permission.
24-
**
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 LAWRENCE LIVERMORE NATIONAL SECURITY,
29-
** LLC, THE U.S. DEPARTMENT OF ENERGY OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
30-
** INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
31-
** (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
32-
** LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
33-
** ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
34-
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35-
** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36-
**
37-
**
38-
** Additional BSD Notice
39-
**
40-
** 1. This notice is required to be provided under our contract with the U.S.
41-
** Department of Energy (DOE). This work was produced at Lawrence Livermore
42-
** National Laboratory under Contract No. DE-AC52-07NA27344 with the DOE.
43-
44-
** 2. Neither the United States Government nor Lawrence Livermore National
45-
** Security, LLC nor any of their employees, makes any warranty, express or
46-
** implied, or assumes any liability or responsibility for the accuracy,
47-
** completeness, or usefulness of any information, apparatus, product, or
48-
** process disclosed, or represents that its use would not infringe
49-
** privately-owned rights.
50-
**
51-
** 3. Also, reference herein to any specific commercial products, process, or
52-
** services by trade name, trademark, manufacturer or otherwise does not
53-
** necessarily constitute or imply its endorsement, recommendation, or
54-
** favoring by the United States Government or Lawrence Livermore National
55-
** Security, LLC. The views and opinions of authors expressed herein do not
56-
** necessarily state or reflect those of the United States Government or
57-
** Lawrence Livermore National Security, LLC, and shall not be used for
58-
** advertising or product endorsement purposes.
2+
** Copyright (c) 2014-2019, Lawrence Livermore National Security, LLC and
3+
** other zfp project contributors. See the top-level LICENSE file for details.
4+
** SPDX-License-Identifier: BSD-3-Clause
595
*/
606

617
#ifndef ZFP_H

0 commit comments

Comments
 (0)