Merge branch 'main' of https://github.com/NREL/pysam

NREL · May 6, 2024 · 44c49c0 · 44c49c0
2 parents 21b7b19 + c768b45
commit 44c49c0
Show file tree

Hide file tree

Showing 21 changed files with 24 additions and 1 deletion.
diff --git a/...ave_California_Wave Resource _SAM CSV.csv → ...ave_California_Wave Resource _SAM CSV.csv b/...ave_California_Wave Resource _SAM CSV.csv → ...ave_California_Wave Resource _SAM CSV.csv
diff --git a/...rgy examples/WaveFileReader_example.ipynb → ...rgy_examples/WaveFileReader_example.ipynb b/...rgy examples/WaveFileReader_example.ipynb → ...rgy_examples/WaveFileReader_example.ipynb
diff --git a/...rgy examples/Wave_resource_timeseries.csv → ...rgy_examples/Wave_resource_timeseries.csv b/...rgy examples/Wave_resource_timeseries.csv → ...rgy_examples/Wave_resource_timeseries.csv
diff --git a/...lib PySAM example/SAM-logo-horizontal.png → ...lib_PySAM_example/SAM-logo-horizontal.png b/...lib PySAM example/SAM-logo-horizontal.png → ...lib_PySAM_example/SAM-logo-horizontal.png
diff --git a/.../PVPMC pvlib PySAM example/SO_example.sam → .../PVPMC_pvlib_PySAM_example/SO_example.sam b/.../PVPMC pvlib PySAM example/SO_example.sam → .../PVPMC_pvlib_PySAM_example/SO_example.sam
diff --git a/...PySAM example/SO_example_singleowner.json → ...PySAM_example/SO_example_singleowner.json b/...PySAM example/SO_example_singleowner.json → ...PySAM_example/SO_example_singleowner.json
diff --git a/Examples/PVPMC pvlib PySAM example/capex.png → Examples/PVPMC_pvlib_PySAM_example/capex.png b/Examples/PVPMC pvlib PySAM example/capex.png → Examples/PVPMC_pvlib_PySAM_example/capex.png
diff --git a/Examples/PVPMC pvlib PySAM example/itc.png → Examples/PVPMC_pvlib_PySAM_example/itc.png b/Examples/PVPMC pvlib PySAM example/itc.png → Examples/PVPMC_pvlib_PySAM_example/itc.png
diff --git a/...PVPMC pvlib PySAM example/ppa_revenue.png → ...PVPMC_pvlib_PySAM_example/ppa_revenue.png b/...PVPMC pvlib PySAM example/ppa_revenue.png → ...PVPMC_pvlib_PySAM_example/ppa_revenue.png
diff --git a/...b PySAM example/pvlib_pysam_example.ipynb → ...b_PySAM_example/pvlib_pysam_example.ipynb b/...b PySAM example/pvlib_pysam_example.ipynb → ...b_PySAM_example/pvlib_pysam_example.ipynb
diff --git a/Examples/PVPMC pvlib PySAM example/readme.md → Examples/PVPMC_pvlib_PySAM_example/readme.md b/Examples/PVPMC pvlib PySAM example/readme.md → Examples/PVPMC_pvlib_PySAM_example/readme.md
diff --git a/...VPMC pvlib PySAM example/requirements.txt → ...VPMC_pvlib_PySAM_example/requirements.txt b/...VPMC pvlib PySAM example/requirements.txt → ...VPMC_pvlib_PySAM_example/requirements.txt
diff --git a/Examples/PVPMC pvlib PySAM example/sscapi.h → Examples/PVPMC_pvlib_PySAM_example/sscapi.h b/Examples/PVPMC pvlib PySAM example/sscapi.h → Examples/PVPMC_pvlib_PySAM_example/sscapi.h
diff --git a/Examples/Windpower Example/readme.md → Examples/Windpower_Example/readme.md b/Examples/Windpower Example/readme.md → Examples/Windpower_Example/readme.md
diff --git a/.../Windpower Example/wind-resource-file.csv → .../Windpower_Example/wind-resource-file.csv b/.../Windpower Example/wind-resource-file.csv → .../Windpower_Example/wind-resource-file.csv
diff --git a/...ples/Windpower Example/wind-turbines.json → ...ples/Windpower_Example/wind-turbines.json b/...ples/Windpower Example/wind-turbines.json → ...ples/Windpower_Example/wind-turbines.json
diff --git a/...es/Windpower Example/windpower-example.py → ...es/Windpower_Example/windpower-example.py b/...es/Windpower Example/windpower-example.py → ...es/Windpower_Example/windpower-example.py
diff --git a/...s/Windpower Example/windpower-example.sam → ...s/Windpower_Example/windpower-example.sam b/...s/Windpower Example/windpower-example.sam → ...s/Windpower_Example/windpower-example.sam
diff --git a/...s/Windpower Example/windpower-inputs.json → ...s/Windpower_Example/windpower-inputs.json b/...s/Windpower Example/windpower-inputs.json → ...s/Windpower_Example/windpower-inputs.json
diff --git a/tests/CalWave_California_Wave Resource _SAM CSV.csv b/tests/CalWave_California_Wave Resource _SAM CSV.csv
@@ -0,0 +1,23 @@
+Name,City,State,Country,Latitude,Longitude,Nearby Buoy Number,Average Power Flux (kW/m),Bathymetry,Sea Bed,Time Zone,Data Source,Notes,,,,,,,,,
+CalWave Central Coast South,Lompoc,California,United States,34.521 N,120.689 W,NDBC 46218,39.9,Gently Sloping,Sandy,-7,Sandia; SAND2015-7963,Offshore of Vandenberg Air Force Base,,,,,,,,,
+Hs/Te,0.5,1.5,2.5,3.5,4.5,5.5,6.5,7.5,8.5,9.5,10.5,11.5,12.5,13.5,14.5,15.5,16.5,17.5,18.5,19.5,20.5
+0.25,0,0,0,0,0.11,0.18,0.12,0.09,0.11,0.05,0.07,0.06,0.07,0.07,0.02,0.02,0.01,0,0,0,0
+0.75,0,0,0,0,0.04,0.16,0.13,0.05,0.12,0.1,0.07,0.15,0.17,0.08,0.03,0.02,0,0,0,0,0
+1.25,0,0,0,0,0.15,0.26,0.26,0.93,1.26,1.24,1.05,1.32,1.51,0.91,0.73,0.27,0.2,0.06,0.03,0,0
+1.75,0,0,0,0,0.11,1.16,1.42,2.4,3.5,3.63,2.55,2.19,2.8,1.93,1.63,0.7,0.45,0.21,0.11,0.01,0
+2.25,0,0,0,0,0,0.38,2.21,2.59,2.79,3.33,3.84,3.3,2.29,1.34,1.1,0.61,0.4,0.18,0.09,0.02,0
+2.75,0,0,0,0,0,0,0.43,1.78,1.84,1.76,2.84,3.01,2.37,1.28,0.76,0.33,0.27,0.09,0.05,0.02,0
+3.25,0,0,0,0,0,0,0.03,0.37,0.86,0.76,1.29,2.55,2.37,1.09,0.75,0.28,0.15,0.06,0.03,0,0
+3.75,0,0,0,0,0,0,0,0.05,0.25,0.34,0.4,1.1,1.41,0.9,0.54,0.17,0.1,0.03,0,0,0
+4.25,0,0,0,0,0,0,0,0,0.04,0.2,0.13,0.3,0.92,0.46,0.45,0.19,0.06,0.01,0,0,0
+4.75,0,0,0,0,0,0,0,0,0.01,0.05,0.06,0.13,0.53,0.33,0.23,0.09,0.02,0.01,0,0,0
+5.25,0,0,0,0,0,0,0,0,0,0.02,0,0.04,0.17,0.18,0.11,0.03,0.01,0,0,0,0
+5.75,0,0,0,0,0,0,0,0,0,0,0.01,0.02,0.08,0.14,0.07,0.03,0.01,0,0,0,0
+6.25,0,0,0,0,0,0,0,0,0,0,0,0,0.02,0.12,0.05,0.03,0.01,0,0,0,0
+6.75,0,0,0,0,0,0,0,0,0,0,0,0.01,0.01,0.06,0.04,0.01,0,0,0,0,0
+7.25,0,0,0,0,0,0,0,0,0,0,0,0,0,0.01,0.03,0,0,0,0,0,0
+7.75,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+8.25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+8.75,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+9.25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+9.75,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
diff --git a/tests/test_pysam_all.py b/tests/test_pysam_all.py
@@ -355,7 +355,7 @@ def test_import_all():
 
 sf = str(Path(__file__).parent / "blythe_ca_33.617773_-114.588261_psmv3_60_tmy.csv")
 wf = str(Path(__file__).parent / "AR Northwestern-Flat Lands.srw")
-wave_f = str(Path(__file__).parent.parent / "Examples" / "Marine energy examples" / "CalWave_California_Wave Resource _SAM CSV.csv")
+wave_f = str(Path(__file__).parent / "CalWave_California_Wave Resource _SAM CSV.csv")
 
 wavefile_model = wavefile.new()
 wavefile_model.WeatherReader.wave_resource_filename = wave_f