Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion mhkit/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions mhkit/dolfyn/velocity.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
Loading