From 29e0cae61e1bb8f1b94c03e7126644bf17199d92 Mon Sep 17 00:00:00 2001 From: "Donald E. Willcox" Date: Tue, 16 Mar 2021 14:58:58 -0700 Subject: [PATCH] Add LBNL variant of the BSD-3 license and copyright notice to the main source file. --- LICENSE | 27 --------------------------- Source/main.cpp | 18 ++++++++++++++++++ license.txt | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 27 deletions(-) delete mode 100644 LICENSE create mode 100644 license.txt diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 5f46575..0000000 --- a/LICENSE +++ /dev/null @@ -1,27 +0,0 @@ -Copyright 2020 Sherwood Richers and Donald E. Willcox - -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 above copyright notice, -this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above 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 copyright holder nor the names of its contributors -may be used to endorse or promote products derived from this software without -specific prior written permission. - -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 HOLDER 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. diff --git a/Source/main.cpp b/Source/main.cpp index c6d5522..5e761fe 100644 --- a/Source/main.cpp +++ b/Source/main.cpp @@ -1,3 +1,21 @@ +/* + Emu Copyright (c) 2021, 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) and University + of California, Berkeley. All rights reserved. + + If you have questions about your rights to use or distribute this software, + please contact Berkeley Lab's Intellectual Property Office at + IPO@lbl.gov. + + 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. +*/ + #include #include diff --git a/license.txt b/license.txt new file mode 100644 index 0000000..168ca59 --- /dev/null +++ b/license.txt @@ -0,0 +1,47 @@ +SOURCE CODE LICENSE AGREEMENT + +Emu Copyright (c) 2021, 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) and University +of California, Berkeley. All rights reserved. + +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 above copyright notice, +this list of conditions and the following disclaimer. + +(2) Redistributions in binary form must reproduce the above 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 and University of California, +Berkeley. nor the names of its contributors may be used to endorse or +promote products derived from this software without specific prior written +permission. + + +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. +