diff --git a/legal.txt b/legal.txt deleted file mode 100644 index 1aa7c3d4..00000000 --- a/legal.txt +++ /dev/null @@ -1,17 +0,0 @@ -*** Copyright Notice *** - -PeleLM Copyright (c) 2018, 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 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 other to do so. - -**************************** diff --git a/license.txt b/license.txt index 1b851c7c..99e157db 100644 --- a/license.txt +++ b/license.txt @@ -1,8 +1,9 @@ -PeleLM Copyright (c) 2018, Alliance for Sustainable Energy, LLC., -through National Renewable Energy Laboratory and the The Regents +PeleLM Copyright (c) 2022, Alliance for Sustainable Energy, LLC., +through National Renewable Energy Laboratory, 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. +National Laboratory, National Technology and Engineering Solutions +of Sandia, LLC, and UT-Battelle, LLC (subject to receipt of any +required approvals from the U.S. Dept. of Energy). All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are @@ -17,7 +18,8 @@ documentation and/or other materials provided with the distribution. (3) Neither the name of the University of California, Lawrence Berkeley National Laboratory, Alliance for Sustainable Energy, LLC., -National Renewable Energy Laboratory, U.S. Dept. of Energy nor the +National Renewable Energy Laboratory, National Technology and Engineering +Solutions of Sandia LLC, UT-Battelle LLC, 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. @@ -37,8 +39,10 @@ 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 -National Renewable Energy Laboratory or,Lawrence Berkeley National -Laboratory, without imposing a separate written license agreement for +National Renewable Energy Laboratory, Lawrence Berkeley National +Laboratory, National Technology and Engineering Solutions +of Sandia LLC, UT-Battelle LLC, or U.S. Dept. of Energy 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,