diff --git a/LICENSE.md b/LICENSE.md index 67b9ca56..5b6698e8 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ BSD 3-Clause License -Copyright (c) 2019, Alliance for Sustainable Energy, LLC under the terms of Contract DE-AC36-08GO28308, Battelle Memorial Institute under the terms of Contract DE-AC05-76RL01830, and National Technology & Engineering Solutions of Sandia, LLC under the terms of Contract DE-NA0003525. The U.S. Government retains certain rights in this software. +Copyright (c) 2019, Alliance for Energy Innovation, LLC under the terms of Contract DE-AC36-08GO28308, Battelle Memorial Institute under the terms of Contract DE-AC05-76RL01830, and National Technology & Engineering Solutions of Sandia, LLC under the terms of Contract DE-NA0003525. The U.S. Government retains certain rights in this software. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/README.md b/README.md index 85151bd5..a95595db 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,7 @@ See [installation instructions](https://mhkit-software.github.io/MHKiT/installat ## Copyright and license -MHKiT-Python is copyright through the National Renewable Energy Laboratory, +MHKiT-Python is copyright through the National Laboratory of the Rockies, Pacific Northwest National Laboratory, and Sandia National Laboratories. The software is distributed under the Revised BSD License. See [copyright and license](LICENSE.md) for more information. diff --git a/mhkit/__init__.py b/mhkit/__init__.py index bbdb6cef..6f9eefee 100644 --- a/mhkit/__init__.py +++ b/mhkit/__init__.py @@ -14,7 +14,7 @@ __version__ = "v1.0.1" __copyright__ = """ -Copyright 2019, Alliance for Sustainable Energy, LLC under the terms of +Copyright 2019, Alliance for Energy Innovation, LLC under the terms of Contract DE-AC36-08GO28308, Battelle Memorial Institute under the terms of Contract DE-AC05-76RL01830, and National Technology & Engineering Solutions of Sandia, LLC under the terms of Contract DE-NA0003525. The U.S. Government diff --git a/mhkit/dolfyn/velocity.py b/mhkit/dolfyn/velocity.py index bb95c40c..d69e766d 100644 --- a/mhkit/dolfyn/velocity.py +++ b/mhkit/dolfyn/velocity.py @@ -412,10 +412,10 @@ def E_coh( """ Coherent turbulent energy - Niel Kelley's 'coherent turbulence energy', which is the + Neil Kelley's 'coherent turbulence energy', which is the root-mean-square of the Reynold's stresses. - See: NREL Technical Report TP-500-52353 + See: NLR Technical Report TP-500-52353 """ E_coh = (self.upwp_**2 + self.upvp_**2 + self.vpwp_**2) ** (0.5)