spectra tests

updated to better capture scaling options
NREL · Jun 27, 2023 · c4e332b · c4e332b
1 parent c8d9ad7
commit c4e332b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/bifacial_radiance/main.py b/bifacial_radiance/main.py
@@ -3057,8 +3057,11 @@ def generate_spectra(self, metdata=None, simulation_path=None, ground_material=N
             os.mkdir(spectra_path)
 
         (spectral_alb, spectral_dni, spectral_dhi, weighted_alb) = su.generate_spectra(metdata=metdata,
-                            simulation_path=simulation_path, ground_material=ground_material, spectra_folder=spectra_path,
-                            scale_spectra=scale_spectra, scale_albedo=scale_albedo,
+                            simulation_path=simulation_path,
+                            ground_material=ground_material,
+                            spectra_folder=spectra_path,
+                            scale_spectra=scale_spectra,
+                            scale_albedo=scale_albedo,
                             scale_albedo_nonspectral_sim=scale_albedo_nonspectral_sim,
                             scale_upper_bound=scale_upper_bound)
 

diff --git a/bifacial_radiance/spectral_utils.py b/bifacial_radiance/spectral_utils.py
@@ -317,7 +317,6 @@ def generate_spectra(metdata, simulation_path, ground_material='Gravel', spectra
             continue
 
         # limit dataframes for calculations by scaling upper bound
-        scale_upper_bound=1200
         tdni = spectral_dni.data[spectral_dni.data.index <= scale_upper_bound]
         tdhi = spectral_dhi.data[spectral_dhi.data.index <= scale_upper_bound]
         tghi = spectral_ghi.data[spectral_ghi.data.index <= scale_upper_bound]

diff --git a/tests/test_spectra.py b/tests/test_spectra.py
@@ -48,7 +48,7 @@ def test_generate_spectra():
                                       coerce_year=2001)
 
     (spectral_alb, spectral_dni, spectral_dhi, weighted_alb) = rad_obj.generate_spectra(ground_material='Grass')
-
+        
     assert spectral_alb.data.__len__() == 2002
     assert spectral_dhi.data.index[2001] == 4000.0
     assert spectral_dni.data.iloc[400,0] == 0.8669
@@ -67,7 +67,7 @@ def test_scale_spectra():
                                                                                         scale_albedo=True)
     assert spectral_alb.data.__len__() == 2002
     assert spectral_dhi.data.index[2001] == 4000.0
-    assert (0.5074 <= spectral_dni.data.iloc[400][0] <= 0.5075)
+    assert (0.5074 <= spectral_dni.data.iloc[400][0] <= 0.40682)
     assert spectral_dni.data.iloc[400].name == 560.0
     assert weighted_alb == None