Skip to content

Commit 8bb03d8

Browse files
authored
Update name of laboratory (#1160)
* NREL -> NLR * Typo fix * Strictly less than v3.15 to allow patch to float * revert and check * Strictly less than 3.15 * Remove script-specific discalimer * Alliance for Energy Innovation
1 parent 49a1465 commit 8bb03d8

12 files changed

Lines changed: 18 additions & 45 deletions

File tree

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ blank_issues_enabled: false
22
contact_links:
33
- name: Usage question
44
url: https://github.com/NREL/floris/discussions
5-
about: Have any questions about using FLORIS? Post in Discussions to engage with the NREL team and FLORIS community.
5+
about: Have any questions about using FLORIS? Post in Discussions to engage with the NLR team and FLORIS community.

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Add the results from unit tests and regression tests here along with justificati
6464
-->
6565

6666
<!--
67-
__ For NREL use __
67+
__ For NLR use __
6868
Release checklist:
6969
- Update the version in
7070
- [ ] README.md (appears twice in README.md)

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ This document provides a high-level overview of how you can get involved.
99

1010
Have a question? Rather than opening an issue directly, please ask questions
1111
or post comments in [Q&A Discussions](https://github.com/NREL/floris/discussions/categories/q-a).
12-
The NREL team or other members of the community will assist. Your well-worded
12+
The NLR team or other members of the community will assist. Your well-worded
1313
question will serve as a resource to others searching for help.
1414

1515

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BSD 3-Clause License
22

3-
Copyright (c) 2024, Alliance for Sustainable Energy LLC, All rights reserved.
3+
Copyright (c) 2025, Alliance for Energy Innovation LLC, All rights reserved.
44

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

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
FLORIS is a controls-focused wind farm simulation software incorporating
44
steady-state engineering wake models into a performance-focused Python
5-
framework. It has been in active development at NREL since 2013 and the latest
5+
framework. It has been in active development at NLR since 2013 and the latest
66
release is [FLORIS v.4.5.1](https://github.com/NREL/floris/releases/latest).
77
Online documentation is available at https://nrel.github.io/floris.
88

@@ -68,7 +68,7 @@ and importing FLORIS:
6868
Help on package floris:
6969

7070
NAME
71-
floris - # Copyright 2024 NREL
71+
floris
7272

7373
PACKAGE CONTENTS
7474
convert_floris_input_v3_to_v4
@@ -156,7 +156,7 @@ space to show off the things you are doing with FLORIS.
156156

157157
BSD 3-Clause License
158158

159-
Copyright (c) 2024, Alliance for Sustainable Energy LLC, All rights reserved.
159+
Copyright (c) 2025, Alliance for Energy Innovation LLC, All rights reserved.
160160

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

docs/_config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# Learn more at https://jupyterbook.org/customize/config.html
33

44
title: FLORIS
5-
author: National Renewable Energy Laboratory
5+
author: National Laboratory of the Rockies
66
logo: docs_image.png
7-
copyright: '2023'
7+
copyright: '2025'
88
only_build_toc_files: false
99

1010
# Force re-execution of notebooks on each build.

docs/code_quality.ipynb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"\n",
3333
"The plot below shows the runtime performance over a series of commits for a\n",
3434
"3-turbine test case with 1,440 atmospheric conditions.\n",
35-
"This data is collected on [NREL's Kestrel supercomputer](https://nrel.github.io/HPC/Documentation/Systems/Kestrel/)."
35+
"This data is collected on [NLR's Kestrel supercomputer](https://nrel.github.io/HPC/Documentation/Systems/Kestrel/)."
3636
]
3737
},
3838
{
@@ -301,7 +301,7 @@
301301
"name": "python",
302302
"nbconvert_exporter": "python",
303303
"pygments_lexer": "ipython3",
304-
"version": "3.12.1"
304+
"version": "3.13.2"
305305
},
306306
"orig_nbformat": 4
307307
},

docs/dev_guide.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Developer's Guide
22

3-
FLORIS is maintained at NREL's National Wind Technology Center.
3+
FLORIS is maintained by NLR.
44
We are excited about community contribution, and this page outlines
55
processes and procedures to follow when contributing to the
66
source code. For technical questions regarding FLORIS usage, please
@@ -47,7 +47,7 @@ the [GitHub repository](http://github.com/nrel/floris). There,
4747
[pull requests](http://github.com/nrel/floris/pulls) are managed,
4848
questions and ideas are [discussed](https://github.com/NREL/floris/discussions),
4949
and [new versions](http://github.com/nrel/floris/releases)
50-
are released. It is the best mechanism for engaging with the NREL team
50+
are released. It is the best mechanism for engaging with the NLR team
5151
and other developers throughout the FLORIS community.
5252

5353
FLORIS development should follow "Git Flow" when interacting with the GitHub
@@ -58,7 +58,7 @@ process is detailed nicely [here](http://nvie.com/posts/a-successful-git-branchi
5858

5959
### Syncing a local repository with NREL/FLORIS
6060
The "main" FLORIS repository is continuously updated along with ongoing
61-
research at NREL. From time to time, developers of FLORIS using their own
61+
research at NLR. From time to time, developers of FLORIS using their own
6262
"local" repositories (versions of the software that exist on a local computer)
6363
may want to sync with NREL/FLORIS. To do this, use the following git commands:
6464

@@ -290,7 +290,7 @@ Be sure to complete each step in the sequence as described.
290290
291291
## Deploying to pip
292292
293-
Generally, only NREL developers will have appropriate permissions to deploy
293+
Generally, only NLR developers will have appropriate permissions to deploy
294294
FLORIS updates. When the time comes, here is a great reference on doing it
295295
is available [here](https://medium.freecodecamp.org/how-to-publish-a-pyton-package-on-pypi-a89e9522ce24).
296296

docs/installation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ and importing FLORIS:
7070
Help on package floris:
7171

7272
NAME
73-
floris - # Copyright 2024 NREL
73+
floris
7474

7575
PACKAGE CONTENTS
7676
convert_floris_input_v3_to_v4
@@ -91,7 +91,7 @@ PACKAGE CONTENTS
9191
wind_data
9292

9393
VERSION
94-
4.0
94+
4.5.1
9595

9696
FILE
9797
~/floris/floris/__init__.py

floris/core/wake_velocity/turboparkgauss.py

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
# Copyright 2021 NREL
2-
3-
# Licensed under the Apache License, Version 2.0 (the "License"); you may not
4-
# use this file except in compliance with the License. You may obtain a copy of
5-
# the License at http://www.apache.org/licenses/LICENSE-2.0
6-
7-
# Unless required by applicable law or agreed to in writing, software
8-
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
9-
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
10-
# License for the specific language governing permissions and limitations under
11-
# the License.
12-
131
from typing import Any, Dict
142

153
import numexpr as ne

0 commit comments

Comments
 (0)