Skip to content

Commit aaaebb8

Browse files
mjprillimanmjprilliman
committed
Update cost callbacks, begin to implement tidal distribution resource
library (need to revert)
1 parent e3f9b88 commit aaaebb8

16 files changed

+984
-175
lines changed

‎deploy/runtime/defaults/MEtidal_LCOE Calculator.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -293,10 +293,10 @@
293293
"initial_engineering_cost_total_check": 0.0,
294294
"insurance_during_construction_cost": 124087.0,
295295
"insurance_during_construction_cost_input": 0.0,
296+
"insurance_during_construction_cost_method": 2.0,
297+
"insurance_during_construction_cost_modeled": 0.0,
296298
"insurance_during_construction_cost_modeled_ui": 124087.0,
297299
"insurance_during_construction_cost_rvalue": 0.0,
298-
"insurance_during_construction_method": 2.0,
299-
"insurance_during_construction_modeled": 133690.0,
300300
"insurance_operations_cost": 0.0,
301301
"integration_assembly_testing_checkout_cost": 0.0,
302302
"inter_array_cable_length": 0.0,
@@ -724,12 +724,12 @@
724724
"profit_eng_cost": 0.0,
725725
"project_certification_cost": 0.0,
726726
"project_certification_cost_total_display": 0.0,
727-
"project_contingency_budget_cost": 620437.0,
728-
"project_contingency_budget_cost_rvalue": 0.0,
727+
"project_contingency_cost": 0.0,
729728
"project_contingency_cost_input": 0.0,
730729
"project_contingency_cost_method": 2.0,
730+
"project_contingency_cost_modeled": 0.0,
731731
"project_contingency_cost_modeled_ui": 620437.0,
732-
"project_contingency_modeled": 668449.0,
732+
"project_contingency_cost_rvalue": 0.0,
733733
"project_management_during_development_cost": 0.0,
734734
"project_management_during_development_cost_rvalue": 0.0,
735735
"project_management_during_development_cost_total": 0.0,
@@ -744,10 +744,10 @@
744744
"reserve_accounts_cost": 372262.0,
745745
"reserve_accounts_cost_input": 0.0,
746746
"reserve_accounts_cost_method": 2.0,
747+
"reserve_accounts_cost_modeled": 0.0,
747748
"reserve_accounts_cost_modeled_ui": 372262.0,
748749
"reserve_accounts_cost_rvalue": 0.0,
749750
"reserve_accounts_cost_total": 0.0,
750-
"reserve_accounts_modeled": 401069.0,
751751
"resource_and_metocean_assessment_cost": 0.0,
752752
"resource_assessment_cost": 0.0,
753753
"riser_cable_length": 0.0,

‎deploy/runtime/defaults/MEwave_LCOE Calculator.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3222,10 +3222,10 @@
32223222
"initial_engineering_cost_total_check": 0.0,
32233223
"insurance_during_construction_cost": 4032345.988467771,
32243224
"insurance_during_construction_cost_input": 0.0,
3225+
"insurance_during_construction_cost_method": 2.0,
3226+
"insurance_during_construction_cost_modeled": 0.0,
32253227
"insurance_during_construction_cost_modeled_ui": 4032345.988467771,
32263228
"insurance_during_construction_cost_rvalue": 0.0,
3227-
"insurance_during_construction_method": 2.0,
3228-
"insurance_during_construction_modeled": 4167354.427416922,
32293229
"insurance_operations_cost": 0.0,
32303230
"integration_assembly_testing_checkout_cost": 0.0,
32313231
"inter_array_cable_length": 65340.00000000001,
@@ -4029,12 +4029,12 @@
40294029
"profit_eng_cost": 0.0,
40304030
"project_certification_cost": 0.0,
40314031
"project_certification_cost_total_display": 0.0,
4032-
"project_contingency_budget_cost": 20161729.94233886,
4033-
"project_contingency_budget_cost_rvalue": 0.0,
4032+
"project_contingency_cost": 0.0,
40344033
"project_contingency_cost_input": 0.0,
40354034
"project_contingency_cost_method": 2.0,
4035+
"project_contingency_cost_modeled": 0.0,
40364036
"project_contingency_cost_modeled_ui": 20161729.94233886,
4037-
"project_contingency_modeled": 33338835.419335378,
4037+
"project_contingency_cost_rvalue": 0.0,
40384038
"project_management_during_development_cost": 0.0,
40394039
"project_management_during_development_cost_rvalue": 0.0,
40404040
"project_management_during_development_cost_total": 0.0,
@@ -4049,10 +4049,10 @@
40494049
"reserve_accounts_cost": 12097037.965403313,
40504050
"reserve_accounts_cost_input": 0.0,
40514051
"reserve_accounts_cost_method": 2.0,
4052+
"reserve_accounts_cost_modeled": 0.0,
40524053
"reserve_accounts_cost_modeled_ui": 12097037.965403313,
40534054
"reserve_accounts_cost_rvalue": 0.0,
40544055
"reserve_accounts_cost_total": 0.0,
4055-
"reserve_accounts_modeled": 12502063.282250766,
40564056
"resource_and_metocean_assessment_cost": 0.0,
40574057
"resource_assessment_cost": 0.0,
40584058
"riser_cable_length": 8250.0,

