Skip to content

Commit 2e257f8

Browse files
dguittetsjanzoucpaulgilman
authored
V3.0.2 (#121)
* files for pysam 2.2.4 * update build_manylinux.sh * update tests and conda build * update SAM_api files * closes #89 certifi certificates in fetchresource * fixes #94 * start v 2.3.0 * fix #69 * changes from 2021.12.2 release * add VersionChanges.rst * add version_differ.py * add more release info * update version_differ.py doc str * correct version_differ.py with PySSC * add python 3.10 * fix getting env variables during build and remove pandas dependency * fix test_ResouceTools.py * switch to manylinux2010 for Python 3.10 support * update pysam files * update PySAM files * Update docs for Version 3.0.1 * close #109 * remove stubs package dependency * removal of stubs package * Apple Silicon and Intel Wheel pip3 install --extra-index-url https://test.pypi.org/simple/ NREL_PySAM * update files and test * PySAM documentation revisions * update setup and tests * update files * update versions.rst * update rsts * updates for v3.0.2 * update examples Co-authored-by: sjanzou <[email protected]> Co-authored-by: sjanzou <[email protected]> Co-authored-by: Paul Gilman <[email protected]>
1 parent d269cab commit 2e257f8

File tree

214 files changed

+19512
-16864
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

214 files changed

+19512
-16864
lines changed

Examples/BatteryStateful.ipynb

Lines changed: 18 additions & 13 deletions
Large diffs are not rendered by default.

Examples/BatteryWithCustomDispatch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
55
Additional financial models, inputs, and outputs can be found at https://nrel-pysam.readthedocs.io/en/master/modules/Battery.html
66
7-
Most recently tested against PySAM 3.0.1
7+
Most recently tested against PySAM 3.0.2
88
99
@author: brtietz
1010
"""

Examples/FetchResourceFileExample.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
To use the `FetchResourceFile` function, register an email address to receive a
1111
free API key at at https://developer.nrel.gov/signup/.
1212
13-
Most recently tested against PySAM 3.0.1
13+
Most recently tested against PySAM 3.0.2
1414
1515
@authors: skoeb, cpaulgilman
1616
'''

Examples/GenericSystemSingleOwnerExample.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"""
44
Created on Wed Mar 4 13:47:58 2020
55
6-
Most recently tested against PySAM 3.0.1
6+
Most recently tested against PySAM 3.0.2
77
88
@author: frohro
99
"""

Examples/Marine energy examples/WaveFileReader_example.ipynb

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"name": "stdout",
2020
"output_type": "stream",
2121
"text": [
22-
"3.0.1\n"
22+
"3.0.2\n"
2323
]
2424
}
2525
],
@@ -56,7 +56,7 @@
5656
},
5757
{
5858
"cell_type": "code",
59-
"execution_count": 5,
59+
"execution_count": 4,
6060
"metadata": {},
6161
"outputs": [
6262
{
@@ -77,7 +77,7 @@
7777
},
7878
{
7979
"cell_type": "code",
80-
"execution_count": 6,
80+
"execution_count": 5,
8181
"metadata": {},
8282
"outputs": [],
8383
"source": [
@@ -90,7 +90,7 @@
9090
},
9191
{
9292
"cell_type": "code",
93-
"execution_count": 8,
93+
"execution_count": 6,
9494
"metadata": {},
9595
"outputs": [],
9696
"source": [
@@ -101,7 +101,7 @@
101101
},
102102
{
103103
"cell_type": "code",
104-
"execution_count": 9,
104+
"execution_count": 7,
105105
"metadata": {},
106106
"outputs": [
107107
{
@@ -147,7 +147,7 @@
147147
],
148148
"metadata": {
149149
"kernelspec": {
150-
"display_name": "Python 3",
150+
"display_name": "Python 3.7.12 ('hybrid')",
151151
"language": "python",
152152
"name": "python3"
153153
},
@@ -161,7 +161,12 @@
161161
"name": "python",
162162
"nbconvert_exporter": "python",
163163
"pygments_lexer": "ipython3",
164-
"version": "3.7.6"
164+
"version": "3.7.12"
165+
},
166+
"vscode": {
167+
"interpreter": {
168+
"hash": "be2cbe8f104d9ac6d9fabf42fbeb31737fdd025c22f444174f4d7205615d859d"
169+
}
165170
}
166171
},
167172
"nbformat": 4,

Examples/NonAnnualSimulation.ipynb

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"metadata": {},
77
"outputs": [],
88
"source": [
9-
"# Most recently tested against PySAM 3.0.1\n",
9+
"# Most recently tested against PySAM 3.0.2\n",
1010
"\n",
1111
"import pandas as pd\n",
1212
"import json\n",
@@ -421,7 +421,7 @@
421421
],
422422
"metadata": {
423423
"kernelspec": {
424-
"display_name": "Python 3",
424+
"display_name": "Python 3.7.12 ('hybrid')",
425425
"language": "python",
426426
"name": "python3"
427427
},
@@ -436,6 +436,11 @@
436436
"nbconvert_exporter": "python",
437437
"pygments_lexer": "ipython3",
438438
"version": "3.7.12"
439+
},
440+
"vscode": {
441+
"interpreter": {
442+
"hash": "be2cbe8f104d9ac6d9fabf42fbeb31737fdd025c22f444174f4d7205615d859d"
443+
}
439444
}
440445
},
441446
"nbformat": 4,

Examples/PySAMWorkshop.ipynb

Lines changed: 61 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
"\n",
1111
"dguittet\n",
1212
"\n",
13-
"https://sam.nrel.gov/software-development-kit-sdk/pysam.html"
13+
"https://sam.nrel.gov/software-development-kit-sdk/pysam.html\n",
14+
"\n",
15+
"Most recently tested with Version 3.0.2"
1416
]
1517
},
1618
{
@@ -19,7 +21,7 @@
1921
"source": [
2022
"## How to Get Started\n",
2123
"\n",
22-
"64-bit Python 3.5-3.8 for Linux, Mac and Windows\n",
24+
"64-bit Python 3.6-3.8 for Linux, Mac and Windows\n",
2325
"\n",
2426
"PyPi: \n",
2527
"```\n",
@@ -28,7 +30,7 @@
2830
"\n",
2931
"Anaconda:\n",
3032
"```\n",
31-
"conda install -u nrel nrel-pysam\n",
33+
"conda install -c nrel nrel-pysam\n",
3234
"```"
3335
]
3436
},
@@ -131,27 +133,47 @@
131133
"default(...)\n",
132134
" default(config) -> Pvwattsv8\n",
133135
" \n",
134-
" Use default attributes\n",
135-
" `config` options:\n",
136+
" Load defaults for the configuration ``config``. Available configurations are:\n",
137+
" \n",
138+
" - *\"FuelCellCommercial\"*\n",
139+
" \n",
140+
" - *\"FuelCellSingleOwner\"*\n",
141+
" \n",
142+
" - *\"PVWattsBatteryCommercial\"*\n",
143+
" \n",
144+
" - *\"PVWattsBatteryHostDeveloper\"*\n",
145+
" \n",
146+
" - *\"PVWattsBatteryResidential\"*\n",
147+
" \n",
148+
" - *\"PVWattsBatteryThirdParty\"*\n",
149+
" \n",
150+
" - *\"PVWattsAllEquityPartnershipFlip\"*\n",
151+
" \n",
152+
" - *\"PVWattsCommercial\"*\n",
153+
" \n",
154+
" - *\"PVWattsCommunitySolar\"*\n",
155+
" \n",
156+
" - *\"PVWattsHostDeveloper\"*\n",
136157
" \n",
137-
" - \"FuelCellCommercial\"\n",
138-
" - \"FuelCellSingleOwner\"\n",
139-
" - \"PVWattsBatteryCommercial\"\n",
140-
" - \"PVWattsBatteryHostDeveloper\"\n",
141-
" - \"PVWattsBatteryResidential\"\n",
142-
" - \"PVWattsBatteryThirdParty\"\n",
143-
" - \"PVWattsAllEquityPartnershipFlip\"\n",
144-
" - \"PVWattsCommercial\"\n",
145-
" - \"PVWattsCommunitySolar\"\n",
146-
" - \"PVWattsHostDeveloper\"\n",
147-
" - \"PVWattsLCOECalculator\"\n",
148-
" - \"PVWattsLeveragedPartnershipFlip\"\n",
149-
" - \"PVWattsMerchantPlant\"\n",
150-
" - \"PVWattsNone\"\n",
151-
" - \"PVWattsResidential\"\n",
152-
" - \"PVWattsSaleLeaseback\"\n",
153-
" - \"PVWattsSingleOwner\"\n",
154-
" - \"PVWattsThirdParty\"\n",
158+
" - *\"PVWattsLCOECalculator\"*\n",
159+
" \n",
160+
" - *\"PVWattsLeveragedPartnershipFlip\"*\n",
161+
" \n",
162+
" - *\"PVWattsMerchantPlant\"*\n",
163+
" \n",
164+
" - *\"PVWattsNone\"*\n",
165+
" \n",
166+
" - *\"PVWattsResidential\"*\n",
167+
" \n",
168+
" - *\"PVWattsSaleLeaseback\"*\n",
169+
" \n",
170+
" - *\"PVWattsSingleOwner\"*\n",
171+
" \n",
172+
" - *\"PVWattsThirdParty\"*\n",
173+
" \n",
174+
" .. note::\n",
175+
" \n",
176+
" Some inputs do not have default values and may be assigned a value from the variable's **Required** attribute. See variable attribute descriptions below.\n",
155177
"\n"
156178
]
157179
}
@@ -397,7 +419,7 @@
397419
"name": "stdout",
398420
"output_type": "stream",
399421
"text": [
400-
"3.0.1\n"
422+
"3.0.2\n"
401423
]
402424
}
403425
],
@@ -461,15 +483,15 @@
461483
"output_type": "stream",
462484
"text": [
463485
"batt_kw\tbatt_kwh\tavg_npv\n",
464-
"10\t40\t-153954.84677918305\n",
465-
"20\t80\t-150850.42788635375\n",
466-
"30\t120\t-148314.47573871858\n",
467-
"40\t160\t-146182.89481951922\n",
468-
"50\t200\t-144544.3197297429\n",
469-
"60\t240\t-143366.7813592981\n",
470-
"70\t280\t-142359.27146820037\n",
471-
"80\t320\t-141531.54877402788\n",
472-
"90\t360\t-140815.95125104045\n"
486+
"10\t40\t-154353.26606867867\n",
487+
"20\t80\t-151244.90880068636\n",
488+
"30\t120\t-148706.81120574806\n",
489+
"40\t160\t-146575.43792525906\n",
490+
"50\t200\t-144937.62361062184\n",
491+
"60\t240\t-143763.20766567587\n",
492+
"70\t280\t-142771.29847063648\n",
493+
"80\t320\t-141931.5901346006\n",
494+
"90\t360\t-141218.5235190545\n"
473495
]
474496
}
475497
],
@@ -504,7 +526,7 @@
504526
],
505527
"metadata": {
506528
"kernelspec": {
507-
"display_name": "Python 3",
529+
"display_name": "Python 3.7.12 ('hybrid')",
508530
"language": "python",
509531
"name": "python3"
510532
},
@@ -519,6 +541,11 @@
519541
"nbconvert_exporter": "python",
520542
"pygments_lexer": "ipython3",
521543
"version": "3.7.12"
544+
},
545+
"vscode": {
546+
"interpreter": {
547+
"hash": "be2cbe8f104d9ac6d9fabf42fbeb31737fdd025c22f444174f4d7205615d859d"
548+
}
522549
}
523550
},
524551
"nbformat": 4,

Examples/ResidentialPVBatteryWithCustomDispatch.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* PV: https://nrel-pysam.readthedocs.io/en/master/modules/Pvsamv1.html
99
* Battery: https://nrel-pysam.readthedocs.io/en/master/modules/Battery.html
1010
11-
Most recently tested against PySAM 3.0.1
11+
Most recently tested against PySAM 3.0.2
1212
1313
@author: brtietz
1414
"""
@@ -29,6 +29,7 @@
2929

3030
# Default model does not include a weather file, so set that based on the command line path
3131
system_model.SolarResource.solar_resource_file = weather_file
32+
system_model.SolarResource.use_wf_albedo = 0
3233

3334
# 24 hours of dispatch data, duplicated for each day. Would need to extend daily_dispatch for subhourly
3435
lifetime_dispatch = []

Examples/SAMsimPVWattsCommercialExample.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
Run the simulations.
1414
Print the results.
1515
16-
Most recently tested against PySAM 3.0.1
16+
Most recently tested against PySAM 3.0.2
1717
1818
@author: frohro
1919
"""

0 commit comments

Comments
 (0)