update NREL -> NLR

Author: cdeline

.github/workflows/pytest.yaml

@@ -44,8 +44,8 @@ jobs:
 
     - name: Install SMARTS 2.9.5
       run: |
-        wget 'https://www.nrel.gov/media/docs/libraries/grid/smarts-295-linux-tar.gz?sfvrsn=ef08b59d_1&download=true' -O /tmp/smarts.tar.gz 
-        #wget https://www.nrel.gov/grid/solar-resource/assets/data/smarts-295-linux-tar.gz -O /tmp/smarts.tar.gz
+        wget 'https://www.nlr.gov/media/docs/libraries/grid/smarts-295-linux-tar.gz?sfvrsn=ef08b59d_1&download=true' -O /tmp/smarts.tar.gz 
+        #wget https://www.nlr.gov/grid/solar-resource/assets/data/smarts-295-linux-tar.gz -O /tmp/smarts.tar.gz
         tar -xvf /tmp/smarts.tar.gz
         unlink $PWD/SMARTS_295_Linux/smarts295bat
         sed -i 's/batch=.FALSE./batch=.TRUE./g' $PWD/SMARTS_295_Linux/Source_code/smarts295.f

README.md

@@ -1,23 +1,23 @@
 ![logo](docs/images_wiki/bifacial_radiance.png)
 
 # bifacial_radiance
