Merge branch 'main' into development

Author: cdeline

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/NatLabRockies/Radiance/releases
+    *RADIANCE software should be installed from https://github.com/LBNL-ETA/Radiance/releases
 
     *If you want to use gencumulativesky, move 'gencumulativesky.exe' from
     'bifacial_radiance/data' into your RADIANCE source directory.
@@ -332,9 +332,9 @@ def _make_reinhart_bands(M):
     with n_az*M azimuth patches and az_step/M degrees per patch.
     The zenith band (n_az==1) is left as a single patch regardless of M.
 
-    Patch counts: M=1 → 145, M=2 → 577 (= M²×144 + 1), M=4 → 2305.
+    Patch counts: M=1 ? 145, M=2 ? 577 (= M²×144 + 1), M=4 ? 2305.
     """
-    # Tregenza M=1 base band structure — used as the template for all M values
+    # Tregenza M=1 base band structure — used as the template for all M values
     _TREGENZA_BANDS = [
         ( 0, 12, 30, 12.0),
         (12, 24, 30, 12.0),
@@ -343,7 +343,7 @@ def _make_reinhart_bands(M):
         (48, 60, 18, 20.0),
         (60, 72, 12, 30.0),
         (72, 84,  6, 60.0),
-        (84, 90,  1, 360.0),  # zenith — never subdivided
+        (84, 90,  1, 360.0),  # zenith — never subdivided
     ]
 
     bands = []
@@ -416,12 +416,12 @@ def _mtx_to_cal(patches, M=1, sky_path='skies', savefile='cumulative'):
             vals = sky_irr[patch_idx: patch_idx + n]
             patch_idx += n
 
-            if n == 1:  # zenith — no azimuth dependency
+            if n == 1:  # zenith — no azimuth dependency
                 f.write(f"row{row_idx}=if(and(alt-{alt_lo}, {alt_hi}-alt),"
                         f"{vals[0]:.6f},0);\n\n")
             else:
                 # Append vals[0] at the end as wrap-around guard.
-                # When az is near 360°, select() index reaches n+1; the repeated
+                # When az is near 360°, select() index reaches n+1; the repeated
                 # first value matches the genCumSky convention and avoids a
                 # "select(): domain error" from rtrace.
                 vals_wrap = list(vals) + [vals[0]]
@@ -2038,13 +2038,13 @@ def _count_wea_timesteps(weafile):
 
             if debug:
                 print(f"Patches shape:          {patches.shape}  (should be (n_sky+1) x 3)")
-                print(f"Row  0 — ground patch:  {patches[0]}  (expect equal R=G=B)")
-                print(f"Row  1 — lowest sky:    {patches[1]}")
-                print(f"Row 30 — end of band 0: {patches[30]}")
-                print(f"Row 31 — start band 1:  {patches[31]}")
-                print(f"Row -1 — zenith:        {patches[-1]}")
+                print(f"Row  0 — ground patch:  {patches[0]}  (expect equal R=G=B)")
+                print(f"Row  1 — lowest sky:    {patches[1]}")
+                print(f"Row 30 — end of band 0: {patches[30]}")
+                print(f"Row 31 — start band 1:  {patches[31]}")
+                print(f"Row -1 — zenith:        {patches[-1]}")
                 print(f"\nScalar irradiance range (sky patches only): "
-                    f"{patches[1:].mean(axis=1).min():.2f} – {patches[1:].mean(axis=1).max():.2f}")
+                    f"{patches[1:].mean(axis=1).min():.2f} – {patches[1:].mean(axis=1).max():.2f}")
                 gendaymtx_total = patches[1:].mean(axis=1).sum()
                 n_sky = patches.shape[0] - 1
                 print(f"\nTotal cumulative sky irradiance (gendaymtx, {n_sky} patches): {gendaymtx_total:.1f}")
@@ -2083,8 +2083,8 @@ def _count_wea_timesteps(weafile):
 
     def _cal_to_rad(self, sky_path='skies', savefile='cumulative'):
         """
-        Wrap a .cal file in a Radiance sky .rad description — same template
-        as genCumSky() — so it can be passed directly to demo.makeOct().
+        Wrap a .cal file in a Radiance sky .rad description — same template
+        as genCumSky() — so it can be passed directly to demo.makeOct().
         Used inside genCumSky() when use_mtx=True.
 
         Parameters

docs/sphinx/source/whatsnew.rst

@@ -7,6 +7,7 @@ What's New
 These are new features and improvements of note in each release.
 
 .. include:: whatsnew/pending.rst
+.. include:: whatsnew/v0.5.2.rst
 .. include:: whatsnew/v0.5.1.rst
 .. include:: whatsnew/v0.5.0.rst
 .. include:: whatsnew/v0.4.4.rst

docs/sphinx/source/whatsnew/v0.5.2.rst

@@ -0,0 +1,18 @@
+.. _whatsnew_052:
+
+v0.5.2 (May 29, 2026)
+------------------------
+Bugfix release
+
+
+Bug fixes
+~~~~~~~~~
+* Change references that had been nrel.gov domain to nlr.gov domain.
+* Change Github references from github.com/nrel/ to github.com/NatLabRockies/
+
+Documentation
+~~~~~~~~~~~~~~
+
+Contributors
+~~~~~~~~~~~~
+* Chris Deline (:ghuser:`cdeline`)

