Skip to content

Commit 53cdb2e

Browse files
tyneisestyneises
committed
Merge branch 'csp-controller-target-net-power' of https://github.com/nrel/SAM into csp-controller-target-net-power
2 parents 21ebae3 + 7892bee commit 53cdb2e

22 files changed

+68173
-6
lines changed

‎api/api_autogen/data_structures.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ static std::unordered_map<std::string, std::string> config_to_cmod_name = {
208208
{"PVBattery", "Pvsamv1"},
209209
{"PVWatts", "Pvwattsv8"},
210210
{"PVWattsBattery", "BattWatts"},
211+
{"PVWattsCSPTowerMoltenSaltBatteryHybrid", "Pvwattsv8,TcsmoltenSalt,Battery"},
211212
{"PVWattsWindBatteryHybrid", "Pvwattsv8,Windpower,Battery"},
212213
{"PVWattsWindFuelCellBatteryHybrid", "Pvwattsv8,Windpower,Fuelcell,Battery"},
213214
{"PTES", "EtesPtes"},

‎api/api_autogen/library/defaults/Battery_PVWattsCSPTowerMoltenSaltBatteryHybridSingleOwner.json‎

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

‎api/api_autogen/library/defaults/Grid_PVWattsCSPTowerMoltenSaltBatteryHybridSingleOwner.json‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"defaults": {
3+
"Lifetime": {
4+
"analysis_period": 30
5+
},
6+
"SystemOutput": {
7+
},
8+
"Load": {
9+
},
10+
"Monthly": {
11+
},
12+
"GridLimits": {
13+
"enable_interconnection_limit": 0,
14+
"grid_curtailment": [0.000000],
15+
"grid_interconnection_limit_kwac": 20000
16+
},
17+
"HybridCosts": {
18+
"om_capacity": [0],
19+
"om_fixed": [0],
20+
"om_production": [0],
21+
"total_installed_cost": 0
22+
}
23+
}
24+
}

‎api/api_autogen/library/defaults/Pvwattsv8_PVWattsCSPTowerMoltenSaltBatteryHybridSingleOwner.json‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
{
2+
"defaults": {
3+
"SolarResource": {
4+
"albedo": [0.000000],
5+
"use_wf_albedo": 1
6+
},
7+
"Lifetime": {
8+
"analysis_period": 30,
9+
"system_use_lifetime_output": 0
10+
},
11+
"SystemDesign": {
12+
"array_type": 0,
13+
"azimuth": 180,
14+
"batt_simple_enable": 0,
15+
"bifaciality": 0,
16+
"dc_ac_ratio": 1.1,
17+
"en_snowloss": 0,
18+
"gcr": 0.4,
19+
"inv_eff": 96,
20+
"losses": 14,
21+
"module_type": 0,
22+
"soiling": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
23+
"system_capacity": 4,
24+
"tilt": 42.82
25+
},
26+
"Shading": {
27+
"shading_azal": [
28+
[0.000000]
29+
],
30+
"shading_diff": 0,
31+
"shading_en_azal": 0,
32+
"shading_en_diff": 0,
33+
"shading_en_mxh": 0,
34+
"shading_en_string_option": 0,
35+
"shading_en_timestep": 0,
36+
"shading_mxh": [
37+
[0.000000]
38+
],
39+
"shading_string_option": 0,
40+
"shading_timestep": [
41+
[0.000000]
42+
]
43+
},
44+
"AdjustmentFactors": {
45+
"adjust_constant": 0,
46+
"adjust_en_periods": 0,
47+
"adjust_en_timeindex": 0,
48+
"adjust_periods": [
49+
[0.000000],
50+
[0.000000],
51+
[0.000000],
52+
[0.000000],
53+
[0.000000],
54+
[0.000000],
55+
[0.000000]
56+
],
57+
"adjust_timeindex": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000]
58+
},
59+
"HybridCosts": {
60+
"degradation": [0.000000],
61+
"land_area": 0,
62+
"om_capacity": [50.000000],
63+
"om_capacity_escal": 0,
64+
"om_fixed": [0.000000],
65+
"om_fixed_escal": 0,
66+
"om_land_lease": [0.000000],
67+
"om_land_lease_escal": 0,
68+
"om_production": [0.000000],
69+
"om_production_escal": 0,
70+
"total_installed_cost": 0
71+
}
72+
}
73+
}

‎api/api_autogen/library/defaults/Singleowner_PVWattsCSPTowerMoltenSaltBatteryHybridSingleOwner.json‎

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

‎api/api_autogen/library/defaults/TcsmoltenSalt_MSPTAllEquityPartnershipFlip.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"disp_time_weighting": 0.999,
2626
"disp_timeout": 5,
2727
"f_turb_tou_periods": [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000],
28+
"is_control_target_elec": 0,
2829
"is_dispatch": 0,
2930
"is_parallel_htr": 0,
3031
"is_tod_pc_target_also_pc_max": 0,

‎api/api_autogen/library/defaults/TcsmoltenSalt_MSPTLeveragedPartnershipFlip.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"disp_time_weighting": 0.999,
2626
"disp_timeout": 5,
2727
"f_turb_tou_periods": [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000],
28+
"is_control_target_elec": 0,
2829
"is_dispatch": 0,
2930
"is_parallel_htr": 0,
3031
"is_tod_pc_target_also_pc_max": 0,

‎api/api_autogen/library/defaults/TcsmoltenSalt_MSPTMerchantPlant.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"disp_time_weighting": 0.999,
2626
"disp_timeout": 5,
2727
"f_turb_tou_periods": [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000],
28+
"is_control_target_elec": 0,
2829
"is_dispatch": 0,
2930
"is_parallel_htr": 0,
3031
"is_tod_pc_target_also_pc_max": 0,

‎api/api_autogen/library/defaults/TcsmoltenSalt_MSPTNone.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"disp_time_weighting": 0.999,
2626
"disp_timeout": 5,
2727
"f_turb_tou_periods": [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000],
28+
"is_control_target_elec": 0,
2829
"is_dispatch": 0,
2930
"is_parallel_htr": 0,
3031
"is_tod_pc_target_also_pc_max": 0,

‎api/api_autogen/library/defaults/TcsmoltenSalt_MSPTSaleLeaseback.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"disp_time_weighting": 0.999,
2626
"disp_timeout": 5,
2727
"f_turb_tou_periods": [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000],
28+
"is_control_target_elec": 0,
2829
"is_dispatch": 0,
2930
"is_parallel_htr": 0,
3031
"is_tod_pc_target_also_pc_max": 0,

0 commit comments

Comments
 (0)