-Main branch: [![Build Status](https://github.com/nrel/bifacial_radiance/actions/workflows/pytest.yaml/badge.svg?branch=main)](https://github.com/nrel/bifacial_radiance/actions)
-[![Coverage Status](https://coveralls.io/repos/github/NREL/bifacial_radiance/badge.svg?branch=main)](https://coveralls.io/github/NREL/bifacial_radiance?branch=main)
+Main branch: [![Build Status](https://github.com/NatLabRockies/bifacial_radiance/actions/workflows/pytest.yaml/badge.svg?branch=main)](https://github.com/NatLabRockies/bifacial_radiance/actions)
+[![Coverage Status](https://coveralls.io/repos/github/NatLabRockies/bifacial_radiance/badge.svg?branch=main)](https://coveralls.io/github/NatLabRockies/bifacial_radiance?branch=main)
 [![Documentation Status](https://readthedocs.org/projects/bifacial-radiance/badge/?version=stable)](https://bifacial-radiance.readthedocs.io/en/latest/?badge=stable)
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3860350.svg)](https://doi.org/10.5281/zenodo.3860350)
 [![status](https://joss.theoj.org/papers/b018890e2ab7ddf723d37b17e308e273/status.svg)](https://joss.theoj.org/papers/b018890e2ab7ddf723d37b17e308e273)
 
-Development branch: [![Build Status](https://github.com/nrel/bifacial_radiance/actions/workflows/pytest.yaml/badge.svg?branch=development)](https://github.com/nrel/bifacial_radiance/actions)
-[![Coverage Status](https://coveralls.io/repos/github/NREL/bifacial_radiance/badge.svg?branch=development)](https://coveralls.io/github/NREL/bifacial_radiance?branch=development)
+Development branch: [![Build Status](https://github.com/NatLabRockies/bifacial_radiance/actions/workflows/pytest.yaml/badge.svg?branch=development)](https://github.com/NatLabRockies/bifacial_radiance/actions)
+[![Coverage Status](https://coveralls.io/repos/github/NatLabRockies/bifacial_radiance/badge.svg?branch=development)](https://coveralls.io/github/NatLabRockies/bifacial_radiance?branch=development)
 [![Documentation Status](https://readthedocs.org/projects/bifacial-radiance/badge/?version=latest)](https://bifacial-radiance.readthedocs.io/en/latest/?badge=latest)
 
 ## Introduction
 
 bifacial_radiance contains a series of Python wrapper functions to make working with 
 RADIANCE easier, particularly for the PV researcher interested in bifacial PV 
 performance.  For more information, check out our [documentation](https://bifacial-radiance.readthedocs.io), 
-[Tutorials in the form of Jupyter Notebooks](docs/tutorials/), or reffer to our [Wiki](https://github.com/NREL/bifacial_radiance/wiki)
-and [Issues](https://github.com/NREL/bifacial_radiance/issues) page. 
+[Tutorials in the form of Jupyter Notebooks](docs/tutorials/), or reffer to our [Wiki](https://github.com/NatLabRockies/bifacial_radiance/wiki)
+and [Issues](https://github.com/NatLabRockies/bifacial_radiance/issues) page. 
 
 ## Installation
 
@@ -37,7 +37,7 @@ To run the gui, import bifacial_radiance and run bifacial_radiance.gui()
 
 ## Usage
 
-We have a tutorial video, showing how the program is structured, how to use the Jupyter tutorials and the GUI. You can watch it here [Tutorial Webinar](https://www.youtube.com/watch?v=1X9L-R-RVGA), with the [slides available here](https://www.nrel.gov/docs/fy20osti/75218.pdf).
+We have a tutorial video, showing how the program is structured, how to use the Jupyter tutorials and the GUI. You can watch it here [Tutorial Webinar](https://www.youtube.com/watch?v=1X9L-R-RVGA), with the [slides available here](https://www.nlr.gov/docs/fy20osti/75218.pdf).
 
 Check out the [Jupyter Tutorial Notebooks](docs/tutorials/) to see detailed examples of the capacities of bifacial_radiance.
 The [Intro examples](https://bifacial-radiance.readthedocs.io/en/stable/introexamples.html) and the [readthedocs documentation](https://bifacial-radiance.readthedocs.io) also provide a good starting point.
@@ -48,13 +48,13 @@ We need your help to make bifacial_radiance a great tool! Please see the [Contri
 
 ## License
 
-Bifacial_radiance open source code is copyrighted by the Alliance for Sustainable Energy and licensed with BSD-3-Clause terms, found [here](https://github.com/NREL/bifacial_radiance/blob/master/LICENSE).
+Bifacial_radiance open source code is copyrighted by the Alliance for Sustainable Energy and licensed with BSD-3-Clause terms, found [here](https://github.com/NatLabRockies/bifacial_radiance/blob/master/LICENSE).
 
 ## Getting Support
 
 If you suspect that you may have discovered a bug or if you'd like to
 change something about bifacial_radiance, then please make an issue on our
-[GitHub issues page](https://github.com/NREL/bifacial_radiance/issues).
+[GitHub issues page](https://github.com/NatLabRockies/bifacial_radiance/issues).
 
 bifacial_radiance questions can be asked on
 [Stack Overflow](http://stackoverflow.com) and tagged with
@@ -74,8 +74,8 @@ If you use bifacial_radiance in a published work, please cite:
 Please also cite the DOI corresponding to the specific version of bifacial_radiance that you used. bifacial_radiance DOIs are listed at [Zenodo.org](https://zenodo.org/search?page=1&size=20&q=conceptrecid:3860349&all_versions&sort=-version)
 
 Additional bifacial_radiance publications with validation of the software include:
-* Deline, Chris, and Ayala, Silvana. Bifacial_Radiance. Computer Software. https://github.com/NREL/bifacial_radiance. USDOE Office of     Energy Efficiency and Renewable Energy (EERE), Solar Energy Technologies Office (EE-4S). 17 Dec. 2017. Web. doi:10.11578/dc.20180530.16. https://www.osti.gov/doecode/biblio/6869
-* Ayala Pelaez S, Deline C, Greenberg P, Stein JS, Kostuk RK. Model and validation of single-axis tracking with bifacial PV. IEEE J Photovoltaics. 2019;9(3):715-721. https://ieeexplore.ieee.org/document/8644027 and https://www.nrel.gov/docs/fy19osti/72039.pdf (pre-print, conference version)
+* Deline, Chris, and Ayala, Silvana. Bifacial_Radiance. Computer Software. https://github.com/NatLabRockies/bifacial_radiance. USDOE Office of     Energy Efficiency and Renewable Energy (EERE), Solar Energy Technologies Office (EE-4S). 17 Dec. 2017. Web. doi:10.11578/dc.20180530.16. https://www.osti.gov/doecode/biblio/6869
+* Ayala Pelaez S, Deline C, Greenberg P, Stein JS, Kostuk RK. Model and validation of single-axis tracking with bifacial PV. IEEE J Photovoltaics. 2019;9(3):715-721. https://ieeexplore.ieee.org/document/8644027 and https://www.nlr.gov/docs/fy19osti/72039.pdf (pre-print, conference version)
 * Ayala Pelaez, Deline C, MacAlpine M, Marion B, Stein J, Kostuk K. Comparison of Bifacial Solar Irradiance Model Predictions with Field Validation. IEEE J Photovoltaics. 2019; 9(1):82-87. https://ieeexplore.ieee.org/document/8534404
 
-Or check our [Github Wiki](https://github.com/NREL/bifacial_radiance/wiki) for a complete list of publications.
+Or check our [Github Wiki](https://github.com/NatLabRockies/bifacial_radiance/wiki) for a complete list of publications.

bifacial_radiance/load.py

@@ -254,7 +254,7 @@ def loadTrackerDict(trackerdict, fileprefix=None):
 
     print('Warning: loadTrackerDict has not been updated to the new v0.5.0' +\
           ' dictionary structure and is currently incomplete. Please' +\
-          ' reach out at github.com/NREL/bifacial_radiance/issues if' +\
+          ' reach out at github.com/NatLabRockies/bifacial_radiance/issues if' +\
           ' this is functionality you need.\n')
 
     # get list of filenames in \results\

bifacial_radiance/main.py

@@ -10,7 +10,7 @@
 Pre-requisites:
     This software is written for Python >3.6 leveraging many Anaconda tools (e.g. pandas, numpy, etc)
 
-    *RADIANCE software should be installed from https://github.com/NREL/Radiance/releases
+    *RADIANCE software should be installed from https://github.com/NatLabRockies/Radiance/releases
 
     *If you want to use gencumulativesky, move 'gencumulativesky.exe' from
     'bifacial_radiance/data' into your RADIANCE source directory.
@@ -900,9 +900,9 @@ def getEPW(self, lat=None, lon=None, GetAll=False):
         based on github/aahoo.
         
         .. warning::
-            verify=false is required to operate within NREL's network.
+            verify=false is required to operate within NLR's network.
             to avoid annoying warnings, insecurerequestwarning is disabled
-            currently this function is not working within NREL's network.  annoying!
+            currently this function is not working within NLR's network.  annoying!
         
         Parameters
         ----------
@@ -929,7 +929,7 @@ def getEPW(self, lat=None, lon=None, GetAll=False):
 
         def _returnEPWnames():
             ''' return a dataframe with the name, lat, lon, url of available files'''
-            r = requests.get('https://github.com/NREL/EnergyPlus/raw/develop/weather/master.geojson', verify=False)
+            r = requests.get('https://github.com/NatLabRockies/EnergyPlus/raw/develop/weather/master.geojson', verify=False)
             data = r.json() #metadata for available files
             #download lat/lon and url details for each .epw file into a dataframe
             df = pd.DataFrame({'url':[], 'lat':[], 'lon':[], 'name':[]})

bifacial_radiance/module.py

@@ -767,7 +767,7 @@ def calculatePerformance(self, effective_irradiance, CECMod=None,
                 CECMod = self.CECMod
             else:
                 print("No CECModule data passed; using default for Prism Solar BHC72-400")
-                #url = 'https://raw.githubusercontent.com/NREL/SAM/patch/deploy/libraries/CEC%20Modules.csv'
+                #url = 'https://raw.githubusercontent.com/NatLabRockies/SAM/patch/deploy/libraries/CEC%20Modules.csv'
                 url = os.path.join(DATA_PATH,'CEC Modules.csv')
                 db = pd.read_csv(url, index_col=0) # Reading this might take 1 min or so, the database is big.
                 modfilter2 = db.index.str.startswith('Pr') & db.index.str.endswith('BHC72-400')

pyproject.toml

@@ -9,8 +9,8 @@ description = "Tools to interface with Radiance for the PV researcher"
 readme = "README.md"
 requires-python = ">=3.8"
 authors = [
-    {name = "Chris Deline", email = "chris.deline@nrel.gov"},
-    {name = "Silvana Ovaitt", email = "silvana.ovaitt@nrel.gov"}
+    {name = "Chris Deline", email = "chris.deline@nlr.gov"},
+    {name = "Silvana Ovaitt", email = "silvana.ovaitt@nlr.gov"}
 ]
 keywords = ["bifacial", "radiance", "photovoltaics", "pv", "ray tracing"]
 classifiers = [
@@ -57,10 +57,10 @@ all = [
 ]
 
 [project.urls]
-Homepage = "https://github.com/NREL/bifacial_radiance"
+Homepage = "https://github.com/NatLabRockies/bifacial_radiance"
 Documentation = "https://bifacial-radiance.readthedocs.io"
-Repository = "https://github.com/NREL/bifacial_radiance"
-Issues = "https://github.com/NREL/bifacial_radiance/issues"
+Repository = "https://github.com/NatLabRockies/bifacial_radiance"
+Issues = "https://github.com/NatLabRockies/bifacial_radiance/issues"
 
 [tool.setuptools]
 packages = ["bifacial_radiance"]