‎deploy/runtime/lossdiag.lk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ loss_diagram{'Flat Plate PV'} = define() {
1111
if ( value('spe_is_bifacial') || value('cec_is_bifacial') || value('6par_is_bifacial') )
1212
{
1313
add_gain_term( 'annual_rear_ground_reflected_percent', 'Ground reflected to rear' );
14-
//add_gain_term( 'annual_rear_row_reflections_percent', 'Rear row reflections' ); // insignificant
15-
//add_gain_term( 'annual_rear_direct_diffuse_percent', 'DNI and DHI to rear' ); // insignificant
16-
//add_loss_term( 'annual_rear_self_shaded_percent', 'Rear self shading' ); // insignificant
14+
add_gain_term( 'annual_rear_row_reflections_percent', 'Rear row reflections' ); // insignificant
15+
add_gain_term( 'annual_rear_direct_diffuse_percent', 'DNI and DHI to rear' ); // insignificant
16+
add_loss_term( 'annual_rear_self_shaded_percent', 'Rear self shading' ); // insignificant
1717
add_loss_term( 'annual_rack_shaded_percent', 'Rear rack shading' );
1818
add_loss_term( 'annual_rear_soiled_percent', 'Rear soiling' );
1919
add_loss_term( 'annual_bifacial_electrical_mismatch_percent', 'Bifacial electrical mismatch' );

‎deploy/runtime/ui/Marine Costs - Financial Itemized.json‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1518,16 +1518,17 @@
15181518
}
15191519
},
15201520
"Equations": [
1521+
"/*\r",
15211522
"equations {'project_contingency_budget_cost'} = define() {",
1522-
"\tarray_scaling_b_value = -log(1 - ${project_contingency_budget_cost_rvalue}) / log(2);\r",
1523+
"\tarray_scaling_b_value = -log(1 - ${project_contingency_cost_rvalue}) / log(2);\r",
15231524
"\treturn ?${project_contingency_cost_method}",
15241525
"\t\t\t[",
15251526
"\t\t\t\t${project_contingency_cost_input}*${system_capacity},",
15261527
"\t\t\t\t${project_contingency_cost_input},",
1527-
"\t\t\t\t${project_contingency_modeled},\r",
1528+
"\t\t\t\t${project_contingency_cost_modeled},\r",
15281529
"\t\t\t\t(${project_contingency_cost_input}*pow(${number_devices},-array_scaling_b_value))*${number_devices}",
15291530
"\t\t\t];",
1530-
"};",
1531+
"};*/",
15311532
"",
15321533
"equations {'itemized_check_contingency'} = define() {",
15331534
"\treturn ?${project_contingency_cost_method}",
@@ -1538,7 +1539,7 @@
15381539
"\t\t\t\t3",
15391540
"\t\t\t];",
15401541
"};",
1541-
"",
1542+
"/*",
15421543
"equations {'insurance_during_construction_cost'} = define() {",
15431544
"\tarray_scaling_b_value = -log(1 - ${insurance_during_construction_cost_rvalue}) / log(2);\r",
15441545
"\treturn ?${insurance_during_construction_method}",
@@ -1549,7 +1550,7 @@
15491550
"\t\t\t\t(${insurance_during_construction_cost_input}*pow(${number_devices},-array_scaling_b_value))*${number_devices}",
15501551
"\t\t\t];",
15511552
"};",
1552-
"",
1553+
"*/",
15531554
"equations {'itemized_check_construction_insurance'} = define() {",
15541555
"\treturn ?${insurance_during_construction_method}",
15551556
"\t\t\t[",
@@ -1564,7 +1565,7 @@
15641565
"\treturn ${maintenance_reserve_account_cost}+${debt_service_reserve_account_cost}+",
15651566
"\t\t${decommissioning_reserve_account_cost}+${other_reserve_account_cost};",
15661567
"};",
1567-
"",
1568+
"/*",
15681569
"equations {'reserve_accounts_cost'} = define() {",
15691570
"\tarray_scaling_b_value = -log(1 - ${reserve_accounts_cost_rvalue}) / log(2);\r",
15701571
"\treturn ?${reserve_accounts_cost_method}",
@@ -1576,7 +1577,7 @@
15761577
"\t\t\t\t(${reserve_accounts_cost_input}*pow(${number_devices},-array_scaling_b_value))*${number_devices}",
15771578
"\t\t\t];",
15781579
"};",
1579-
"",
1580+
"*/",
15801581
"equations {'itemized_check_reserve_accounts'} = define() {",
15811582
"\tif (${financial_cost_override}!=1)",
15821583
"\t{",
@@ -1608,7 +1609,7 @@
16081609
"equations {'other_financial_cost_modeled'} = define() {",
16091610
"\treturn 0;",
16101611
"};",
1611-
"",
1612+
"/*",
16121613
"equations {'other_financial_cost'} = define() {",
16131614
"\tarray_scaling_b_value = -log(1 - ${other_financial_cost_rvalue}) / log(2);\r",
16141615
"\treturn ?${other_financial_cost_method}",
@@ -1619,7 +1620,7 @@
16191620
"\t\t\t\t(${other_financial_cost_input}*pow(${number_devices},-array_scaling_b_value))*${number_devices}",
16201621
"\t\t\t];",
16211622
"};",
1622-
"",
1623+
"*/",
16231624
"equations {'financial_override_check'} = define() {",
16241625
"\treturn ${financial_cost_override};};",
16251626
"",
@@ -1668,7 +1669,7 @@
16681669
"\titemized_value = value('itemized_check_contingency');",
16691670
"\tenable('project_contingency_cost_input',itemized_value!=1);\r",
16701671
"\t//show('project_contingency_cost_input',itemized_value==0 || itemized_value==3);\r",
1671-
"\tenable('project_contingency_budget_cost_rvalue',itemized_value==3);",
1672+
"\tenable('project_contingency_cost_rvalue',itemized_value==3);",
16721673
"\toverride_financial_cost();",
16731674
"\trefresh();",
16741675
"}",

0 commit comments

Comments
 (0)