Skip to content

Commit e36cd34

Browse files
dguittetdguittet
committed
update adjustmentfactors
1 parent 894b81b commit e36cd34

File tree

193 files changed

+14248
-61158
lines changed

Some content is hidden

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

193 files changed

+14248
-61158
lines changed

‎Examples/100kW_PVWatts.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎Examples/100mW_Generic.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"system_use_lifetime_output" : 0,
1010
"analysis_period" : 25,
1111
"generic_degradation" : [ 0 ],
12-
"adjust:constant" : 0,
12+
"adjust_constant" : 0,
1313
"en_batt" : 0,
1414
"batt_replacement_option" : 0,
1515
"batt_chem" : 1,

‎Examples/NonAnnualSimulation.ipynb

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

‎Examples/PySAMWorkshop.ipynb

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
},
5757
{
5858
"cell_type": "code",
59-
"execution_count": 1,
59+
"execution_count": 3,
6060
"metadata": {},
6161
"outputs": [],
6262
"source": [
@@ -76,7 +76,7 @@
7676
},
7777
{
7878
"cell_type": "code",
79-
"execution_count": 2,
79+
"execution_count": 4,
8080
"metadata": {},
8181
"outputs": [
8282
{
@@ -98,7 +98,7 @@
9898
" 'Outputs': {}}"
9999
]
100100
},
101-
"execution_count": 2,
101+
"execution_count": 4,
102102
"metadata": {},
103103
"output_type": "execute_result"
104104
}
@@ -123,7 +123,7 @@
123123
},
124124
{
125125
"cell_type": "code",
126-
"execution_count": 3,
126+
"execution_count": 5,
127127
"metadata": {},
128128
"outputs": [
129129
{
@@ -199,7 +199,7 @@
199199
},
200200
{
201201
"cell_type": "code",
202-
"execution_count": 4,
202+
"execution_count": 6,
203203
"metadata": {},
204204
"outputs": [
205205
{
@@ -244,16 +244,16 @@
244244
" 'shading_mxh': ((0.0,),),\n",
245245
" 'shading_string_option': 0.0,\n",
246246
" 'shading_timestep': ((0.0,),)},\n",
247-
" 'AdjustmentFactors': {'constant': 0.0,\n",
248-
" 'en_periods': 0.0,\n",
249-
" 'en_timeindex': 0.0,\n",
250-
" 'periods': ((0.0, 0.0, 0.0),),\n",
251-
" 'timeindex': (0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0)},\n",
247+
" 'AdjustmentFactors': {'adjust_constant': 0.0,\n",
248+
" 'adjust_en_periods': 0.0,\n",
249+
" 'adjust_en_timeindex': 0.0,\n",
250+
" 'adjust_periods': ((0.0, 0.0, 0.0),),\n",
251+
" 'adjust_timeindex': (0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0)},\n",
252252
" 'HybridCosts': {},\n",
253253
" 'Outputs': {}}"
254254
]
255255
},
256-
"execution_count": 4,
256+
"execution_count": 6,
257257
"metadata": {},
258258
"output_type": "execute_result"
259259
}
@@ -283,7 +283,7 @@
283283
},
284284
{
285285
"cell_type": "code",
286-
"execution_count": 5,
286+
"execution_count": 7,
287287
"metadata": {},
288288
"outputs": [
289289
{
@@ -303,7 +303,7 @@
303303
},
304304
{
305305
"cell_type": "code",
306-
"execution_count": 6,
306+
"execution_count": 8,
307307
"metadata": {},
308308
"outputs": [
309309
{
@@ -334,7 +334,7 @@
334334
},
335335
{
336336
"cell_type": "code",
337-
"execution_count": 7,
337+
"execution_count": 9,
338338
"metadata": {},
339339
"outputs": [
340340
{
@@ -343,7 +343,7 @@
343343
"(0.0,)"
344344
]
345345
},
346-
"execution_count": 7,
346+
"execution_count": 9,
347347
"metadata": {},
348348
"output_type": "execute_result"
349349
}
@@ -355,7 +355,7 @@
355355
},
356356
{
357357
"cell_type": "code",
358-
"execution_count": 8,
358+
"execution_count": 10,
359359
"metadata": {},
360360
"outputs": [
361361
{
@@ -379,7 +379,7 @@
379379
},
380380
{
381381
"cell_type": "code",
382-
"execution_count": 9,
382+
"execution_count": 11,
383383
"metadata": {},
384384
"outputs": [
385385
{
@@ -418,7 +418,7 @@
418418
},
419419
{
420420
"cell_type": "code",
421-
"execution_count": 10,
421+
"execution_count": 12,
422422
"metadata": {},
423423
"outputs": [
424424
{
@@ -433,7 +433,7 @@
433433
" 'Outputs': {}}"
434434
]
435435
},
436-
"execution_count": 10,
436+
"execution_count": 12,
437437
"metadata": {},
438438
"output_type": "execute_result"
439439
}
@@ -459,14 +459,14 @@
459459
},
460460
{
461461
"cell_type": "code",
462-
"execution_count": 11,
462+
"execution_count": 13,
463463
"metadata": {},
464464
"outputs": [
465465
{
466466
"name": "stdout",
467467
"output_type": "stream",
468468
"text": [
469-
"6.0.0\n"
469+
"6.0.2\n"
470470
]
471471
}
472472
],
@@ -482,7 +482,7 @@
482482
},
483483
{
484484
"cell_type": "code",
485-
"execution_count": 15,
485+
"execution_count": 14,
486486
"metadata": {},
487487
"outputs": [
488488
{
@@ -522,23 +522,23 @@
522522
},
523523
{
524524
"cell_type": "code",
525-
"execution_count": 16,
525+
"execution_count": 15,
526526
"metadata": {},
527527
"outputs": [
528528
{
529529
"name": "stdout",
530530
"output_type": "stream",
531531
"text": [
532532
"batt_kw\tbatt_kwh\tavg_npv\n",
533-
"10\t40\t-147282.62802741112\n",
534-
"20\t80\t-145571.75869861347\n",
535-
"30\t120\t-143772.44380822402\n",
536-
"40\t160\t-142048.65461913403\n",
537-
"50\t200\t-140455.99081696098\n",
538-
"60\t240\t-139157.33053290664\n",
539-
"70\t280\t-137966.71685081776\n",
540-
"80\t320\t-136942.25426736692\n",
541-
"90\t360\t-136015.89108209618\n"
533+
"10\t40\t-147473.65633643177\n",
534+
"20\t80\t-145960.27700371345\n",
535+
"30\t120\t-144348.78036862888\n",
536+
"40\t160\t-142720.9237405408\n",
537+
"50\t200\t-141223.67201064204\n",
538+
"60\t240\t-139892.3043450741\n",
539+
"70\t280\t-138795.76235376217\n",
540+
"80\t320\t-137730.97718782522\n",
541+
"90\t360\t-136833.80261780682\n"
542542
]
543543
}
544544
],
@@ -573,7 +573,7 @@
573573
],
574574
"metadata": {
575575
"kernelspec": {
576-
"display_name": "pysam_build_3.10",
576+
"display_name": "watertap",
577577
"language": "python",
578578
"name": "python3"
579579
},
@@ -587,7 +587,7 @@
587587
"name": "python",
588588
"nbconvert_exporter": "python",
589589
"pygments_lexer": "ipython3",
590-
"version": "3.10.13"
590+
"version": "3.9.17"
591591
}
592592
},
593593
"nbformat": 4,

‎Examples/SelectingModuleandInverterExample/Row2Prism.json

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

‎benchmark.py

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

‎docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import sphinx_rtd_theme
1717

1818
sys.path.insert(0, "..")
19-
19+
print(sys.executable)
2020
master_doc = 'index'
2121

2222
# -- Project information -----------------------------------------------------

‎docs/lists/models.rst

Lines changed: 4 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@
2525
:doc:`../modules/CbEmpiricalHceHeatLoss` (HD)
2626
Empirical HCE Heat Loss
2727

28-
:doc:`../modules/CbMsptSystemCosts` (HD)
29-
CSP molten salt power tower system costs
30-
3128
:doc:`../modules/Communitysolar`
3229
Comunity Solar Financial Model
3330

3431
:doc:`../modules/CspDsgLfUi` (HD)
3532
Calculates values for all calculated values on UI TES page(s)
3633

34+
:doc:`../modules/CspHeatsink` (HD)
35+
CSP heat sink
36+
3737
:doc:`../modules/CspSubcomponent`
3838
CSP subcomponents
3939

@@ -91,9 +91,6 @@
9191
:doc:`../modules/IphToLcoefcr`
9292
Convert annual energy to kWt-hr and adjust fixed cost to include electric parasitic costs.
9393

94-
:doc:`../modules/Ippppa` (HD)
95-
Utility IPP/Commerical PPA Finance model.
96-
9794
:doc:`../modules/Irradproc` (HD)
9895
Irradiance Processor
9996

@@ -196,9 +193,6 @@
196193
:doc:`../modules/Swh`
197194
Solar water heating model using multi-mode tank node model.
198195

199-
:doc:`../modules/TcsMSLF` (HD)
200-
CSP model using the molten salt linear fresnel TCS types.
201-
202196
:doc:`../modules/TcsgenericSolar`
203197
Generic CSP model using the generic solar TCS types.
204198

@@ -211,9 +205,6 @@
211205
:doc:`../modules/TcstroughEmpirical`
212206
CSP model using the emperical trough TCS types.
213207

214-
:doc:`../modules/TcstroughPhysical` (HD)
215-
CSP model using the emperical trough TCS types.
216-
217208
:doc:`../modules/TestUdPowerCycle` (HD)
218209
Test user-defined power cylce model
219210

@@ -238,27 +229,12 @@
238229
:doc:`../modules/TroughPhysicalIph` (HD)
239230
Physical trough iph applications
240231

241-
:doc:`../modules/UiTesCalcs` (HD)
242-
Calculates values for all calculated values on UI TES page(s)
243-
244232
:doc:`../modules/UiUdpcChecks` (HD)
245233
Calculates the levels and number of paramteric runs for 3 udpc ind variables
246234

247235
:doc:`../modules/UserHtfComparison` (HD)
248236
Evaluates equivalence of two user-defined HTF tables
249237

250-
:doc:`../modules/Utilityrate` (HD)
251-
Electricity bill calculator (deprecated)
252-
253-
:doc:`../modules/Utilityrate2` (HD)
254-
Electricity bill calculator based on OpenEI Version 2 (deprecated)
255-
256-
:doc:`../modules/Utilityrate3` (HD)
257-
Electricity bill calculator based on OpenEI Version 3 (deprecated)
258-
259-
:doc:`../modules/Utilityrate4` (HD)
260-
Electricity bill calculator based on OpenEI Version 4 (deprecated)
261-
262238
:doc:`../modules/Utilityrate5`
263239
Electricity bill calculator based on OpenEI Version 8
264240

@@ -305,9 +281,9 @@
305281
../modules/CashloanHeat.rst
306282
../modules/CbConstructionFinancing.rst
307283
../modules/CbEmpiricalHceHeatLoss.rst
308-
../modules/CbMsptSystemCosts.rst
309284
../modules/Communitysolar.rst
310285
../modules/CspDsgLfUi.rst
286+
../modules/CspHeatsink.rst
311287
../modules/CspSubcomponent.rst
312288
../modules/CustomGeneration.rst
313289
../modules/Equpartflip.rst
@@ -327,7 +303,6 @@
327303
../modules/Iec61853par.rst
328304
../modules/InvCecCg.rst
329305
../modules/IphToLcoefcr.rst
330-
../modules/Ippppa.rst
331306
../modules/Irradproc.rst
332307
../modules/Layoutarea.rst
333308
../modules/Lcoefcr.rst
@@ -362,12 +337,10 @@
362337
../modules/Snowmodel.rst
363338
../modules/Solarpilot.rst
364339
../modules/Swh.rst
365-
../modules/TcsMSLF.rst
366340
../modules/TcsgenericSolar.rst
367341
../modules/TcslinearFresnel.rst
368342
../modules/TcsmoltenSalt.rst
369343
../modules/TcstroughEmpirical.rst
370-
../modules/TcstroughPhysical.rst
371344
../modules/TestUdPowerCycle.rst
372345
../modules/Thermalrate.rst
373346
../modules/ThermalrateIph.rst
@@ -376,13 +349,8 @@
376349
../modules/Timeseq.rst
377350
../modules/TroughPhysical.rst
378351
../modules/TroughPhysicalIph.rst
379-
../modules/UiTesCalcs.rst
380352
../modules/UiUdpcChecks.rst
381353
../modules/UserHtfComparison.rst
382-
../modules/Utilityrate.rst
383-
../modules/Utilityrate2.rst
384-
../modules/Utilityrate3.rst
385-
../modules/Utilityrate4.rst
386354
../modules/Utilityrate5.rst
387355
../modules/Utilityrateforecast.rst
388356
../modules/WaveFileReader.rst

‎docs/modules/Battery.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,8 @@ Revenue Group
170170
AdjustmentFactors Group
171171
------------------------
172172

173-
.. autoclass:: PySAM.AdjustmentFactors.AdjustmentFactors
173+
.. autoclass:: PySAM.Battery.Battery.AdjustmentFactors
174174
:members:
175-
:noindex:
176175

177176
ElectricityRates Group
178177
-----------------------

‎docs/modules/Battwatts.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,8 @@ Load Group
4242
AdjustmentFactors Group
4343
------------------------
4444

45-
.. autoclass:: PySAM.AdjustmentFactors.AdjustmentFactors
45+
.. autoclass:: PySAM.Battwatts.Battwatts.AdjustmentFactors
4646
:members:
47-
:noindex:
4847

4948
GridLimits Group
5049
-----------------

0 commit comments

Comments
 (0)