Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Address SAM #1968 #1998

Merged
merged 22 commits into from
Feb 2, 2025
Merged

Address SAM #1968 #1998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
5a29814
2024.12.12.ssc.297 release candidate - no expiration
sjanzou Dec 10, 2024
73ef931
Geocode debugging on Linux
sjanzou Dec 11, 2024
c18ac2e
Update Geocoding URL for Linux #1968
sjanzou Dec 11, 2024
7622535
Add http headers for Linux #1968
sjanzou Dec 11, 2024
13dac1e
timezone geocoding update for Linux #1968
sjanzou Dec 11, 2024
3ce73bc
Additional bing tz debugging messages for Linux #1968
sjanzou Dec 11, 2024
7d67af1
Merge branch 'develop' into SAM_1968
sjanzou Dec 11, 2024
e0d97a1
Merge branch 'patch' into SAM_1968
sjanzou Jan 24, 2025
36ae74a
move http headers for #1968
sjanzou Jan 24, 2025
9d4809c
api and geocode return message for #1968
sjanzou Jan 27, 2025
0f304cc
additional Linux debugging for #1968
sjanzou Jan 27, 2025
86365f8
Try to fix RapidJSON empty document on Linux issue #1968
sjanzou Jan 27, 2025
ba5c60a
Test using parse stream to encode for linux #1968
sjanzou Jan 27, 2025
c96d4ca
Test escaping quotes for linux #1968
sjanzou Jan 27, 2025
064bcc7
Testing urdb curl updates for #1968
sjanzou Jan 27, 2025
5bfdf14
update parsing flags for linux #1968
sjanzou Jan 27, 2025
b253604
std string parsing with curl library #1968
sjanzou Jan 27, 2025
dd1b2bf
Testing after verifying working with json str in vscode on RHEL #1968
sjanzou Jan 28, 2025
db66759
Switch from std::string to wxString for testing GeocodeDeveloper meth…
sjanzou Jan 28, 2025
128023d
Rewrite all parsing for UTF16 and test on Windows #1968
sjanzou Jan 28, 2025
8d4f328
Merge remote-tracking branch 'origin/patch' into SAM_1968
sjanzou Jan 29, 2025
b9f16fb
Remove debugging messages and handle zero rate utilities #1968
sjanzou Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/api_autogen/library/defaults/CashloanHeat_PhysicalTroughIPHCommercial.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"om_fixed_escal": 0,
"om_production_escal": 0,
"om_production_heat": [2.000000],
"total_installed_cost": 1.33794e+07
"total_installed_cost": 1.36747e+07
},
"LandLease": {
},
Expand Down
2 changes: 1 addition & 1 deletion api/api_autogen/library/defaults/LcoefcrDesign_PhysicalTroughIPHLCOHCalculator.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"variable_operating_cost": 0.002
},
"SystemCosts": {
"total_installed_cost": 1.33794e+07
"total_installed_cost": 1.36747e+07
},
"IPHLCOH": {
"electricity_rate": 0.06
Expand Down
4 changes: 2 additions & 2 deletions api/api_autogen/library/defaults/SingleownerHeat_PhysicalTroughIPHSingleOwner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"FinancialParameters": {
"analysis_period": 25,
"construction_financing_cost": 1.00345e+06,
"construction_financing_cost": 1.0256e+06,
"cost_debt_closing": 0,
"cost_debt_fee": 2.75,
"cost_other_financing": 0,
Expand Down Expand Up @@ -51,7 +51,7 @@
"om_fixed_escal": 0,
"om_production_escal": 0,
"om_production_heat": [2.000000],
"total_installed_cost": 1.33794e+07
"total_installed_cost": 1.36747e+07
},
"LandLease": {
},
Expand Down
2 changes: 1 addition & 1 deletion api/api_autogen/library/defaults/ThermalrateIph_PhysicalTroughIPHCommercial.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"defaults": {
"ThermalRate": {
"gen_heat": [0],
"thermal_buy_rate_flat_heat_btu": 14,
"thermal_buy_rate_flat_heat_btu": 14.5,
"thermal_buy_rate_option": 0,
"thermal_conversion_efficiency": 85,
"thermal_monthly_buy_rate_heat_btu": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
Expand Down
24 changes: 12 additions & 12 deletions api/api_autogen/library/defaults/TroughPhysicalIph_PhysicalTroughIPHCommercial.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,11 @@
[0.935000, 0.935000, 0.935000, 0.963000],
[0.935000, 0.935000, 0.935000, 0.963000]
],
"T_fp": 10,
"T_loop_in_des": 90,
"T_loop_out": 300,
"T_shutdown": 159.3,
"T_startup": 159.3,
"T_fp": 150,
"T_loop_in_des": 293,
"T_loop_out": 391,
"T_shutdown": 325.34,
"T_startup": 325.34,
"Tau_envelope": [
[0.964000, 0.964000, 1.000000, 0.000000],
[0.964000, 0.964000, 1.000000, 0.000000],
Expand Down Expand Up @@ -324,13 +324,13 @@
"SystemCosts": {
},
"TES": {
"cold_tank_Thtr": 60,
"cold_tank_Thtr": 250,
"cold_tank_max_heat": 0.5,
"d_tank_in": 0,
"dt_hot": 5,
"h_tank_in": 15,
"h_tank_min": 0.5,
"hot_tank_Thtr": 110,
"h_tank_in": 12,
"h_tank_min": 1,
"hot_tank_Thtr": 365,
"hot_tank_max_heat": 1,
"init_hot_htf_percent": 30,
"is_h_tank_fixed": 1,
Expand All @@ -345,7 +345,7 @@
"tes_cyl_tank_insul_percent": 0,
"tes_cyl_tank_thick": 0.0254,
"tes_n_tsteps": 100,
"tes_pb_T_charge_min": 290,
"tes_pb_T_charge_min": 381,
"tes_pb_T_cold_delta": 30,
"tes_pb_T_hot_delta": 30,
"tes_pb_cp_solid": 0.83,
Expand All @@ -356,7 +356,7 @@
"tes_pb_void_frac": 0.22,
"tes_type": 1,
"tshours": 6,
"u_tank": 0.3
"u_tank": 0.4
},
"Controller": {
"T_tank_hot_inlet_min": 400,
Expand Down Expand Up @@ -431,7 +431,7 @@
"csp_dtr_cost_sales_tax_percent": 80,
"csp_dtr_cost_site_improvements_cost_per_m2": 16,
"csp_dtr_cost_solar_field_cost_per_m2": 297,
"csp_dtr_cost_storage_cost_per_kwht": 62,
"csp_dtr_cost_storage_cost_per_kwht": 70,
"sales_tax_rate": 5
},
"FinancialParameters": {
Expand Down
24 changes: 12 additions & 12 deletions api/api_autogen/library/defaults/TroughPhysicalIph_PhysicalTroughIPHLCOHCalculator.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,11 @@
[0.935000, 0.935000, 0.935000, 0.963000],
[0.935000, 0.935000, 0.935000, 0.963000]
],
"T_fp": 10,
"T_loop_in_des": 90,
"T_loop_out": 300,
"T_shutdown": 159.3,
"T_startup": 159.3,
"T_fp": 150,
"T_loop_in_des": 293,
"T_loop_out": 391,
"T_shutdown": 325.34,
"T_startup": 325.34,
"Tau_envelope": [
[0.964000, 0.964000, 1.000000, 0.000000],
[0.964000, 0.964000, 1.000000, 0.000000],
Expand Down Expand Up @@ -324,13 +324,13 @@
"SystemCosts": {
},
"TES": {
"cold_tank_Thtr": 60,
"cold_tank_Thtr": 250,
"cold_tank_max_heat": 0.5,
"d_tank_in": 0,
"dt_hot": 5,
"h_tank_in": 15,
"h_tank_min": 0.5,
"hot_tank_Thtr": 110,
"h_tank_in": 12,
"h_tank_min": 1,
"hot_tank_Thtr": 365,
"hot_tank_max_heat": 1,
"init_hot_htf_percent": 30,
"is_h_tank_fixed": 1,
Expand All @@ -345,7 +345,7 @@
"tes_cyl_tank_insul_percent": 0,
"tes_cyl_tank_thick": 0.0254,
"tes_n_tsteps": 100,
"tes_pb_T_charge_min": 290,
"tes_pb_T_charge_min": 381,
"tes_pb_T_cold_delta": 30,
"tes_pb_T_hot_delta": 30,
"tes_pb_cp_solid": 0.83,
Expand All @@ -356,7 +356,7 @@
"tes_pb_void_frac": 0.22,
"tes_type": 1,
"tshours": 6,
"u_tank": 0.3
"u_tank": 0.4
},
"Controller": {
"T_tank_hot_inlet_min": 400,
Expand Down Expand Up @@ -458,7 +458,7 @@
"csp_dtr_cost_sales_tax_percent": 80,
"csp_dtr_cost_site_improvements_cost_per_m2": 16,
"csp_dtr_cost_solar_field_cost_per_m2": 297,
"csp_dtr_cost_storage_cost_per_kwht": 62,
"csp_dtr_cost_storage_cost_per_kwht": 70,
"sales_tax_rate": 5
},
"FinancialParameters": {
Expand Down
24 changes: 12 additions & 12 deletions api/api_autogen/library/defaults/TroughPhysicalIph_PhysicalTroughIPHNone.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,11 @@
[0.935000, 0.935000, 0.935000, 0.963000],
[0.935000, 0.935000, 0.935000, 0.963000]
],
"T_fp": 10,
"T_loop_in_des": 90,
"T_loop_out": 300,
"T_shutdown": 159.3,
"T_startup": 159.3,
"T_fp": 150,
"T_loop_in_des": 293,
"T_loop_out": 391,
"T_shutdown": 325.34,
"T_startup": 325.34,
"Tau_envelope": [
[0.964000, 0.964000, 1.000000, 0.000000],
[0.964000, 0.964000, 1.000000, 0.000000],
Expand Down Expand Up @@ -324,13 +324,13 @@
"SystemCosts": {
},
"TES": {
"cold_tank_Thtr": 60,
"cold_tank_Thtr": 250,
"cold_tank_max_heat": 0.5,
"d_tank_in": 0,
"dt_hot": 5,
"h_tank_in": 15,
"h_tank_min": 0.5,
"hot_tank_Thtr": 110,
"h_tank_in": 12,
"h_tank_min": 1,
"hot_tank_Thtr": 365,
"hot_tank_max_heat": 1,
"init_hot_htf_percent": 30,
"is_h_tank_fixed": 1,
Expand All @@ -345,7 +345,7 @@
"tes_cyl_tank_insul_percent": 0,
"tes_cyl_tank_thick": 0.0254,
"tes_n_tsteps": 100,
"tes_pb_T_charge_min": 290,
"tes_pb_T_charge_min": 381,
"tes_pb_T_cold_delta": 30,
"tes_pb_T_hot_delta": 30,
"tes_pb_cp_solid": 0.83,
Expand All @@ -356,7 +356,7 @@
"tes_pb_void_frac": 0.22,
"tes_type": 1,
"tshours": 6,
"u_tank": 0.3
"u_tank": 0.4
},
"Controller": {
"T_tank_hot_inlet_min": 400,
Expand Down Expand Up @@ -458,7 +458,7 @@
"csp_dtr_cost_sales_tax_percent": 80,
"csp_dtr_cost_site_improvements_cost_per_m2": 16,
"csp_dtr_cost_solar_field_cost_per_m2": 297,
"csp_dtr_cost_storage_cost_per_kwht": 62,
"csp_dtr_cost_storage_cost_per_kwht": 70,
"sales_tax_rate": 5
},
"FinancialParameters": {
Expand Down
26 changes: 13 additions & 13 deletions api/api_autogen/library/defaults/TroughPhysicalIph_PhysicalTroughIPHSingleOwner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,11 @@
[0.935000, 0.935000, 0.935000, 0.963000],
[0.935000, 0.935000, 0.935000, 0.963000]
],
"T_fp": 10,
"T_loop_in_des": 90,
"T_loop_out": 300,
"T_shutdown": 159.3,
"T_startup": 159.3,
"T_fp": 150,
"T_loop_in_des": 293,
"T_loop_out": 391,
"T_shutdown": 325.34,
"T_startup": 325.34,
"Tau_envelope": [
[0.964000, 0.964000, 1.000000, 0.000000],
[0.964000, 0.964000, 1.000000, 0.000000],
Expand Down Expand Up @@ -324,13 +324,13 @@
"SystemCosts": {
},
"TES": {
"cold_tank_Thtr": 60,
"cold_tank_Thtr": 250,
"cold_tank_max_heat": 0.5,
"d_tank_in": 0,
"dt_hot": 5,
"h_tank_in": 15,
"h_tank_min": 0.5,
"hot_tank_Thtr": 110,
"h_tank_in": 12,
"h_tank_min": 1,
"hot_tank_Thtr": 365,
"hot_tank_max_heat": 1,
"init_hot_htf_percent": 30,
"is_h_tank_fixed": 1,
Expand All @@ -345,7 +345,7 @@
"tes_cyl_tank_insul_percent": 0,
"tes_cyl_tank_thick": 0.0254,
"tes_n_tsteps": 100,
"tes_pb_T_charge_min": 290,
"tes_pb_T_charge_min": 381,
"tes_pb_T_cold_delta": 30,
"tes_pb_T_hot_delta": 30,
"tes_pb_cp_solid": 0.83,
Expand All @@ -356,7 +356,7 @@
"tes_pb_void_frac": 0.22,
"tes_type": 1,
"tshours": 6,
"u_tank": 0.3
"u_tank": 0.4
},
"Controller": {
"T_tank_hot_inlet_min": 400,
Expand Down Expand Up @@ -430,7 +430,7 @@
"ppa_soln_mode": 1
},
"Revenue": {
"ppa_price_input_heat_btu": [15.000000]
"ppa_price_input_heat_btu": [19.000000]
},
"TimeOfDeliveryFactors": {
},
Expand Down Expand Up @@ -460,7 +460,7 @@
"csp_dtr_cost_sales_tax_percent": 80,
"csp_dtr_cost_site_improvements_cost_per_m2": 16,
"csp_dtr_cost_solar_field_cost_per_m2": 297,
"csp_dtr_cost_storage_cost_per_kwht": 62,
"csp_dtr_cost_storage_cost_per_kwht": 70,
"sales_tax_rate": 5
},
"FinancialParameters": {
Expand Down
Loading
Loading