Skip to content

Commit 00b9fc4

Browse files
authored
Pysam 4.2.0 (#151)
* start * revert adjustment factors changes * update Examples * update files * update build_win.bat
1 parent f82d637 commit 00b9fc4

File tree

89 files changed

+3250
-21375
lines changed

Some content is hidden

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

89 files changed

+3250
-21375
lines changed

Examples/BatteryStateful.ipynb

Lines changed: 11 additions & 11 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 4.1.0
7+
Most recently tested against PySAM 4.2.0
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 4.0.0
13+
Most recently tested against PySAM 4.2.0
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 4.1.0
6+
Most recently tested against PySAM 4.2.0
77
88
@author: frohro
99
"""

Examples/LoadToolsExample.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
"""
88
A usage example for LoadTools.get_monthly peaks with hourly annual data
9-
Requires PySAM 4.1.0 or greater
9+
Requires PySAM 4.2.0 or greater
1010
"""
1111
if __name__ == "__main__":
1212
df = pd.read_csv(str(Path(__file__).parent / "sample_load.csv"), dtype=float)

Examples/Marine energy examples/WaveFileReader_example.ipynb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"cells": [
33
{
4+
"attachments": {},
45
"cell_type": "markdown",
56
"metadata": {},
67
"source": [
@@ -19,7 +20,7 @@
1920
"name": "stdout",
2021
"output_type": "stream",
2122
"text": [
22-
"4.1.0\n"
23+
"4.2.0\n"
2324
]
2425
}
2526
],
@@ -161,7 +162,7 @@
161162
"name": "python",
162163
"nbconvert_exporter": "python",
163164
"pygments_lexer": "ipython3",
164-
"version": "3.11.0"
165+
"version": "3.8.13"
165166
},
166167
"vscode": {
167168
"interpreter": {

Examples/NonAnnualSimulation.ipynb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"metadata": {},
77
"outputs": [],
88
"source": [
9-
"# Most recently tested against PySAM 4.1.0\n",
9+
"# Most recently tested against PySAM 4.2.0\n",
1010
"\n",
1111
"import pandas as pd\n",
1212
"import json\n",
@@ -16,6 +16,7 @@
1616
]
1717
},
1818
{
19+
"attachments": {},
1920
"cell_type": "markdown",
2021
"metadata": {},
2122
"source": [
@@ -288,6 +289,7 @@
288289
]
289290
},
290291
{
292+
"attachments": {},
291293
"cell_type": "markdown",
292294
"metadata": {},
293295
"source": [
@@ -331,6 +333,7 @@
331333
]
332334
},
333335
{
336+
"attachments": {},
334337
"cell_type": "markdown",
335338
"metadata": {},
336339
"source": [

Examples/PySAMWorkshop.ipynb

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313
"\n",
1414
"https://sam.nrel.gov/software-development-kit-sdk/pysam.html\n",
1515
"\n",
16-
"Edit: Most recently tested with Version 4.1.0"
16+
"Edit: Most recently tested with Version 4.2.0"
1717
]
1818
},
1919
{
20+
"attachments": {},
2021
"cell_type": "markdown",
2122
"metadata": {},
2223
"source": [
@@ -36,6 +37,7 @@
3637
]
3738
},
3839
{
40+
"attachments": {},
3941
"cell_type": "markdown",
4042
"metadata": {},
4143
"source": [
@@ -68,6 +70,7 @@
6870
]
6971
},
7072
{
73+
"attachments": {},
7174
"cell_type": "markdown",
7275
"metadata": {},
7376
"source": [
@@ -110,6 +113,7 @@
110113
]
111114
},
112115
{
116+
"attachments": {},
113117
"cell_type": "markdown",
114118
"metadata": {},
115119
"source": [
@@ -236,6 +240,7 @@
236240
]
237241
},
238242
{
243+
"attachments": {},
239244
"cell_type": "markdown",
240245
"metadata": {},
241246
"source": [
@@ -294,6 +299,7 @@
294299
]
295300
},
296301
{
302+
"attachments": {},
297303
"cell_type": "markdown",
298304
"metadata": {},
299305
"source": [
@@ -360,7 +366,7 @@
360366
" (0.0, 0.0, 0.0, 0.0, 0.0, -0.0, 6.389046797900428, 37.94398351785478, 67.06449907636099, 92.89776429848214)\n",
361367
"\n",
362368
"annual energy value\n",
363-
" (0.0, 19406.19405690556, 19800.52382533316, 20202.44148167006, 20612.079886380227, 21029.57424662404, 21455.061069906493, 21888.678750448922, 22330.56790184979, 22780.871493923893, 23239.73432549519, 23707.302537008927, 24183.72454046737, 24669.151054164817, 25162.80184412058, 25665.452721768244, 26177.509583152998, 26699.12880537708, 27230.46804522286, 27771.6872915576, 28322.60044366972)\n"
369+
" (0.0, 19406.19405690556, 19800.52382533316, 20202.441481670056, 20612.079886380227, 21029.57424662404, 21455.061069906493, 21888.678750448922, 22330.56790184979, 22780.871493923893, 23239.73432549519, 23707.302537008924, 24183.724540467367, 24669.151054164817, 25162.80184412058, 25665.45272176825, 26177.509583152998, 26699.128805377077, 27230.468045222864, 27771.6872915576, 28322.60044366972)\n"
364370
]
365371
}
366372
],
@@ -375,6 +381,7 @@
375381
]
376382
},
377383
{
384+
"attachments": {},
378385
"cell_type": "markdown",
379386
"metadata": {},
380387
"source": [
@@ -417,6 +424,7 @@
417424
]
418425
},
419426
{
427+
"attachments": {},
420428
"cell_type": "markdown",
421429
"metadata": {},
422430
"source": [
@@ -496,10 +504,15 @@
496504
"output_type": "stream",
497505
"text": [
498506
"batt_kw\tbatt_kwh\tavg_npv\n",
499-
"10\t40\t-131785.9623201237\n",
500-
"20\t80\t-128677.60802359802\n",
501-
"30\t120\t-126139.5470983437\n",
502-
"40\t160\t-124008.21375974927\n"
507+
"10\t40\t-131785.96232012415\n",
508+
"20\t80\t-128677.60802319663\n",
509+
"30\t120\t-126139.54922129444\n",
510+
"40\t160\t-124008.20675169432\n",
511+
"50\t200\t-122370.41001778266\n",
512+
"60\t240\t-121195.93805275756\n",
513+
"70\t280\t-120204.21032777404\n",
514+
"80\t320\t-119364.54637950887\n",
515+
"90\t360\t-118652.09661186521\n"
503516
]
504517
}
505518
],

Examples/ResidentialPVBatteryWithCustomDispatch.py

Lines changed: 1 addition & 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 4.1.0
11+
Most recently tested against PySAM 4.2.0
1212
1313
@author: brtietz
1414
"""

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 4.1.0
16+
Most recently tested against PySAM 4.2.0
1717
1818
@author: frohro
1919
"""

0 commit comments

Comments
 (0)