docs/tutorials/13 - Modeling Modules with Glass.ipynb

@@ -218,7 +218,7 @@
     "\n",
     "***7. Annotate the image with convert***\n",
     "\n",
-    "    convert render.png -fill black -gravity South -annotate +0+5 'Created with NREL bifacial_radiance https://github.com/NREL/bifacial_radiance' render_annotated.png\n"
+    "    convert render.png -fill black -gravity South -annotate +0+5 'Created with NREL bifacial_radiance https://github.com/NatLabRockies/bifacial_radiance' render_annotated.png\n"
    ]
   },
   {

docs/tutorials/13 - Modeling Modules with Glass.py

@@ -132,7 +132,7 @@
 # 
 # ***7. Annotate the image with convert***
 # 
-#     convert render.png -fill black -gravity South -annotate +0+5 'Created with NREL bifacial_radiance https://github.com/NREL/bifacial_radiance' render_annotated.png
+#     convert render.png -fill black -gravity South -annotate +0+5 'Created with NREL bifacial_radiance https://github.com/NatLabRockies/bifacial_radiance' render_annotated.png
 # 
 
 # In[4]:

docs/tutorials/2 - Single Axis Tracking Yearly Simulation.ipynb

@@ -40,7 +40,7 @@
     "\n",
     "This procedure was presented in:\n",
     "\n",
-    "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–21. https://ieeexplore.ieee.org/document/8644027 and https://www.nrel.gov/docs/fy19osti/72039.pdf (pre-print, conference version)\n",
+    "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–21. https://ieeexplore.ieee.org/document/8644027 and https://www.nlr.gov/docs/fy19osti/72039.pdf (pre-print, conference version)\n",
     "\n",
     "\n",
     "***Steps:***\n",

docs/tutorials/2 - Single Axis Tracking Yearly Simulation.py

@@ -23,7 +23,7 @@
 # 
 # This procedure was presented in:
 # 
-# 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–21. https://ieeexplore.ieee.org/document/8644027 and https://www.nrel.gov/docs/fy19osti/72039.pdf (pre-print, conference version)
+# 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–21. https://ieeexplore.ieee.org/document/8644027 and https://www.nlr.gov/docs/fy19osti/72039.pdf (pre-print, conference version)
 # 
 # 
 # ***Steps:***

docs/tutorials/21 - Weather to Module Performance.ipynb

@@ -108,7 +108,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "url = 'https://raw.githubusercontent.com/NREL/SAM/patch/deploy/libraries/CEC%20Modules.csv'\n",
+    "url = 'https://raw.githubusercontent.com/NatLabRockies/SAM/patch/deploy/libraries/CEC%20Modules.csv'\n",
     "db = pd.read_csv(url, index_col=0) # Reading this might take 1 min or so, the database is big."
    ]
   },

docs/tutorials/21 - Weather to Module Performance.py

@@ -52,7 +52,7 @@
 # In[4]:
 
 
-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'
 db = pd.read_csv(url, index_col=0) # Reading this might take 1 min or so, the database is big.
 
 

docs/tutorials/8 - Electrical Mismatch Method.ipynb

@@ -41,9 +41,9 @@
     "\n",
     "* Deline, C., Ayala Pelaez, S., MacAlpine, S., Olalla, C. Estimating and Parameterizing Mismatch Power Loss in Bifacial Photovoltaic Systems. Progress in PV 2020, https://doi.org/10.1002/pip.3259\n",
     "\n",
-    "* Deline C, Ayala Pelaez S, MacAlpine S, Olalla C. Bifacial PV System Mismatch Loss Estimation & Parameterization. Presented in: 36th EU PVSEC, Marseille Fr. Slides: https://www.nrel.gov/docs/fy19osti/74885.pdf. Proceedings: https://www.nrel.gov/docs/fy20osti/73541.pdf\n",
+    "* Deline C, Ayala Pelaez S, MacAlpine S, Olalla C. Bifacial PV System Mismatch Loss Estimation & Parameterization. Presented in: 36th EU PVSEC, Marseille Fr. Slides: https://www.nlr.gov/docs/fy19osti/74885.pdf. Proceedings: https://www.nlr.gov/docs/fy20osti/73541.pdf\n",
     "\n",
-    "* Ayala Pelaez S, Deline C, MacAlpine S, Olalla C. Bifacial PV system mismatch loss estimation. Poster presented at the 6th BifiPV Workshop, Amsterdam 2019. https://www.nrel.gov/docs/fy19osti/74831.pdf and http://bifipv-workshop.com/index.php?id=amsterdam-2019-program \n",
+    "* Ayala Pelaez S, Deline C, MacAlpine S, Olalla C. Bifacial PV system mismatch loss estimation. Poster presented at the 6th BifiPV Workshop, Amsterdam 2019. https://www.nlr.gov/docs/fy19osti/74831.pdf and http://bifipv-workshop.com/index.php?id=amsterdam-2019-program \n",
     "\n",
     "Ideally **mismatch losses M** should be calculated for the whole year, and then the **mismatch loss factor to apply to Grear \"Lrear\"** required by due diligence softwares can be calculated:\n",
     "\n",