Skip to content

Commit 9d4809c

Browse files
sjanzousjanzou
committed
api and geocode return message for #1968 
1 parent 36ae74a commit 9d4809c

9 files changed

+57
-55
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"om_fixed_escal": 0,
2424
"om_production_escal": 0,
2525
"om_production_heat": [2.000000],
26-
"total_installed_cost": 1.33794e+07
26+
"total_installed_cost": 1.36747e+07
2727
},
2828
"LandLease": {
2929
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"variable_operating_cost": 0.002
1919
},
2020
"SystemCosts": {
21-
"total_installed_cost": 1.33794e+07
21+
"total_installed_cost": 1.36747e+07
2222
},
2323
"IPHLCOH": {
2424
"electricity_rate": 0.06

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"FinancialParameters": {
1010
"analysis_period": 25,
11-
"construction_financing_cost": 1.00345e+06,
11+
"construction_financing_cost": 1.0256e+06,
1212
"cost_debt_closing": 0,
1313
"cost_debt_fee": 2.75,
1414
"cost_other_financing": 0,
@@ -51,7 +51,7 @@
5151
"om_fixed_escal": 0,
5252
"om_production_escal": 0,
5353
"om_production_heat": [2.000000],
54-
"total_installed_cost": 1.33794e+07
54+
"total_installed_cost": 1.36747e+07
5555
},
5656
"LandLease": {
5757
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"defaults": {
33
"ThermalRate": {
44
"gen_heat": [0],
5-
"thermal_buy_rate_flat_heat_btu": 14,
5+
"thermal_buy_rate_flat_heat_btu": 14.5,
66
"thermal_buy_rate_option": 0,
77
"thermal_conversion_efficiency": 85,
88
"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],

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,11 @@
140140
[0.935000, 0.935000, 0.935000, 0.963000],
141141
[0.935000, 0.935000, 0.935000, 0.963000]
142142
],
143-
"T_fp": 10,
144-
"T_loop_in_des": 90,
145-
"T_loop_out": 300,
146-
"T_shutdown": 159.3,
147-
"T_startup": 159.3,
143+
"T_fp": 150,
144+
"T_loop_in_des": 293,
145+
"T_loop_out": 391,
146+
"T_shutdown": 325.34,
147+
"T_startup": 325.34,
148148
"Tau_envelope": [
149149
[0.964000, 0.964000, 1.000000, 0.000000],
150150
[0.964000, 0.964000, 1.000000, 0.000000],
@@ -324,13 +324,13 @@
324324
"SystemCosts": {
325325
},
326326
"TES": {
327-
"cold_tank_Thtr": 60,
327+
"cold_tank_Thtr": 250,
328328
"cold_tank_max_heat": 0.5,
329329
"d_tank_in": 0,
330330
"dt_hot": 5,
331-
"h_tank_in": 15,
332-
"h_tank_min": 0.5,
333-
"hot_tank_Thtr": 110,
331+
"h_tank_in": 12,
332+
"h_tank_min": 1,
333+
"hot_tank_Thtr": 365,
334334
"hot_tank_max_heat": 1,
335335
"init_hot_htf_percent": 30,
336336
"is_h_tank_fixed": 1,
@@ -345,7 +345,7 @@
345345
"tes_cyl_tank_insul_percent": 0,
346346
"tes_cyl_tank_thick": 0.0254,
347347
"tes_n_tsteps": 100,
348-
"tes_pb_T_charge_min": 290,
348+
"tes_pb_T_charge_min": 381,
349349
"tes_pb_T_cold_delta": 30,
350350
"tes_pb_T_hot_delta": 30,
351351
"tes_pb_cp_solid": 0.83,
@@ -356,7 +356,7 @@
356356
"tes_pb_void_frac": 0.22,
357357
"tes_type": 1,
358358
"tshours": 6,
359-
"u_tank": 0.3
359+
"u_tank": 0.4
360360
},
361361
"Controller": {
362362
"T_tank_hot_inlet_min": 400,
@@ -431,7 +431,7 @@
431431
"csp_dtr_cost_sales_tax_percent": 80,
432432
"csp_dtr_cost_site_improvements_cost_per_m2": 16,
433433
"csp_dtr_cost_solar_field_cost_per_m2": 297,
434-
"csp_dtr_cost_storage_cost_per_kwht": 62,
434+
"csp_dtr_cost_storage_cost_per_kwht": 70,
435435
"sales_tax_rate": 5
436436
},
437437
"FinancialParameters": {

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,11 @@
140140
[0.935000, 0.935000, 0.935000, 0.963000],
141141
[0.935000, 0.935000, 0.935000, 0.963000]
142142
],
143-
"T_fp": 10,
144-
"T_loop_in_des": 90,
145-
"T_loop_out": 300,
146-
"T_shutdown": 159.3,
147-
"T_startup": 159.3,
143+
"T_fp": 150,
144+
"T_loop_in_des": 293,
145+
"T_loop_out": 391,
146+
"T_shutdown": 325.34,
147+
"T_startup": 325.34,
148148
"Tau_envelope": [
149149
[0.964000, 0.964000, 1.000000, 0.000000],
150150
[0.964000, 0.964000, 1.000000, 0.000000],
@@ -324,13 +324,13 @@
324324
"SystemCosts": {
325325
},
326326
"TES": {
327-
"cold_tank_Thtr": 60,
327+
"cold_tank_Thtr": 250,
328328
"cold_tank_max_heat": 0.5,
329329
"d_tank_in": 0,
330330
"dt_hot": 5,
331-
"h_tank_in": 15,
332-
"h_tank_min": 0.5,
333-
"hot_tank_Thtr": 110,
331+
"h_tank_in": 12,
332+
"h_tank_min": 1,
333+
"hot_tank_Thtr": 365,
334334
"hot_tank_max_heat": 1,
335335
"init_hot_htf_percent": 30,
336336
"is_h_tank_fixed": 1,
@@ -345,7 +345,7 @@
345345
"tes_cyl_tank_insul_percent": 0,
346346
"tes_cyl_tank_thick": 0.0254,
347347
"tes_n_tsteps": 100,
348-
"tes_pb_T_charge_min": 290,
348+
"tes_pb_T_charge_min": 381,
349349
"tes_pb_T_cold_delta": 30,
350350
"tes_pb_T_hot_delta": 30,
351351
"tes_pb_cp_solid": 0.83,
@@ -356,7 +356,7 @@
356356
"tes_pb_void_frac": 0.22,
357357
"tes_type": 1,
358358
"tshours": 6,
359-
"u_tank": 0.3
359+
"u_tank": 0.4
360360
},
361361
"Controller": {
362362
"T_tank_hot_inlet_min": 400,
@@ -458,7 +458,7 @@
458458
"csp_dtr_cost_sales_tax_percent": 80,
459459
"csp_dtr_cost_site_improvements_cost_per_m2": 16,
460460
"csp_dtr_cost_solar_field_cost_per_m2": 297,
461-
"csp_dtr_cost_storage_cost_per_kwht": 62,
461+
"csp_dtr_cost_storage_cost_per_kwht": 70,
462462
"sales_tax_rate": 5
463463
},
464464
"FinancialParameters": {

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,11 @@
140140
[0.935000, 0.935000, 0.935000, 0.963000],
141141
[0.935000, 0.935000, 0.935000, 0.963000]
142142
],
143-
"T_fp": 10,
144-
"T_loop_in_des": 90,
145-
"T_loop_out": 300,
146-
"T_shutdown": 159.3,
147-
"T_startup": 159.3,
143+
"T_fp": 150,
144+
"T_loop_in_des": 293,
145+
"T_loop_out": 391,
146+
"T_shutdown": 325.34,
147+
"T_startup": 325.34,
148148
"Tau_envelope": [
149149
[0.964000, 0.964000, 1.000000, 0.000000],
150150
[0.964000, 0.964000, 1.000000, 0.000000],
@@ -324,13 +324,13 @@
324324
"SystemCosts": {
325325
},
326326
"TES": {
327-
"cold_tank_Thtr": 60,
327+
"cold_tank_Thtr": 250,
328328
"cold_tank_max_heat": 0.5,
329329
"d_tank_in": 0,
330330
"dt_hot": 5,
331-
"h_tank_in": 15,
332-
"h_tank_min": 0.5,
333-
"hot_tank_Thtr": 110,
331+
"h_tank_in": 12,
332+
"h_tank_min": 1,
333+
"hot_tank_Thtr": 365,
334334
"hot_tank_max_heat": 1,
335335
"init_hot_htf_percent": 30,
336336
"is_h_tank_fixed": 1,
@@ -345,7 +345,7 @@
345345
"tes_cyl_tank_insul_percent": 0,
346346
"tes_cyl_tank_thick": 0.0254,
347347
"tes_n_tsteps": 100,
348-
"tes_pb_T_charge_min": 290,
348+
"tes_pb_T_charge_min": 381,
349349
"tes_pb_T_cold_delta": 30,
350350
"tes_pb_T_hot_delta": 30,
351351
"tes_pb_cp_solid": 0.83,
@@ -356,7 +356,7 @@
356356
"tes_pb_void_frac": 0.22,
357357
"tes_type": 1,
358358
"tshours": 6,
359-
"u_tank": 0.3
359+
"u_tank": 0.4
360360
},
361361
"Controller": {
362362
"T_tank_hot_inlet_min": 400,
@@ -458,7 +458,7 @@
458458
"csp_dtr_cost_sales_tax_percent": 80,
459459
"csp_dtr_cost_site_improvements_cost_per_m2": 16,
460460
"csp_dtr_cost_solar_field_cost_per_m2": 297,
461-
"csp_dtr_cost_storage_cost_per_kwht": 62,
461+
"csp_dtr_cost_storage_cost_per_kwht": 70,
462462
"sales_tax_rate": 5
463463
},
464464
"FinancialParameters": {

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,11 @@
140140
[0.935000, 0.935000, 0.935000, 0.963000],
141141
[0.935000, 0.935000, 0.935000, 0.963000]
142142
],
143-
"T_fp": 10,
144-
"T_loop_in_des": 90,
145-
"T_loop_out": 300,
146-
"T_shutdown": 159.3,
147-
"T_startup": 159.3,
143+
"T_fp": 150,
144+
"T_loop_in_des": 293,
145+
"T_loop_out": 391,
146+
"T_shutdown": 325.34,
147+
"T_startup": 325.34,
148148
"Tau_envelope": [
149149
[0.964000, 0.964000, 1.000000, 0.000000],
150150
[0.964000, 0.964000, 1.000000, 0.000000],
@@ -324,13 +324,13 @@
324324
"SystemCosts": {
325325
},
326326
"TES": {
327-
"cold_tank_Thtr": 60,
327+
"cold_tank_Thtr": 250,
328328
"cold_tank_max_heat": 0.5,
329329
"d_tank_in": 0,
330330
"dt_hot": 5,
331-
"h_tank_in": 15,
332-
"h_tank_min": 0.5,
333-
"hot_tank_Thtr": 110,
331+
"h_tank_in": 12,
332+
"h_tank_min": 1,
333+
"hot_tank_Thtr": 365,
334334
"hot_tank_max_heat": 1,
335335
"init_hot_htf_percent": 30,
336336
"is_h_tank_fixed": 1,
@@ -345,7 +345,7 @@
345345
"tes_cyl_tank_insul_percent": 0,
346346
"tes_cyl_tank_thick": 0.0254,
347347
"tes_n_tsteps": 100,
348-
"tes_pb_T_charge_min": 290,
348+
"tes_pb_T_charge_min": 381,
349349
"tes_pb_T_cold_delta": 30,
350350
"tes_pb_T_hot_delta": 30,
351351
"tes_pb_cp_solid": 0.83,
@@ -356,7 +356,7 @@
356356
"tes_pb_void_frac": 0.22,
357357
"tes_type": 1,
358358
"tshours": 6,
359-
"u_tank": 0.3
359+
"u_tank": 0.4
360360
},
361361
"Controller": {
362362
"T_tank_hot_inlet_min": 400,
@@ -430,7 +430,7 @@
430430
"ppa_soln_mode": 1
431431
},
432432
"Revenue": {
433-
"ppa_price_input_heat_btu": [15.000000]
433+
"ppa_price_input_heat_btu": [19.000000]
434434
},
435435
"TimeOfDeliveryFactors": {
436436
},
@@ -460,7 +460,7 @@
460460
"csp_dtr_cost_sales_tax_percent": 80,
461461
"csp_dtr_cost_site_improvements_cost_per_m2": 16,
462462
"csp_dtr_cost_solar_field_cost_per_m2": 297,
463-
"csp_dtr_cost_storage_cost_per_kwht": 62,
463+
"csp_dtr_cost_storage_cost_per_kwht": 70,
464464
"sales_tax_rate": 5
465465
},
466466
"FinancialParameters": {

‎src/geotools.cpp‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ bool GeoTools::GeocodeGoogle(const wxString& address, double* lat, double* lon,
125125
if (tz != 0) {
126126
success = false;
127127

128-
// get timezone from Goolge timezone API
128+
// get timezone from Google timezone API
129129
url = SamApp::WebApi("google_timezone_api") + wxString::Format("&location=%.14lf,%.14lf", *lat, *lon);
130130
url.Replace("<GOOGLEAPIKEY>", wxString(google_api_key));
131131

@@ -264,6 +264,8 @@ bool GeoTools::GeocodeDeveloper(const wxString& address, double* lat, double* lo
264264
if (!success)
265265
return false;
266266

267+
wxMessageBox(str, "geocode developer success to tz ");
268+
267269

268270
if (tz != 0)
269271
{

0 commit comments

Comments
 (0)