diff --git a/deploy/runtime/defaults/CustomGeneration PVWatts Wind FuelCell Battery Hybrid_Host Developer.json b/deploy/runtime/defaults/CustomGeneration PVWatts Wind FuelCell Battery Hybrid_Host Developer.json index 5aee094b1..e9c65400e 100644 --- a/deploy/runtime/defaults/CustomGeneration PVWatts Wind FuelCell Battery Hybrid_Host Developer.json +++ b/deploy/runtime/defaults/CustomGeneration PVWatts Wind FuelCell Battery Hybrid_Host Developer.json @@ -39048,7 +39048,6 @@ "standalonebatt.cost.epc.percent": 0.0, "standalonebatt.cost.epc.total": 0.0, "standalonebatt.cost.installed_per_capacity": 1.46146, - "standalonebatt.cost.per_watt": 0.0, "standalonebatt.cost.plm.fixed": 0.0, "standalonebatt.cost.plm.nonfixed": 0.0, "standalonebatt.cost.plm.percent": 0.0, diff --git a/deploy/runtime/defaults/CustomGeneration PVWatts Wind FuelCell Battery Hybrid_Single Owner.json b/deploy/runtime/defaults/CustomGeneration PVWatts Wind FuelCell Battery Hybrid_Single Owner.json index 7fa6ee665..01d815005 100644 --- a/deploy/runtime/defaults/CustomGeneration PVWatts Wind FuelCell Battery Hybrid_Single Owner.json +++ b/deploy/runtime/defaults/CustomGeneration PVWatts Wind FuelCell Battery Hybrid_Single Owner.json @@ -30974,7 +30974,6 @@ "standalonebatt.cost.epc.percent": 0.0, "standalonebatt.cost.epc.total": 0.0, "standalonebatt.cost.installed_per_capacity": 1.29271, - "standalonebatt.cost.per_watt": 0.0, "standalonebatt.cost.plm.fixed": 0.0, "standalonebatt.cost.plm.nonfixed": 0.0, "standalonebatt.cost.plm.percent": 0.0, diff --git a/deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Host Developer.json b/deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Host Developer.json index 4a096748b..43446d024 100644 --- a/deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Host Developer.json +++ b/deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Host Developer.json @@ -20590,7 +20590,6 @@ "standalonebatt.cost.epc.percent": 0.0, "standalonebatt.cost.epc.total": 0.0, "standalonebatt.cost.installed_per_capacity": 1.46146, - "standalonebatt.cost.per_watt": 0.0, "standalonebatt.cost.plm.fixed": 0.0, "standalonebatt.cost.plm.nonfixed": 0.0, "standalonebatt.cost.plm.percent": 0.0, diff --git a/deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Single Owner.json b/deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Single Owner.json index 3fb0fe477..63d288c6b 100644 --- a/deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Single Owner.json +++ b/deploy/runtime/defaults/PVWatts Wind Battery Hybrid_Single Owner.json @@ -12525,7 +12525,6 @@ "standalonebatt.cost.epc.percent": 0.0, "standalonebatt.cost.epc.total": 0.0, "standalonebatt.cost.installed_per_capacity": 1.29271, - "standalonebatt.cost.per_watt": 0.0, "standalonebatt.cost.plm.fixed": 0.0, "standalonebatt.cost.plm.nonfixed": 0.0, "standalonebatt.cost.plm.percent": 0.0, diff --git a/deploy/runtime/defaults/PVWatts Wind FuelCell Battery Hybrid_Host Developer.json b/deploy/runtime/defaults/PVWatts Wind FuelCell Battery Hybrid_Host Developer.json index 0bb864a9c..e46ab9fb5 100644 --- a/deploy/runtime/defaults/PVWatts Wind FuelCell Battery Hybrid_Host Developer.json +++ b/deploy/runtime/defaults/PVWatts Wind FuelCell Battery Hybrid_Host Developer.json @@ -56477,7 +56477,6 @@ "standalonebatt.cost.epc.percent": 0.0, "standalonebatt.cost.epc.total": 0.0, "standalonebatt.cost.installed_per_capacity": 1.43079, - "standalonebatt.cost.per_watt": 0.0, "standalonebatt.cost.plm.fixed": 0.0, "standalonebatt.cost.plm.nonfixed": 0.0, "standalonebatt.cost.plm.percent": 0.0, diff --git a/deploy/runtime/defaults/PVWatts Wind FuelCell Battery Hybrid_Single Owner.json b/deploy/runtime/defaults/PVWatts Wind FuelCell Battery Hybrid_Single Owner.json index d979684a7..ed90f3452 100644 --- a/deploy/runtime/defaults/PVWatts Wind FuelCell Battery Hybrid_Single Owner.json +++ b/deploy/runtime/defaults/PVWatts Wind FuelCell Battery Hybrid_Single Owner.json @@ -30898,7 +30898,6 @@ "standalonebatt.cost.epc.percent": 0.0, "standalonebatt.cost.epc.total": 0.0, "standalonebatt.cost.installed_per_capacity": 1.29271, - "standalonebatt.cost.per_watt": 0.0, "standalonebatt.cost.plm.fixed": 0.0, "standalonebatt.cost.plm.nonfixed": 0.0, "standalonebatt.cost.plm.percent": 0.0, diff --git a/deploy/runtime/defaults/Photovoltaic Wind Battery Hybrid_Host Developer.json b/deploy/runtime/defaults/Photovoltaic Wind Battery Hybrid_Host Developer.json index 82c1ea909..aded534b2 100644 --- a/deploy/runtime/defaults/Photovoltaic Wind Battery Hybrid_Host Developer.json +++ b/deploy/runtime/defaults/Photovoltaic Wind Battery Hybrid_Host Developer.json @@ -41881,7 +41881,6 @@ "standalonebatt.cost.epc.percent": 0.0, "standalonebatt.cost.epc.total": 0.0, "standalonebatt.cost.installed_per_capacity": 1.46146, - "standalonebatt.cost.per_watt": 0.0, "standalonebatt.cost.plm.fixed": 0.0, "standalonebatt.cost.plm.nonfixed": 0.0, "standalonebatt.cost.plm.percent": 0.0, diff --git a/deploy/runtime/defaults/Photovoltaic Wind Battery Hybrid_Single Owner.json b/deploy/runtime/defaults/Photovoltaic Wind Battery Hybrid_Single Owner.json index 633f86552..f503d64aa 100644 --- a/deploy/runtime/defaults/Photovoltaic Wind Battery Hybrid_Single Owner.json +++ b/deploy/runtime/defaults/Photovoltaic Wind Battery Hybrid_Single Owner.json @@ -34451,7 +34451,6 @@ "standalonebatt.cost.epc.percent": 0.0, "standalonebatt.cost.epc.total": 0.0, "standalonebatt.cost.installed_per_capacity": 1.29271, - "standalonebatt.cost.per_watt": 0.0, "standalonebatt.cost.plm.fixed": 0.0, "standalonebatt.cost.plm.nonfixed": 0.0, "standalonebatt.cost.plm.percent": 0.0, diff --git a/deploy/runtime/defaults/Standalone Battery_All Equity Partnership Flip.json b/deploy/runtime/defaults/Standalone Battery_All Equity Partnership Flip.json index e099cd335..0c73dffc1 100644 --- a/deploy/runtime/defaults/Standalone Battery_All Equity Partnership Flip.json +++ b/deploy/runtime/defaults/Standalone Battery_All Equity Partnership Flip.json @@ -29104,7 +29104,6 @@ "standalonebatt.cost.epc.percent": 0.0, "standalonebatt.cost.epc.total": 0.0, "standalonebatt.cost.installed_per_capacity": 1.35734, - "standalonebatt.cost.per_watt": 0.0, "standalonebatt.cost.plm.fixed": 0.0, "standalonebatt.cost.plm.nonfixed": 0.0, "standalonebatt.cost.plm.percent": 0.0, diff --git a/deploy/runtime/defaults/Standalone Battery_Commercial.json b/deploy/runtime/defaults/Standalone Battery_Commercial.json index c6d1bc277..9d56c6d61 100644 --- a/deploy/runtime/defaults/Standalone Battery_Commercial.json +++ b/deploy/runtime/defaults/Standalone Battery_Commercial.json @@ -63498,7 +63498,6 @@ "standalonebatt.cost.epc.percent": 0.0, "standalonebatt.cost.epc.total": 0.0, "standalonebatt.cost.installed_per_capacity": 1.61126, - "standalonebatt.cost.per_watt": 6.0, "standalonebatt.cost.plm.fixed": 0.0, "standalonebatt.cost.plm.nonfixed": 0.0, "standalonebatt.cost.plm.percent": 0.0, diff --git a/deploy/runtime/defaults/Standalone Battery_Host Developer.json b/deploy/runtime/defaults/Standalone Battery_Host Developer.json index 98d8b77aa..cc2077781 100644 --- a/deploy/runtime/defaults/Standalone Battery_Host Developer.json +++ b/deploy/runtime/defaults/Standalone Battery_Host Developer.json @@ -55520,7 +55520,6 @@ "standalonebatt.cost.epc.percent": 0.0, "standalonebatt.cost.epc.total": 0.0, "standalonebatt.cost.installed_per_capacity": 1.61126, - "standalonebatt.cost.per_watt": 0.0, "standalonebatt.cost.plm.fixed": 0.0, "standalonebatt.cost.plm.nonfixed": 0.0, "standalonebatt.cost.plm.percent": 0.0, diff --git a/deploy/runtime/defaults/Standalone Battery_Leveraged Partnership Flip.json b/deploy/runtime/defaults/Standalone Battery_Leveraged Partnership Flip.json index eb2ae144f..952d498fb 100644 --- a/deploy/runtime/defaults/Standalone Battery_Leveraged Partnership Flip.json +++ b/deploy/runtime/defaults/Standalone Battery_Leveraged Partnership Flip.json @@ -29113,7 +29113,6 @@ "standalonebatt.cost.epc.percent": 0.0, "standalonebatt.cost.epc.total": 0.0, "standalonebatt.cost.installed_per_capacity": 1.35734, - "standalonebatt.cost.per_watt": 0.0, "standalonebatt.cost.plm.fixed": 0.0, "standalonebatt.cost.plm.nonfixed": 0.0, "standalonebatt.cost.plm.percent": 0.0, diff --git a/deploy/runtime/defaults/Standalone Battery_Merchant Plant.json b/deploy/runtime/defaults/Standalone Battery_Merchant Plant.json index 7726cdfd9..dafbf40c3 100644 --- a/deploy/runtime/defaults/Standalone Battery_Merchant Plant.json +++ b/deploy/runtime/defaults/Standalone Battery_Merchant Plant.json @@ -676812,7 +676812,6 @@ "standalonebatt.cost.epc.percent": 0.0, "standalonebatt.cost.epc.total": 0.0, "standalonebatt.cost.installed_per_capacity": 1.35734, - "standalonebatt.cost.per_watt": 0.0, "standalonebatt.cost.plm.fixed": 0.0, "standalonebatt.cost.plm.nonfixed": 0.0, "standalonebatt.cost.plm.percent": 0.0, diff --git a/deploy/runtime/defaults/Standalone Battery_Residential.json b/deploy/runtime/defaults/Standalone Battery_Residential.json index e1f749adc..bdeb10dbd 100644 --- a/deploy/runtime/defaults/Standalone Battery_Residential.json +++ b/deploy/runtime/defaults/Standalone Battery_Residential.json @@ -45973,7 +45973,6 @@ "standalonebatt.cost.epc.percent": 0.0, "standalonebatt.cost.epc.total": 5256.0, "standalonebatt.cost.installed_per_capacity": 2.72259, - "standalonebatt.cost.per_watt": 6.0, "standalonebatt.cost.plm.fixed": 0.0, "standalonebatt.cost.plm.nonfixed": 0.0, "standalonebatt.cost.plm.percent": 0.0, diff --git a/deploy/runtime/defaults/Standalone Battery_Sale Leaseback.json b/deploy/runtime/defaults/Standalone Battery_Sale Leaseback.json index e939544f2..f670bb1c6 100644 --- a/deploy/runtime/defaults/Standalone Battery_Sale Leaseback.json +++ b/deploy/runtime/defaults/Standalone Battery_Sale Leaseback.json @@ -29101,7 +29101,6 @@ "standalonebatt.cost.epc.percent": 0.0, "standalonebatt.cost.epc.total": 0.0, "standalonebatt.cost.installed_per_capacity": 1.35734, - "standalonebatt.cost.per_watt": 0.0, "standalonebatt.cost.plm.fixed": 0.0, "standalonebatt.cost.plm.nonfixed": 0.0, "standalonebatt.cost.plm.percent": 0.0, diff --git a/deploy/runtime/defaults/Standalone Battery_Single Owner.json b/deploy/runtime/defaults/Standalone Battery_Single Owner.json index 6f0151f08..d0daf78ef 100644 --- a/deploy/runtime/defaults/Standalone Battery_Single Owner.json +++ b/deploy/runtime/defaults/Standalone Battery_Single Owner.json @@ -29117,7 +29117,6 @@ "standalonebatt.cost.epc.percent": 0.0, "standalonebatt.cost.epc.total": 0.0, "standalonebatt.cost.installed_per_capacity": 1.35734, - "standalonebatt.cost.per_watt": 0.0, "standalonebatt.cost.plm.fixed": 0.0, "standalonebatt.cost.plm.nonfixed": 0.0, "standalonebatt.cost.plm.percent": 0.0, diff --git a/deploy/runtime/ui/CEC Performance Model with Module Database.json b/deploy/runtime/ui/CEC Performance Model with Module Database.json index 7de2eb0f8..d9b086c9e 100644 --- a/deploy/runtime/ui/CEC Performance Model with Module Database.json +++ b/deploy/runtime/ui/CEC Performance Model with Module Database.json @@ -3586,6 +3586,130 @@ } } }, + "Label": { + "Visible": 1.0, + "ObjectProperties": { + "Name": { + "Type": 5.0, + "String": "object 7" + }, + "X": { + "Type": 3.0, + "Integer": 816.0 + }, + "Y": { + "Type": 3.0, + "Integer": 312.0 + }, + "Width": { + "Type": 3.0, + "Integer": 39.0 + }, + "Height": { + "Type": 3.0, + "Integer": 24.0 + }, + "Tool Tip": { + "Type": 5.0, + "String": "" + }, + "Caption": { + "Type": 5.0, + "String": "%/°C" + }, + "TextColour": { + "Type": 4.0, + "Color": { + "Red": 0.0, + "Green": 0.0, + "Blue": 0.0, + "Alpha": 255.0 + } + }, + "Bold": { + "Type": 2.0, + "Boolean": 0.0 + }, + "FontSize": { + "Type": 3.0, + "Integer": 0.0 + }, + "WordWrap": { + "Type": 2.0, + "Boolean": 0.0 + }, + "AlignRight": { + "Type": 2.0, + "Boolean": 0.0 + }, + "AlignTop": { + "Type": 2.0, + "Boolean": 0.0 + } + } + }, + "Label": { + "Visible": 1.0, + "ObjectProperties": { + "Name": { + "Type": 5.0, + "String": "object 73" + }, + "X": { + "Type": 3.0, + "Integer": 963.0 + }, + "Y": { + "Type": 3.0, + "Integer": 312.0 + }, + "Width": { + "Type": 3.0, + "Integer": 39.0 + }, + "Height": { + "Type": 3.0, + "Integer": 24.0 + }, + "Tool Tip": { + "Type": 5.0, + "String": "" + }, + "Caption": { + "Type": 5.0, + "String": "W/°C" + }, + "TextColour": { + "Type": 4.0, + "Color": { + "Red": 0.0, + "Green": 0.0, + "Blue": 0.0, + "Alpha": 255.0 + } + }, + "Bold": { + "Type": 2.0, + "Boolean": 0.0 + }, + "FontSize": { + "Type": 3.0, + "Integer": 0.0 + }, + "WordWrap": { + "Type": 2.0, + "Boolean": 0.0 + }, + "AlignRight": { + "Type": 2.0, + "Boolean": 0.0 + }, + "AlignTop": { + "Type": 2.0, + "Boolean": 0.0 + } + } + }, "Label": { "Visible": 1.0, "ObjectProperties": { @@ -4081,11 +4205,11 @@ "cec_gamma_pmp": { "Version": 4.0, "Type": 1.0, - "Label": " ", + "Label": "Pmp temperature coefficient (percentage)", "Units": "%/°C", "Group": "PV Module (CEC Database)", "IndexLabels": "", - "Flags": 8.0, + "Flags": 9.0, "DefaultValue": 0.0, "UIObject": "Numeric", "sscVariableName": "", @@ -4393,11 +4517,11 @@ "gamma_pmp_calc": { "Version": 4.0, "Type": 1.0, - "Label": " ", + "Label": "Pmp temperature coefficient (Watts)", "Units": "W/°C", "Group": "PV Module (CEC Database)", "IndexLabels": "", - "Flags": 8.0, + "Flags": 9.0, "DefaultValue": 0.0, "UIObject": "Numeric", "sscVariableName": "", diff --git a/deploy/runtime/ui/MSLF IPH System Design.json b/deploy/runtime/ui/MSLF IPH System Design.json index 9c47a7b31..6b4739dab 100644 --- a/deploy/runtime/ui/MSLF IPH System Design.json +++ b/deploy/runtime/ui/MSLF IPH System Design.json @@ -2054,8 +2054,8 @@ "\t\t${TS_CALC_tes_htf_cp} = fail;\r", "\t\t\r", "\t\t// System Control\r", - "\t\t${W_dot_bop_design} = fail;\r", - "\t\t${W_dot_fixed} = fail;\r", + "\t\t${SC_CALC_bop} = fail;\r", + "\t\t${SC_CALC_aux} = fail;\r", "\t\t\r", "\t\t\r", "\t\t// Capital Costs\r", diff --git a/deploy/runtime/ui/MSLF System Design.json b/deploy/runtime/ui/MSLF System Design.json index 4e6b9ee02..230321401 100644 --- a/deploy/runtime/ui/MSLF System Design.json +++ b/deploy/runtime/ui/MSLF System Design.json @@ -2159,10 +2159,10 @@ "\t\t${TS_CALC_tes_htf_cp} = fail;\r", "\t\t\r", "\t\t// System Control\r", - "\t\t${W_dot_bop_design} = fail;\r", - "\t\t${W_dot_fixed} = fail;\r", + "\t\t${SC_CALC_bop} = fail;\r", + "\t\t${SC_CALC_aux} = fail;\r", "\t\t\r", - "\t\tif(csp_financial_model != 8)\r", + "\t\tif(${csp_financial_model} != 8)\r", "\t\t{\r", "\t\t\t// Capital Costs\r", "\t\t\t${CC_CALC_site_improvements_cost} = fail;\r", diff --git a/deploy/runtime/ui/Standalone Battery Costs.json b/deploy/runtime/ui/Standalone Battery Costs.json index 375a74182..dacde20ed 100644 --- a/deploy/runtime/ui/Standalone Battery Costs.json +++ b/deploy/runtime/ui/Standalone Battery Costs.json @@ -678,66 +678,75 @@ } } }, - "Numeric": { + "GroupBox": { "Visible": 1.0, "ObjectProperties": { "Name": { "Type": 5.0, - "String": "standalonebatt.cost.contingency" + "String": "grpTotalInstalledCost" }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 6.0 }, "Y": { "Type": 3.0, - "Integer": 75.0 + "Integer": 363.0 }, "Width": { "Type": 3.0, - "Integer": 136.0 + "Integer": 812.0 }, "Height": { "Type": 3.0, - "Integer": 21.0 + "Integer": 119.0 }, "Tool Tip": { "Type": 5.0, "String": "" }, - "Value": { - "Type": 1.0, - "Double": 0.0 + "Caption": { + "Type": 5.0, + "String": "grpTotalInstalledCost" }, - "Mode": { + "Bold": { + "Type": 2.0, + "Boolean": 1.0 + } + } + }, + "Label": { + "Visible": 1.0, + "ObjectProperties": { + "Name": { + "Type": 5.0, + "String": "lblTotalInstalledCost" + }, + "X": { "Type": 3.0, - "Integer": 1.0 + "Integer": 375.0 }, - "Format": { + "Y": { "Type": 3.0, - "Integer": 0.0 + "Integer": 387.0 }, - "Decimals": { + "Width": { "Type": 3.0, - "Integer": 2.0 + "Integer": 270.0 }, - "Prefix": { - "Type": 5.0, - "String": "$ " + "Height": { + "Type": 3.0, + "Integer": 21.0 }, - "Suffix": { + "Tool Tip": { "Type": 5.0, "String": "" }, - "ThousandsSep": { - "Type": 2.0, - "Boolean": 1.0 - }, - "Editable": { - "Type": 2.0, - "Boolean": 1.0 + "Caption": { + "Type": 5.0, + "String": "" }, - "ForeColour": { + "TextColour": { "Type": 4.0, "Color": { "Red": 0.0, @@ -746,81 +755,60 @@ "Alpha": 255.0 } }, - "BackColour": { - "Type": 4.0, - "Color": { - "Red": 255.0, - "Green": 255.0, - "Blue": 255.0, - "Alpha": 255.0 - } + "Bold": { + "Type": 2.0, + "Boolean": 1.0 }, - "TabOrder": { + "FontSize": { "Type": 3.0, - "Integer": 6.0 + "Integer": 0.0 + }, + "WordWrap": { + "Type": 2.0, + "Boolean": 1.0 + }, + "AlignRight": { + "Type": 2.0, + "Boolean": 1.0 + }, + "AlignTop": { + "Type": 2.0, + "Boolean": 0.0 } } }, - "Numeric": { + "Label": { "Visible": 1.0, "ObjectProperties": { "Name": { "Type": 5.0, - "String": "standalonebatt.cost.contingency_percent" + "String": "lblTotalInstalledCostDescription" }, "X": { "Type": 3.0, - "Integer": 366.0 + "Integer": 21.0 }, "Y": { "Type": 3.0, - "Integer": 75.0 + "Integer": 381.0 }, "Width": { "Type": 3.0, - "Integer": 100.0 + "Integer": 350.0 }, "Height": { "Type": 3.0, - "Integer": 21.0 + "Integer": 93.0 }, "Tool Tip": { "Type": 5.0, "String": "" }, - "Value": { - "Type": 1.0, - "Double": 0.0 - }, - "Mode": { - "Type": 3.0, - "Integer": 1.0 - }, - "Format": { - "Type": 3.0, - "Integer": 1.0 - }, - "Decimals": { - "Type": 3.0, - "Integer": 3.0 - }, - "Prefix": { - "Type": 5.0, - "String": "" - }, - "Suffix": { + "Caption": { "Type": 5.0, "String": "" }, - "ThousandsSep": { - "Type": 2.0, - "Boolean": 0.0 - }, - "Editable": { - "Type": 2.0, - "Boolean": 1.0 - }, - "ForeColour": { + "TextColour": { "Type": 4.0, "Color": { "Red": 0.0, @@ -829,288 +817,183 @@ "Alpha": 255.0 } }, - "BackColour": { - "Type": 4.0, - "Color": { - "Red": 255.0, - "Green": 255.0, - "Blue": 255.0, - "Alpha": 255.0 - } + "Bold": { + "Type": 2.0, + "Boolean": 0.0 }, - "TabOrder": { + "FontSize": { "Type": 3.0, - "Integer": 3.0 + "Integer": 0.0 + }, + "WordWrap": { + "Type": 2.0, + "Boolean": 1.0 + }, + "AlignRight": { + "Type": 2.0, + "Boolean": 0.0 + }, + "AlignTop": { + "Type": 2.0, + "Boolean": 1.0 } } }, - "Numeric": { + "Divider": { "Visible": 1.0, "ObjectProperties": { "Name": { "Type": 5.0, - "String": "standalonebatt.cost.epc.fixed" + "String": "object 2141" }, "X": { "Type": 3.0, - "Integer": 513.0 + "Integer": 642.0 }, "Y": { "Type": 3.0, - "Integer": 192.0 + "Integer": 249.0 }, "Width": { "Type": 3.0, - "Integer": 100.0 + "Integer": 136.0 }, "Height": { "Type": 3.0, - "Integer": 21.0 + "Integer": 16.0 }, "Tool Tip": { "Type": 5.0, "String": "" }, - "Value": { - "Type": 1.0, - "Double": 0.0 - }, - "Mode": { - "Type": 3.0, - "Integer": 1.0 - }, - "Format": { + "Orientation": { "Type": 3.0, "Integer": 0.0 }, - "Decimals": { - "Type": 3.0, - "Integer": 2.0 - }, - "Prefix": { - "Type": 5.0, - "String": "$ " - }, - "Suffix": { - "Type": 5.0, - "String": "" - }, - "ThousandsSep": { - "Type": 2.0, - "Boolean": 1.0 - }, - "Editable": { - "Type": 2.0, - "Boolean": 1.0 - }, - "ForeColour": { + "Colour": { "Type": 4.0, "Color": { - "Red": 0.0, - "Green": 0.0, - "Blue": 0.0, + "Red": 120.0, + "Green": 120.0, + "Blue": 120.0, "Alpha": 255.0 } }, - "BackColour": { - "Type": 4.0, - "Color": { - "Red": 255.0, - "Green": 255.0, - "Blue": 255.0, - "Alpha": 255.0 - } + "Caption": { + "Type": 5.0, + "String": "" }, - "TabOrder": { - "Type": 3.0, - "Integer": 5.0 + "Bold": { + "Type": 2.0, + "Boolean": 1.0 } } }, - "Numeric": { + "Divider": { "Visible": 1.0, "ObjectProperties": { "Name": { "Type": 5.0, - "String": "standalonebatt.cost.epc.nonfixed" + "String": "object 2142" }, "X": { "Type": 3.0, - "Integer": 384.0 + "Integer": 642.0 }, "Y": { "Type": 3.0, - "Integer": 192.0 + "Integer": 96.0 }, "Width": { "Type": 3.0, - "Integer": 100.0 + "Integer": 136.0 }, "Height": { "Type": 3.0, - "Integer": 21.0 + "Integer": 16.0 }, "Tool Tip": { "Type": 5.0, "String": "" }, - "Value": { - "Type": 1.0, - "Double": 0.0 - }, - "Mode": { - "Type": 3.0, - "Integer": 1.0 - }, - "Format": { + "Orientation": { "Type": 3.0, "Integer": 0.0 }, - "Decimals": { - "Type": 3.0, - "Integer": 2.0 - }, - "Prefix": { - "Type": 5.0, - "String": "" - }, - "Suffix": { - "Type": 5.0, - "String": "" - }, - "ThousandsSep": { - "Type": 2.0, - "Boolean": 1.0 - }, - "Editable": { - "Type": 2.0, - "Boolean": 1.0 - }, - "ForeColour": { + "Colour": { "Type": 4.0, "Color": { - "Red": 0.0, - "Green": 0.0, - "Blue": 0.0, + "Red": 120.0, + "Green": 120.0, + "Blue": 120.0, "Alpha": 255.0 } }, - "BackColour": { - "Type": 4.0, - "Color": { - "Red": 255.0, - "Green": 255.0, - "Blue": 255.0, - "Alpha": 255.0 - } + "Caption": { + "Type": 5.0, + "String": "" }, - "TabOrder": { - "Type": 3.0, - "Integer": 9.0 + "Bold": { + "Type": 2.0, + "Boolean": 1.0 } } }, - "Numeric": { + "GroupBox": { "Visible": 1.0, "ObjectProperties": { "Name": { "Type": 5.0, - "String": "standalonebatt.cost.epc.percent" + "String": "object 4" }, "X": { "Type": 3.0, - "Integer": 249.0 + "Integer": 6.0 }, "Y": { "Type": 3.0, - "Integer": 192.0 + "Integer": 297.0 }, "Width": { "Type": 3.0, - "Integer": 100.0 + "Integer": 812.0 }, "Height": { "Type": 3.0, - "Integer": 21.0 + "Integer": 62.0 }, "Tool Tip": { "Type": 5.0, "String": "" }, - "Value": { - "Type": 1.0, - "Double": 0.0 - }, - "Mode": { - "Type": 3.0, - "Integer": 1.0 - }, - "Format": { - "Type": 3.0, - "Integer": 1.0 - }, - "Decimals": { - "Type": 3.0, - "Integer": 3.0 - }, - "Prefix": { - "Type": 5.0, - "String": "" - }, - "Suffix": { + "Caption": { "Type": 5.0, - "String": " %" - }, - "ThousandsSep": { - "Type": 2.0, - "Boolean": 0.0 + "String": "Sales Tax" }, - "Editable": { + "Bold": { "Type": 2.0, "Boolean": 1.0 - }, - "ForeColour": { - "Type": 4.0, - "Color": { - "Red": 0.0, - "Green": 0.0, - "Blue": 0.0, - "Alpha": 255.0 - } - }, - "BackColour": { - "Type": 4.0, - "Color": { - "Red": 255.0, - "Green": 255.0, - "Blue": 255.0, - "Alpha": 255.0 - } - }, - "TabOrder": { - "Type": 3.0, - "Integer": 4.0 } } }, - "Numeric": { + "Label": { "Visible": 1.0, "ObjectProperties": { "Name": { "Type": 5.0, - "String": "standalonebatt.cost.epc.total" + "String": "object 7" }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 468.0 }, "Y": { "Type": 3.0, - "Integer": 192.0 + "Integer": 108.0 }, "Width": { "Type": 3.0, - "Integer": 136.0 + "Integer": 171.0 }, "Height": { "Type": 3.0, @@ -1120,39 +1003,11 @@ "Type": 5.0, "String": "" }, - "Value": { - "Type": 1.0, - "Double": 0.0 - }, - "Mode": { - "Type": 3.0, - "Integer": 1.0 - }, - "Format": { - "Type": 3.0, - "Integer": 0.0 - }, - "Decimals": { - "Type": 3.0, - "Integer": 2.0 - }, - "Prefix": { - "Type": 5.0, - "String": "$ " - }, - "Suffix": { + "Caption": { "Type": 5.0, - "String": "" - }, - "ThousandsSep": { - "Type": 2.0, - "Boolean": 1.0 - }, - "Editable": { - "Type": 2.0, - "Boolean": 1.0 + "String": "Total direct cost" }, - "ForeColour": { + "TextColour": { "Type": 4.0, "Color": { "Red": 0.0, @@ -1161,39 +1016,46 @@ "Alpha": 255.0 } }, - "BackColour": { - "Type": 4.0, - "Color": { - "Red": 255.0, - "Green": 255.0, - "Blue": 255.0, - "Alpha": 255.0 - } + "Bold": { + "Type": 2.0, + "Boolean": 1.0 }, - "TabOrder": { + "FontSize": { "Type": 3.0, - "Integer": 11.0 + "Integer": 0.0 + }, + "WordWrap": { + "Type": 2.0, + "Boolean": 1.0 + }, + "AlignRight": { + "Type": 2.0, + "Boolean": 1.0 + }, + "AlignTop": { + "Type": 2.0, + "Boolean": 0.0 } } }, - "Numeric": { + "Label": { "Visible": 1.0, "ObjectProperties": { "Name": { "Type": 5.0, - "String": "standalonebatt.cost.installed_per_capacity" + "String": "object 721" }, "X": { "Type": 3.0, - "Integer": 645.0 + "Integer": 297.0 }, "Y": { "Type": 3.0, - "Integer": 411.0 + "Integer": 54.0 }, "Width": { "Type": 3.0, - "Integer": 133.0 + "Integer": 18.0 }, "Height": { "Type": 3.0, @@ -1203,39 +1065,11 @@ "Type": 5.0, "String": "" }, - "Value": { - "Type": 1.0, - "Double": 0.0 - }, - "Mode": { - "Type": 3.0, - "Integer": 1.0 - }, - "Format": { - "Type": 3.0, - "Integer": 0.0 - }, - "Decimals": { - "Type": 3.0, - "Integer": 2.0 - }, - "Prefix": { - "Type": 5.0, - "String": "" - }, - "Suffix": { + "Caption": { "Type": 5.0, - "String": "" - }, - "ThousandsSep": { - "Type": 2.0, - "Boolean": 1.0 - }, - "Editable": { - "Type": 2.0, - "Boolean": 1.0 + "String": "×" }, - "ForeColour": { + "TextColour": { "Type": 4.0, "Color": { "Red": 0.0, @@ -1244,39 +1078,46 @@ "Alpha": 255.0 } }, - "BackColour": { - "Type": 4.0, - "Color": { - "Red": 255.0, - "Green": 255.0, - "Blue": 255.0, - "Alpha": 255.0 - } + "Bold": { + "Type": 2.0, + "Boolean": 0.0 }, - "TabOrder": { + "FontSize": { "Type": 3.0, - "Integer": 21.0 + "Integer": 0.0 + }, + "WordWrap": { + "Type": 2.0, + "Boolean": 0.0 + }, + "AlignRight": { + "Type": 2.0, + "Boolean": 0.0 + }, + "AlignTop": { + "Type": 2.0, + "Boolean": 0.0 } } }, - "Numeric": { + "Label": { "Visible": 1.0, "ObjectProperties": { "Name": { "Type": 5.0, - "String": "standalonebatt.cost.plm.fixed" + "String": "object 7217" }, "X": { "Type": 3.0, - "Integer": 513.0 + "Integer": 297.0 }, "Y": { "Type": 3.0, - "Integer": 216.0 + "Integer": 30.0 }, "Width": { "Type": 3.0, - "Integer": 100.0 + "Integer": 18.0 }, "Height": { "Type": 3.0, @@ -1286,39 +1127,11 @@ "Type": 5.0, "String": "" }, - "Value": { - "Type": 1.0, - "Double": 0.0 - }, - "Mode": { - "Type": 3.0, - "Integer": 1.0 - }, - "Format": { - "Type": 3.0, - "Integer": 0.0 - }, - "Decimals": { - "Type": 3.0, - "Integer": 2.0 - }, - "Prefix": { - "Type": 5.0, - "String": "$ " - }, - "Suffix": { + "Caption": { "Type": 5.0, - "String": "" - }, - "ThousandsSep": { - "Type": 2.0, - "Boolean": 1.0 - }, - "Editable": { - "Type": 2.0, - "Boolean": 1.0 + "String": "×" }, - "ForeColour": { + "TextColour": { "Type": 4.0, "Color": { "Red": 0.0, @@ -1327,31 +1140,38 @@ "Alpha": 255.0 } }, - "BackColour": { - "Type": 4.0, - "Color": { - "Red": 255.0, - "Green": 255.0, - "Blue": 255.0, - "Alpha": 255.0 - } + "Bold": { + "Type": 2.0, + "Boolean": 0.0 }, - "TabOrder": { + "FontSize": { "Type": 3.0, - "Integer": 7.0 + "Integer": 0.0 + }, + "WordWrap": { + "Type": 2.0, + "Boolean": 0.0 + }, + "AlignRight": { + "Type": 2.0, + "Boolean": 0.0 + }, + "AlignTop": { + "Type": 2.0, + "Boolean": 0.0 } } }, - "Numeric": { + "Label": { "Visible": 1.0, "ObjectProperties": { "Name": { "Type": 5.0, - "String": "standalonebatt.cost.plm.nonfixed" + "String": "object 723" }, "X": { "Type": 3.0, - "Integer": 384.0 + "Integer": 45.0 }, "Y": { "Type": 3.0, @@ -1359,7 +1179,7 @@ }, "Width": { "Type": 3.0, - "Integer": 100.0 + "Integer": 198.0 }, "Height": { "Type": 3.0, @@ -1369,39 +1189,11 @@ "Type": 5.0, "String": "" }, - "Value": { - "Type": 1.0, - "Double": 0.0 - }, - "Mode": { - "Type": 3.0, - "Integer": 1.0 - }, - "Format": { - "Type": 3.0, - "Integer": 0.0 - }, - "Decimals": { - "Type": 3.0, - "Integer": 2.0 - }, - "Prefix": { - "Type": 5.0, - "String": "" - }, - "Suffix": { + "Caption": { "Type": 5.0, - "String": "" - }, - "ThousandsSep": { - "Type": 2.0, - "Boolean": 1.0 - }, - "Editable": { - "Type": 2.0, - "Boolean": 1.0 + "String": "Permitting and other EPC costs" }, - "ForeColour": { + "TextColour": { "Type": 4.0, "Color": { "Red": 0.0, @@ -1410,122 +1202,46 @@ "Alpha": 255.0 } }, - "BackColour": { - "Type": 4.0, - "Color": { - "Red": 255.0, - "Green": 255.0, - "Blue": 255.0, - "Alpha": 255.0 - } - }, - "TabOrder": { - "Type": 3.0, - "Integer": 13.0 - } - } - }, - "Numeric": { - "Visible": 1.0, - "ObjectProperties": { - "Name": { - "Type": 5.0, - "String": "standalonebatt.cost.plm.percent" - }, - "X": { - "Type": 3.0, - "Integer": 249.0 - }, - "Y": { - "Type": 3.0, - "Integer": 216.0 - }, - "Width": { - "Type": 3.0, - "Integer": 100.0 - }, - "Height": { - "Type": 3.0, - "Integer": 21.0 - }, - "Tool Tip": { - "Type": 5.0, - "String": "" - }, - "Value": { - "Type": 1.0, - "Double": 0.0 - }, - "Mode": { - "Type": 3.0, - "Integer": 1.0 - }, - "Format": { - "Type": 3.0, - "Integer": 1.0 + "Bold": { + "Type": 2.0, + "Boolean": 0.0 }, - "Decimals": { + "FontSize": { "Type": 3.0, - "Integer": 3.0 - }, - "Prefix": { - "Type": 5.0, - "String": "" - }, - "Suffix": { - "Type": 5.0, - "String": " %" + "Integer": 0.0 }, - "ThousandsSep": { + "WordWrap": { "Type": 2.0, "Boolean": 0.0 }, - "Editable": { + "AlignRight": { "Type": 2.0, "Boolean": 1.0 }, - "ForeColour": { - "Type": 4.0, - "Color": { - "Red": 0.0, - "Green": 0.0, - "Blue": 0.0, - "Alpha": 255.0 - } - }, - "BackColour": { - "Type": 4.0, - "Color": { - "Red": 255.0, - "Green": 255.0, - "Blue": 255.0, - "Alpha": 255.0 - } - }, - "TabOrder": { - "Type": 3.0, - "Integer": 6.0 + "AlignTop": { + "Type": 2.0, + "Boolean": 0.0 } } }, - "Numeric": { + "Label": { "Visible": 1.0, "ObjectProperties": { "Name": { "Type": 5.0, - "String": "standalonebatt.cost.plm.total" + "String": "object 724" }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 18.0 }, "Y": { "Type": 3.0, - "Integer": 216.0 + "Integer": 192.0 }, "Width": { "Type": 3.0, - "Integer": 136.0 + "Integer": 225.0 }, "Height": { "Type": 3.0, @@ -1535,39 +1251,11 @@ "Type": 5.0, "String": "" }, - "Value": { - "Type": 1.0, - "Double": 0.0 - }, - "Mode": { - "Type": 3.0, - "Integer": 1.0 - }, - "Format": { - "Type": 3.0, - "Integer": 0.0 - }, - "Decimals": { - "Type": 3.0, - "Integer": 2.0 - }, - "Prefix": { - "Type": 5.0, - "String": "$ " - }, - "Suffix": { + "Caption": { "Type": 5.0, - "String": "" - }, - "ThousandsSep": { - "Type": 2.0, - "Boolean": 1.0 - }, - "Editable": { - "Type": 2.0, - "Boolean": 1.0 + "String": "Engineering and other EPC costs" }, - "ForeColour": { + "TextColour": { "Type": 4.0, "Color": { "Red": 0.0, @@ -1576,31 +1264,38 @@ "Alpha": 255.0 } }, - "BackColour": { - "Type": 4.0, - "Color": { - "Red": 255.0, - "Green": 255.0, - "Blue": 255.0, - "Alpha": 255.0 - } + "Bold": { + "Type": 2.0, + "Boolean": 0.0 }, - "TabOrder": { + "FontSize": { "Type": 3.0, - "Integer": 15.0 + "Integer": 0.0 + }, + "WordWrap": { + "Type": 2.0, + "Boolean": 0.0 + }, + "AlignRight": { + "Type": 2.0, + "Boolean": 1.0 + }, + "AlignTop": { + "Type": 2.0, + "Boolean": 0.0 } } }, - "Numeric": { + "Label": { "Visible": 1.0, "ObjectProperties": { "Name": { "Type": 5.0, - "String": "standalonebatt.cost.sales_tax.percent" + "String": "object 732" }, "X": { "Type": 3.0, - "Integer": 267.0 + "Integer": 537.0 }, "Y": { "Type": 3.0, @@ -1608,7 +1303,7 @@ }, "Width": { "Type": 3.0, - "Integer": 60.0 + "Integer": 105.0 }, "Height": { "Type": 3.0, @@ -1618,39 +1313,11 @@ "Type": 5.0, "String": "" }, - "Value": { - "Type": 1.0, - "Double": 0.0 - }, - "Mode": { - "Type": 3.0, - "Integer": 1.0 - }, - "Format": { - "Type": 3.0, - "Integer": 1.0 - }, - "Decimals": { - "Type": 3.0, - "Integer": 3.0 - }, - "Prefix": { - "Type": 5.0, - "String": "" - }, - "Suffix": { + "Caption": { "Type": 5.0, - "String": "" - }, - "ThousandsSep": { - "Type": 2.0, - "Boolean": 0.0 - }, - "Editable": { - "Type": 2.0, - "Boolean": 1.0 + "String": "Total sales tax" }, - "ForeColour": { + "TextColour": { "Type": 4.0, "Color": { "Red": 0.0, @@ -1659,122 +1326,46 @@ "Alpha": 255.0 } }, - "BackColour": { - "Type": 4.0, - "Color": { - "Red": 255.0, - "Green": 255.0, - "Blue": 255.0, - "Alpha": 255.0 - } - }, - "TabOrder": { - "Type": 3.0, - "Integer": 8.0 - } - } - }, - "Numeric": { - "Visible": 1.0, - "ObjectProperties": { - "Name": { - "Type": 5.0, - "String": "standalonebatt.cost.sales_tax.total" - }, - "X": { - "Type": 3.0, - "Integer": 645.0 - }, - "Y": { - "Type": 3.0, - "Integer": 321.0 - }, - "Width": { - "Type": 3.0, - "Integer": 133.0 - }, - "Height": { - "Type": 3.0, - "Integer": 21.0 - }, - "Tool Tip": { - "Type": 5.0, - "String": "" - }, - "Value": { - "Type": 1.0, - "Double": 0.0 - }, - "Mode": { - "Type": 3.0, - "Integer": 1.0 + "Bold": { + "Type": 2.0, + "Boolean": 1.0 }, - "Format": { + "FontSize": { "Type": 3.0, "Integer": 0.0 }, - "Decimals": { - "Type": 3.0, - "Integer": 2.0 - }, - "Prefix": { - "Type": 5.0, - "String": "$ " - }, - "Suffix": { - "Type": 5.0, - "String": "" - }, - "ThousandsSep": { + "WordWrap": { "Type": 2.0, "Boolean": 1.0 }, - "Editable": { + "AlignRight": { "Type": 2.0, "Boolean": 1.0 }, - "ForeColour": { - "Type": 4.0, - "Color": { - "Red": 0.0, - "Green": 0.0, - "Blue": 0.0, - "Alpha": 255.0 - } - }, - "BackColour": { - "Type": 4.0, - "Color": { - "Red": 255.0, - "Green": 255.0, - "Blue": 255.0, - "Alpha": 255.0 - } - }, - "TabOrder": { - "Type": 3.0, - "Integer": 18.0 + "AlignTop": { + "Type": 2.0, + "Boolean": 0.0 } } }, - "Numeric": { + "Label": { "Visible": 1.0, "ObjectProperties": { "Name": { "Type": 5.0, - "String": "standalonebatt.cost.sales_tax.value" + "String": "object 733" }, "X": { "Type": 3.0, - "Integer": 444.0 + "Integer": 468.0 }, "Y": { "Type": 3.0, - "Integer": 321.0 + "Integer": 261.0 }, "Width": { "Type": 3.0, - "Integer": 60.0 + "Integer": 171.0 }, "Height": { "Type": 3.0, @@ -1784,39 +1375,11 @@ "Type": 5.0, "String": "" }, - "Value": { - "Type": 1.0, - "Double": 0.0 - }, - "Mode": { - "Type": 3.0, - "Integer": 1.0 - }, - "Format": { - "Type": 3.0, - "Integer": 1.0 - }, - "Decimals": { - "Type": 3.0, - "Integer": 3.0 - }, - "Prefix": { - "Type": 5.0, - "String": "" - }, - "Suffix": { - "Type": 5.0, - "String": "" - }, - "ThousandsSep": { - "Type": 2.0, - "Boolean": 0.0 - }, - "Editable": { - "Type": 2.0, - "Boolean": 1.0 + "Caption": { + "Type": 5.0, + "String": "Total indirect cost" }, - "ForeColour": { + "TextColour": { "Type": 4.0, "Color": { "Red": 0.0, @@ -1825,43 +1388,50 @@ "Alpha": 255.0 } }, - "BackColour": { - "Type": 4.0, - "Color": { - "Red": 255.0, - "Green": 255.0, - "Blue": 255.0, - "Alpha": 255.0 - } + "Bold": { + "Type": 2.0, + "Boolean": 1.0 }, - "TabOrder": { + "FontSize": { "Type": 3.0, - "Integer": 16.0 + "Integer": 0.0 + }, + "WordWrap": { + "Type": 2.0, + "Boolean": 1.0 + }, + "AlignRight": { + "Type": 2.0, + "Boolean": 1.0 + }, + "AlignTop": { + "Type": 2.0, + "Boolean": 0.0 } } }, - "GroupBox": { + "Label": { "Visible": 1.0, "ObjectProperties": { "Name": { "Type": 5.0, - "String": "grpTotalInstalledCost" + "String": "object 735" }, "X": { "Type": 3.0, - "Integer": 6.0 + "Integer": 618.0 }, "Y": { "Type": 3.0, - "Integer": 363.0 + "Integer": 216.0 }, "Width": { "Type": 3.0, - "Integer": 812.0 + "Integer": 18.0 }, "Height": { "Type": 3.0, - "Integer": 119.0 + "Integer": 21.0 }, "Tool Tip": { "Type": 5.0, @@ -1869,11 +1439,36 @@ }, "Caption": { "Type": 5.0, - "String": "grpTotalInstalledCost" + "String": "=" + }, + "TextColour": { + "Type": 4.0, + "Color": { + "Red": 0.0, + "Green": 0.0, + "Blue": 0.0, + "Alpha": 255.0 + } }, "Bold": { "Type": 2.0, - "Boolean": 1.0 + "Boolean": 0.0 + }, + "FontSize": { + "Type": 3.0, + "Integer": 0.0 + }, + "WordWrap": { + "Type": 2.0, + "Boolean": 0.0 + }, + "AlignRight": { + "Type": 2.0, + "Boolean": 0.0 + }, + "AlignTop": { + "Type": 2.0, + "Boolean": 0.0 } } }, @@ -1882,19 +1477,19 @@ "ObjectProperties": { "Name": { "Type": 5.0, - "String": "lblTotalInstalledCost" + "String": "object 736" }, "X": { "Type": 3.0, - "Integer": 375.0 + "Integer": 618.0 }, "Y": { "Type": 3.0, - "Integer": 387.0 + "Integer": 192.0 }, "Width": { "Type": 3.0, - "Integer": 270.0 + "Integer": 18.0 }, "Height": { "Type": 3.0, @@ -1906,7 +1501,7 @@ }, "Caption": { "Type": 5.0, - "String": "" + "String": "=" }, "TextColour": { "Type": 4.0, @@ -1919,7 +1514,7 @@ }, "Bold": { "Type": 2.0, - "Boolean": 1.0 + "Boolean": 0.0 }, "FontSize": { "Type": 3.0, @@ -1927,11 +1522,11 @@ }, "WordWrap": { "Type": 2.0, - "Boolean": 1.0 + "Boolean": 0.0 }, "AlignRight": { "Type": 2.0, - "Boolean": 1.0 + "Boolean": 0.0 }, "AlignTop": { "Type": 2.0, @@ -1944,23 +1539,23 @@ "ObjectProperties": { "Name": { "Type": 5.0, - "String": "lblTotalInstalledCostDescription" + "String": "object 737" }, "X": { "Type": 3.0, - "Integer": 21.0 + "Integer": 492.0 }, "Y": { "Type": 3.0, - "Integer": 381.0 + "Integer": 213.0 }, "Width": { "Type": 3.0, - "Integer": 350.0 + "Integer": 18.0 }, "Height": { "Type": 3.0, - "Integer": 93.0 + "Integer": 21.0 }, "Tool Tip": { "Type": 5.0, @@ -1968,7 +1563,7 @@ }, "Caption": { "Type": 5.0, - "String": "" + "String": "+" }, "TextColour": { "Type": 4.0, @@ -1989,7 +1584,7 @@ }, "WordWrap": { "Type": 2.0, - "Boolean": 1.0 + "Boolean": 0.0 }, "AlignRight": { "Type": 2.0, @@ -1997,132 +1592,156 @@ }, "AlignTop": { "Type": 2.0, - "Boolean": 1.0 + "Boolean": 0.0 } } }, - "Divider": { + "Label": { "Visible": 1.0, "ObjectProperties": { "Name": { "Type": 5.0, - "String": "object 2141" + "String": "object 738" }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 492.0 }, "Y": { "Type": 3.0, - "Integer": 249.0 + "Integer": 192.0 }, "Width": { "Type": 3.0, - "Integer": 136.0 + "Integer": 18.0 }, "Height": { "Type": 3.0, - "Integer": 16.0 + "Integer": 21.0 }, "Tool Tip": { "Type": 5.0, "String": "" }, - "Orientation": { - "Type": 3.0, - "Integer": 0.0 + "Caption": { + "Type": 5.0, + "String": "+" }, - "Colour": { + "TextColour": { "Type": 4.0, "Color": { - "Red": 120.0, - "Green": 120.0, - "Blue": 120.0, + "Red": 0.0, + "Green": 0.0, + "Blue": 0.0, "Alpha": 255.0 } }, - "Caption": { - "Type": 5.0, - "String": "" - }, "Bold": { "Type": 2.0, - "Boolean": 1.0 + "Boolean": 0.0 + }, + "FontSize": { + "Type": 3.0, + "Integer": 0.0 + }, + "WordWrap": { + "Type": 2.0, + "Boolean": 0.0 + }, + "AlignRight": { + "Type": 2.0, + "Boolean": 0.0 + }, + "AlignTop": { + "Type": 2.0, + "Boolean": 0.0 } } }, - "Divider": { + "Label": { "Visible": 1.0, "ObjectProperties": { "Name": { "Type": 5.0, - "String": "object 2142" + "String": "object 739" }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 357.0 }, "Y": { "Type": 3.0, - "Integer": 96.0 + "Integer": 216.0 }, "Width": { "Type": 3.0, - "Integer": 136.0 + "Integer": 18.0 }, "Height": { "Type": 3.0, - "Integer": 16.0 + "Integer": 21.0 }, "Tool Tip": { "Type": 5.0, "String": "" }, - "Orientation": { - "Type": 3.0, - "Integer": 0.0 + "Caption": { + "Type": 5.0, + "String": "=" }, - "Colour": { + "TextColour": { "Type": 4.0, "Color": { - "Red": 120.0, - "Green": 120.0, - "Blue": 120.0, + "Red": 0.0, + "Green": 0.0, + "Blue": 0.0, "Alpha": 255.0 } }, - "Caption": { - "Type": 5.0, - "String": "" - }, "Bold": { "Type": 2.0, - "Boolean": 1.0 + "Boolean": 0.0 + }, + "FontSize": { + "Type": 3.0, + "Integer": 0.0 + }, + "WordWrap": { + "Type": 2.0, + "Boolean": 0.0 + }, + "AlignRight": { + "Type": 2.0, + "Boolean": 0.0 + }, + "AlignTop": { + "Type": 2.0, + "Boolean": 0.0 } } }, - "GroupBox": { + "Label": { "Visible": 1.0, "ObjectProperties": { "Name": { "Type": 5.0, - "String": "object 4" + "String": "object 740" }, "X": { "Type": 3.0, - "Integer": 6.0 + "Integer": 357.0 }, "Y": { "Type": 3.0, - "Integer": 297.0 + "Integer": 192.0 }, "Width": { "Type": 3.0, - "Integer": 812.0 + "Integer": 18.0 }, "Height": { "Type": 3.0, - "Integer": 62.0 + "Integer": 21.0 }, "Tool Tip": { "Type": 5.0, @@ -2130,11 +1749,36 @@ }, "Caption": { "Type": 5.0, - "String": "Sales Tax" + "String": "=" + }, + "TextColour": { + "Type": 4.0, + "Color": { + "Red": 0.0, + "Green": 0.0, + "Blue": 0.0, + "Alpha": 255.0 + } }, "Bold": { "Type": 2.0, - "Boolean": 1.0 + "Boolean": 0.0 + }, + "FontSize": { + "Type": 3.0, + "Integer": 0.0 + }, + "WordWrap": { + "Type": 2.0, + "Boolean": 0.0 + }, + "AlignRight": { + "Type": 2.0, + "Boolean": 0.0 + }, + "AlignTop": { + "Type": 2.0, + "Boolean": 0.0 } } }, @@ -2143,19 +1787,19 @@ "ObjectProperties": { "Name": { "Type": 5.0, - "String": "object 7" + "String": "object 743" }, "X": { "Type": 3.0, - "Integer": 468.0 + "Integer": 621.0 }, "Y": { "Type": 3.0, - "Integer": 108.0 + "Integer": 27.0 }, "Width": { "Type": 3.0, - "Integer": 171.0 + "Integer": 18.0 }, "Height": { "Type": 3.0, @@ -2167,7 +1811,7 @@ }, "Caption": { "Type": 5.0, - "String": "Total direct cost" + "String": "+" }, "TextColour": { "Type": 4.0, @@ -2180,7 +1824,7 @@ }, "Bold": { "Type": 2.0, - "Boolean": 1.0 + "Boolean": 0.0 }, "FontSize": { "Type": 3.0, @@ -2188,11 +1832,11 @@ }, "WordWrap": { "Type": 2.0, - "Boolean": 1.0 + "Boolean": 0.0 }, "AlignRight": { "Type": 2.0, - "Boolean": 1.0 + "Boolean": 0.0 }, "AlignTop": { "Type": 2.0, @@ -2205,15 +1849,15 @@ "ObjectProperties": { "Name": { "Type": 5.0, - "String": "object 721" + "String": "object 7432" }, "X": { "Type": 3.0, - "Integer": 297.0 + "Integer": 621.0 }, "Y": { "Type": 3.0, - "Integer": 54.0 + "Integer": 51.0 }, "Width": { "Type": 3.0, @@ -2229,7 +1873,7 @@ }, "Caption": { "Type": 5.0, - "String": "×" + "String": "=" }, "TextColour": { "Type": 4.0, @@ -2262,24 +1906,24 @@ } } }, - "Label": { + "Numeric": { "Visible": 1.0, "ObjectProperties": { "Name": { "Type": 5.0, - "String": "object 7217" + "String": "standalonebatt.cost.contingency" }, "X": { "Type": 3.0, - "Integer": 297.0 + "Integer": 642.0 }, "Y": { "Type": 3.0, - "Integer": 30.0 + "Integer": 75.0 }, "Width": { "Type": 3.0, - "Integer": 18.0 + "Integer": 136.0 }, "Height": { "Type": 3.0, @@ -2289,11 +1933,39 @@ "Type": 5.0, "String": "" }, - "Caption": { + "Value": { + "Type": 1.0, + "Double": 0.0 + }, + "Mode": { + "Type": 3.0, + "Integer": 1.0 + }, + "Format": { + "Type": 3.0, + "Integer": 0.0 + }, + "Decimals": { + "Type": 3.0, + "Integer": 2.0 + }, + "Prefix": { "Type": 5.0, - "String": "×" + "String": "$ " }, - "TextColour": { + "Suffix": { + "Type": 5.0, + "String": "" + }, + "ThousandsSep": { + "Type": 2.0, + "Boolean": 1.0 + }, + "Editable": { + "Type": 2.0, + "Boolean": 1.0 + }, + "ForeColour": { "Type": 4.0, "Color": { "Red": 0.0, @@ -2302,46 +1974,39 @@ "Alpha": 255.0 } }, - "Bold": { - "Type": 2.0, - "Boolean": 0.0 + "BackColour": { + "Type": 4.0, + "Color": { + "Red": 255.0, + "Green": 255.0, + "Blue": 255.0, + "Alpha": 255.0 + } }, - "FontSize": { + "TabOrder": { "Type": 3.0, - "Integer": 0.0 - }, - "WordWrap": { - "Type": 2.0, - "Boolean": 0.0 - }, - "AlignRight": { - "Type": 2.0, - "Boolean": 0.0 - }, - "AlignTop": { - "Type": 2.0, - "Boolean": 0.0 + "Integer": 6.0 } } }, - "Label": { + "Numeric": { "Visible": 1.0, "ObjectProperties": { "Name": { "Type": 5.0, - "String": "object 723" + "String": "standalonebatt.cost.contingency_percent" }, "X": { "Type": 3.0, - "Integer": 45.0 + "Integer": 366.0 }, "Y": { "Type": 3.0, - "Integer": 216.0 + "Integer": 75.0 }, "Width": { "Type": 3.0, - "Integer": 198.0 + "Integer": 100.0 }, "Height": { "Type": 3.0, @@ -2351,11 +2016,39 @@ "Type": 5.0, "String": "" }, - "Caption": { + "Value": { + "Type": 1.0, + "Double": 0.0 + }, + "Mode": { + "Type": 3.0, + "Integer": 1.0 + }, + "Format": { + "Type": 3.0, + "Integer": 1.0 + }, + "Decimals": { + "Type": 3.0, + "Integer": 3.0 + }, + "Prefix": { "Type": 5.0, - "String": "Permitting and other EPC costs" + "String": "" }, - "TextColour": { + "Suffix": { + "Type": 5.0, + "String": "" + }, + "ThousandsSep": { + "Type": 2.0, + "Boolean": 0.0 + }, + "Editable": { + "Type": 2.0, + "Boolean": 1.0 + }, + "ForeColour": { "Type": 4.0, "Color": { "Red": 0.0, @@ -2364,38 +2057,114 @@ "Alpha": 255.0 } }, - "Bold": { - "Type": 2.0, - "Boolean": 0.0 + "BackColour": { + "Type": 4.0, + "Color": { + "Red": 255.0, + "Green": 255.0, + "Blue": 255.0, + "Alpha": 255.0 + } }, - "FontSize": { + "TabOrder": { + "Type": 3.0, + "Integer": 3.0 + } + } + }, + "Numeric": { + "Visible": 1.0, + "ObjectProperties": { + "Name": { + "Type": 5.0, + "String": "standalonebatt.cost.epc.fixed" + }, + "X": { + "Type": 3.0, + "Integer": 513.0 + }, + "Y": { + "Type": 3.0, + "Integer": 192.0 + }, + "Width": { + "Type": 3.0, + "Integer": 100.0 + }, + "Height": { + "Type": 3.0, + "Integer": 21.0 + }, + "Tool Tip": { + "Type": 5.0, + "String": "" + }, + "Value": { + "Type": 1.0, + "Double": 0.0 + }, + "Mode": { + "Type": 3.0, + "Integer": 1.0 + }, + "Format": { "Type": 3.0, "Integer": 0.0 }, - "WordWrap": { - "Type": 2.0, - "Boolean": 0.0 + "Decimals": { + "Type": 3.0, + "Integer": 2.0 }, - "AlignRight": { + "Prefix": { + "Type": 5.0, + "String": "$ " + }, + "Suffix": { + "Type": 5.0, + "String": "" + }, + "ThousandsSep": { "Type": 2.0, "Boolean": 1.0 }, - "AlignTop": { + "Editable": { "Type": 2.0, - "Boolean": 0.0 + "Boolean": 1.0 + }, + "ForeColour": { + "Type": 4.0, + "Color": { + "Red": 0.0, + "Green": 0.0, + "Blue": 0.0, + "Alpha": 255.0 + } + }, + "BackColour": { + "Type": 4.0, + "Color": { + "Red": 255.0, + "Green": 255.0, + "Blue": 255.0, + "Alpha": 255.0 + } + }, + "TabOrder": { + "Type": 3.0, + "Integer": 5.0 } } }, - "Label": { + "Numeric": { "Visible": 1.0, "ObjectProperties": { "Name": { "Type": 5.0, - "String": "object 724" + "String": "standalonebatt.cost.epc.nonfixed" }, "X": { "Type": 3.0, - "Integer": 18.0 + "Integer": 384.0 }, "Y": { "Type": 3.0, @@ -2403,21 +2172,49 @@ }, "Width": { "Type": 3.0, - "Integer": 225.0 + "Integer": 100.0 + }, + "Height": { + "Type": 3.0, + "Integer": 21.0 + }, + "Tool Tip": { + "Type": 5.0, + "String": "" + }, + "Value": { + "Type": 1.0, + "Double": 0.0 + }, + "Mode": { + "Type": 3.0, + "Integer": 1.0 + }, + "Format": { + "Type": 3.0, + "Integer": 0.0 }, - "Height": { + "Decimals": { "Type": 3.0, - "Integer": 21.0 + "Integer": 2.0 }, - "Tool Tip": { + "Prefix": { "Type": 5.0, "String": "" }, - "Caption": { + "Suffix": { "Type": 5.0, - "String": "Engineering and other EPC costs" + "String": "" }, - "TextColour": { + "ThousandsSep": { + "Type": 2.0, + "Boolean": 1.0 + }, + "Editable": { + "Type": 2.0, + "Boolean": 1.0 + }, + "ForeColour": { "Type": 4.0, "Color": { "Red": 0.0, @@ -2426,46 +2223,39 @@ "Alpha": 255.0 } }, - "Bold": { - "Type": 2.0, - "Boolean": 0.0 + "BackColour": { + "Type": 4.0, + "Color": { + "Red": 255.0, + "Green": 255.0, + "Blue": 255.0, + "Alpha": 255.0 + } }, - "FontSize": { + "TabOrder": { "Type": 3.0, - "Integer": 0.0 - }, - "WordWrap": { - "Type": 2.0, - "Boolean": 0.0 - }, - "AlignRight": { - "Type": 2.0, - "Boolean": 1.0 - }, - "AlignTop": { - "Type": 2.0, - "Boolean": 0.0 + "Integer": 9.0 } } }, - "Label": { + "Numeric": { "Visible": 1.0, "ObjectProperties": { "Name": { "Type": 5.0, - "String": "object 732" + "String": "standalonebatt.cost.epc.percent" }, "X": { "Type": 3.0, - "Integer": 537.0 + "Integer": 249.0 }, "Y": { "Type": 3.0, - "Integer": 321.0 + "Integer": 192.0 }, "Width": { "Type": 3.0, - "Integer": 105.0 + "Integer": 100.0 }, "Height": { "Type": 3.0, @@ -2475,11 +2265,39 @@ "Type": 5.0, "String": "" }, - "Caption": { + "Value": { + "Type": 1.0, + "Double": 0.0 + }, + "Mode": { + "Type": 3.0, + "Integer": 1.0 + }, + "Format": { + "Type": 3.0, + "Integer": 1.0 + }, + "Decimals": { + "Type": 3.0, + "Integer": 3.0 + }, + "Prefix": { "Type": 5.0, - "String": "Total sales tax" + "String": "" }, - "TextColour": { + "Suffix": { + "Type": 5.0, + "String": " %" + }, + "ThousandsSep": { + "Type": 2.0, + "Boolean": 0.0 + }, + "Editable": { + "Type": 2.0, + "Boolean": 1.0 + }, + "ForeColour": { "Type": 4.0, "Color": { "Red": 0.0, @@ -2488,46 +2306,39 @@ "Alpha": 255.0 } }, - "Bold": { - "Type": 2.0, - "Boolean": 1.0 + "BackColour": { + "Type": 4.0, + "Color": { + "Red": 255.0, + "Green": 255.0, + "Blue": 255.0, + "Alpha": 255.0 + } }, - "FontSize": { + "TabOrder": { "Type": 3.0, - "Integer": 0.0 - }, - "WordWrap": { - "Type": 2.0, - "Boolean": 1.0 - }, - "AlignRight": { - "Type": 2.0, - "Boolean": 1.0 - }, - "AlignTop": { - "Type": 2.0, - "Boolean": 0.0 + "Integer": 4.0 } } }, - "Label": { + "Numeric": { "Visible": 1.0, "ObjectProperties": { "Name": { "Type": 5.0, - "String": "object 733" + "String": "standalonebatt.cost.epc.total" }, "X": { "Type": 3.0, - "Integer": 468.0 + "Integer": 642.0 }, "Y": { "Type": 3.0, - "Integer": 261.0 + "Integer": 192.0 }, "Width": { "Type": 3.0, - "Integer": 171.0 + "Integer": 136.0 }, "Height": { "Type": 3.0, @@ -2537,11 +2348,39 @@ "Type": 5.0, "String": "" }, - "Caption": { + "Value": { + "Type": 1.0, + "Double": 0.0 + }, + "Mode": { + "Type": 3.0, + "Integer": 1.0 + }, + "Format": { + "Type": 3.0, + "Integer": 0.0 + }, + "Decimals": { + "Type": 3.0, + "Integer": 2.0 + }, + "Prefix": { "Type": 5.0, - "String": "Total indirect cost" + "String": "$ " }, - "TextColour": { + "Suffix": { + "Type": 5.0, + "String": "" + }, + "ThousandsSep": { + "Type": 2.0, + "Boolean": 1.0 + }, + "Editable": { + "Type": 2.0, + "Boolean": 1.0 + }, + "ForeColour": { "Type": 4.0, "Color": { "Red": 0.0, @@ -2550,46 +2389,39 @@ "Alpha": 255.0 } }, - "Bold": { - "Type": 2.0, - "Boolean": 1.0 + "BackColour": { + "Type": 4.0, + "Color": { + "Red": 255.0, + "Green": 255.0, + "Blue": 255.0, + "Alpha": 255.0 + } }, - "FontSize": { + "TabOrder": { "Type": 3.0, - "Integer": 0.0 - }, - "WordWrap": { - "Type": 2.0, - "Boolean": 1.0 - }, - "AlignRight": { - "Type": 2.0, - "Boolean": 1.0 - }, - "AlignTop": { - "Type": 2.0, - "Boolean": 0.0 + "Integer": 11.0 } } }, - "Label": { + "Numeric": { "Visible": 1.0, "ObjectProperties": { "Name": { "Type": 5.0, - "String": "object 735" + "String": "standalonebatt.cost.installed_per_capacity" }, "X": { "Type": 3.0, - "Integer": 618.0 + "Integer": 645.0 }, "Y": { "Type": 3.0, - "Integer": 216.0 + "Integer": 411.0 }, "Width": { "Type": 3.0, - "Integer": 18.0 + "Integer": 133.0 }, "Height": { "Type": 3.0, @@ -2599,11 +2431,39 @@ "Type": 5.0, "String": "" }, - "Caption": { + "Value": { + "Type": 1.0, + "Double": 0.0 + }, + "Mode": { + "Type": 3.0, + "Integer": 1.0 + }, + "Format": { + "Type": 3.0, + "Integer": 0.0 + }, + "Decimals": { + "Type": 3.0, + "Integer": 2.0 + }, + "Prefix": { "Type": 5.0, - "String": "=" + "String": "" }, - "TextColour": { + "Suffix": { + "Type": 5.0, + "String": "" + }, + "ThousandsSep": { + "Type": 2.0, + "Boolean": 1.0 + }, + "Editable": { + "Type": 2.0, + "Boolean": 1.0 + }, + "ForeColour": { "Type": 4.0, "Color": { "Red": 0.0, @@ -2612,46 +2472,39 @@ "Alpha": 255.0 } }, - "Bold": { - "Type": 2.0, - "Boolean": 0.0 - }, - "FontSize": { - "Type": 3.0, - "Integer": 0.0 - }, - "WordWrap": { - "Type": 2.0, - "Boolean": 0.0 - }, - "AlignRight": { - "Type": 2.0, - "Boolean": 0.0 + "BackColour": { + "Type": 4.0, + "Color": { + "Red": 255.0, + "Green": 255.0, + "Blue": 255.0, + "Alpha": 255.0 + } }, - "AlignTop": { - "Type": 2.0, - "Boolean": 0.0 + "TabOrder": { + "Type": 3.0, + "Integer": 21.0 } } }, - "Label": { + "Numeric": { "Visible": 1.0, "ObjectProperties": { "Name": { "Type": 5.0, - "String": "object 736" + "String": "standalonebatt.cost.plm.fixed" }, "X": { "Type": 3.0, - "Integer": 618.0 + "Integer": 513.0 }, "Y": { "Type": 3.0, - "Integer": 192.0 + "Integer": 216.0 }, "Width": { "Type": 3.0, - "Integer": 18.0 + "Integer": 100.0 }, "Height": { "Type": 3.0, @@ -2661,11 +2514,39 @@ "Type": 5.0, "String": "" }, - "Caption": { + "Value": { + "Type": 1.0, + "Double": 0.0 + }, + "Mode": { + "Type": 3.0, + "Integer": 1.0 + }, + "Format": { + "Type": 3.0, + "Integer": 0.0 + }, + "Decimals": { + "Type": 3.0, + "Integer": 2.0 + }, + "Prefix": { "Type": 5.0, - "String": "=" + "String": "$ " }, - "TextColour": { + "Suffix": { + "Type": 5.0, + "String": "" + }, + "ThousandsSep": { + "Type": 2.0, + "Boolean": 1.0 + }, + "Editable": { + "Type": 2.0, + "Boolean": 1.0 + }, + "ForeColour": { "Type": 4.0, "Color": { "Red": 0.0, @@ -2674,46 +2555,39 @@ "Alpha": 255.0 } }, - "Bold": { - "Type": 2.0, - "Boolean": 0.0 + "BackColour": { + "Type": 4.0, + "Color": { + "Red": 255.0, + "Green": 255.0, + "Blue": 255.0, + "Alpha": 255.0 + } }, - "FontSize": { + "TabOrder": { "Type": 3.0, - "Integer": 0.0 - }, - "WordWrap": { - "Type": 2.0, - "Boolean": 0.0 - }, - "AlignRight": { - "Type": 2.0, - "Boolean": 0.0 - }, - "AlignTop": { - "Type": 2.0, - "Boolean": 0.0 + "Integer": 7.0 } } }, - "Label": { + "Numeric": { "Visible": 1.0, "ObjectProperties": { "Name": { "Type": 5.0, - "String": "object 737" + "String": "standalonebatt.cost.plm.nonfixed" }, "X": { "Type": 3.0, - "Integer": 492.0 + "Integer": 384.0 }, "Y": { "Type": 3.0, - "Integer": 213.0 + "Integer": 216.0 }, "Width": { "Type": 3.0, - "Integer": 18.0 + "Integer": 100.0 }, "Height": { "Type": 3.0, @@ -2723,11 +2597,39 @@ "Type": 5.0, "String": "" }, - "Caption": { + "Value": { + "Type": 1.0, + "Double": 0.0 + }, + "Mode": { + "Type": 3.0, + "Integer": 1.0 + }, + "Format": { + "Type": 3.0, + "Integer": 0.0 + }, + "Decimals": { + "Type": 3.0, + "Integer": 2.0 + }, + "Prefix": { "Type": 5.0, - "String": "+" + "String": "" }, - "TextColour": { + "Suffix": { + "Type": 5.0, + "String": "" + }, + "ThousandsSep": { + "Type": 2.0, + "Boolean": 1.0 + }, + "Editable": { + "Type": 2.0, + "Boolean": 1.0 + }, + "ForeColour": { "Type": 4.0, "Color": { "Red": 0.0, @@ -2736,46 +2638,39 @@ "Alpha": 255.0 } }, - "Bold": { - "Type": 2.0, - "Boolean": 0.0 + "BackColour": { + "Type": 4.0, + "Color": { + "Red": 255.0, + "Green": 255.0, + "Blue": 255.0, + "Alpha": 255.0 + } }, - "FontSize": { + "TabOrder": { "Type": 3.0, - "Integer": 0.0 - }, - "WordWrap": { - "Type": 2.0, - "Boolean": 0.0 - }, - "AlignRight": { - "Type": 2.0, - "Boolean": 0.0 - }, - "AlignTop": { - "Type": 2.0, - "Boolean": 0.0 + "Integer": 13.0 } } }, - "Label": { + "Numeric": { "Visible": 1.0, "ObjectProperties": { "Name": { "Type": 5.0, - "String": "object 738" + "String": "standalonebatt.cost.plm.percent" }, "X": { "Type": 3.0, - "Integer": 492.0 + "Integer": 249.0 }, "Y": { "Type": 3.0, - "Integer": 192.0 + "Integer": 216.0 }, "Width": { "Type": 3.0, - "Integer": 18.0 + "Integer": 100.0 }, "Height": { "Type": 3.0, @@ -2785,11 +2680,39 @@ "Type": 5.0, "String": "" }, - "Caption": { + "Value": { + "Type": 1.0, + "Double": 0.0 + }, + "Mode": { + "Type": 3.0, + "Integer": 1.0 + }, + "Format": { + "Type": 3.0, + "Integer": 1.0 + }, + "Decimals": { + "Type": 3.0, + "Integer": 3.0 + }, + "Prefix": { "Type": 5.0, - "String": "+" + "String": "" }, - "TextColour": { + "Suffix": { + "Type": 5.0, + "String": " %" + }, + "ThousandsSep": { + "Type": 2.0, + "Boolean": 0.0 + }, + "Editable": { + "Type": 2.0, + "Boolean": 1.0 + }, + "ForeColour": { "Type": 4.0, "Color": { "Red": 0.0, @@ -2798,38 +2721,31 @@ "Alpha": 255.0 } }, - "Bold": { - "Type": 2.0, - "Boolean": 0.0 + "BackColour": { + "Type": 4.0, + "Color": { + "Red": 255.0, + "Green": 255.0, + "Blue": 255.0, + "Alpha": 255.0 + } }, - "FontSize": { + "TabOrder": { "Type": 3.0, - "Integer": 0.0 - }, - "WordWrap": { - "Type": 2.0, - "Boolean": 0.0 - }, - "AlignRight": { - "Type": 2.0, - "Boolean": 0.0 - }, - "AlignTop": { - "Type": 2.0, - "Boolean": 0.0 + "Integer": 6.0 } } }, - "Label": { + "Numeric": { "Visible": 1.0, "ObjectProperties": { "Name": { "Type": 5.0, - "String": "object 739" + "String": "standalonebatt.cost.plm.total" }, "X": { "Type": 3.0, - "Integer": 357.0 + "Integer": 642.0 }, "Y": { "Type": 3.0, @@ -2837,7 +2753,7 @@ }, "Width": { "Type": 3.0, - "Integer": 18.0 + "Integer": 136.0 }, "Height": { "Type": 3.0, @@ -2847,11 +2763,39 @@ "Type": 5.0, "String": "" }, - "Caption": { + "Value": { + "Type": 1.0, + "Double": 0.0 + }, + "Mode": { + "Type": 3.0, + "Integer": 1.0 + }, + "Format": { + "Type": 3.0, + "Integer": 0.0 + }, + "Decimals": { + "Type": 3.0, + "Integer": 2.0 + }, + "Prefix": { "Type": 5.0, - "String": "=" + "String": "$ " + }, + "Suffix": { + "Type": 5.0, + "String": "" + }, + "ThousandsSep": { + "Type": 2.0, + "Boolean": 1.0 + }, + "Editable": { + "Type": 2.0, + "Boolean": 1.0 }, - "TextColour": { + "ForeColour": { "Type": 4.0, "Color": { "Red": 0.0, @@ -2860,46 +2804,39 @@ "Alpha": 255.0 } }, - "Bold": { - "Type": 2.0, - "Boolean": 0.0 + "BackColour": { + "Type": 4.0, + "Color": { + "Red": 255.0, + "Green": 255.0, + "Blue": 255.0, + "Alpha": 255.0 + } }, - "FontSize": { + "TabOrder": { "Type": 3.0, - "Integer": 0.0 - }, - "WordWrap": { - "Type": 2.0, - "Boolean": 0.0 - }, - "AlignRight": { - "Type": 2.0, - "Boolean": 0.0 - }, - "AlignTop": { - "Type": 2.0, - "Boolean": 0.0 + "Integer": 15.0 } } }, - "Label": { + "Numeric": { "Visible": 1.0, "ObjectProperties": { "Name": { "Type": 5.0, - "String": "object 740" + "String": "standalonebatt.cost.sales_tax.percent" }, "X": { "Type": 3.0, - "Integer": 357.0 + "Integer": 267.0 }, "Y": { "Type": 3.0, - "Integer": 192.0 + "Integer": 321.0 }, "Width": { "Type": 3.0, - "Integer": 18.0 + "Integer": 60.0 }, "Height": { "Type": 3.0, @@ -2909,11 +2846,39 @@ "Type": 5.0, "String": "" }, - "Caption": { + "Value": { + "Type": 1.0, + "Double": 0.0 + }, + "Mode": { + "Type": 3.0, + "Integer": 1.0 + }, + "Format": { + "Type": 3.0, + "Integer": 1.0 + }, + "Decimals": { + "Type": 3.0, + "Integer": 3.0 + }, + "Prefix": { "Type": 5.0, - "String": "=" + "String": "" }, - "TextColour": { + "Suffix": { + "Type": 5.0, + "String": "" + }, + "ThousandsSep": { + "Type": 2.0, + "Boolean": 0.0 + }, + "Editable": { + "Type": 2.0, + "Boolean": 1.0 + }, + "ForeColour": { "Type": 4.0, "Color": { "Red": 0.0, @@ -2922,46 +2887,39 @@ "Alpha": 255.0 } }, - "Bold": { - "Type": 2.0, - "Boolean": 0.0 + "BackColour": { + "Type": 4.0, + "Color": { + "Red": 255.0, + "Green": 255.0, + "Blue": 255.0, + "Alpha": 255.0 + } }, - "FontSize": { + "TabOrder": { "Type": 3.0, - "Integer": 0.0 - }, - "WordWrap": { - "Type": 2.0, - "Boolean": 0.0 - }, - "AlignRight": { - "Type": 2.0, - "Boolean": 0.0 - }, - "AlignTop": { - "Type": 2.0, - "Boolean": 0.0 + "Integer": 8.0 } } }, - "Label": { + "Numeric": { "Visible": 1.0, "ObjectProperties": { "Name": { "Type": 5.0, - "String": "object 743" + "String": "standalonebatt.cost.sales_tax.total" }, "X": { "Type": 3.0, - "Integer": 621.0 + "Integer": 645.0 }, "Y": { "Type": 3.0, - "Integer": 27.0 + "Integer": 321.0 }, "Width": { "Type": 3.0, - "Integer": 18.0 + "Integer": 133.0 }, "Height": { "Type": 3.0, @@ -2971,11 +2929,39 @@ "Type": 5.0, "String": "" }, - "Caption": { + "Value": { + "Type": 1.0, + "Double": 0.0 + }, + "Mode": { + "Type": 3.0, + "Integer": 1.0 + }, + "Format": { + "Type": 3.0, + "Integer": 0.0 + }, + "Decimals": { + "Type": 3.0, + "Integer": 2.0 + }, + "Prefix": { "Type": 5.0, - "String": "+" + "String": "$ " }, - "TextColour": { + "Suffix": { + "Type": 5.0, + "String": "" + }, + "ThousandsSep": { + "Type": 2.0, + "Boolean": 1.0 + }, + "Editable": { + "Type": 2.0, + "Boolean": 1.0 + }, + "ForeColour": { "Type": 4.0, "Color": { "Red": 0.0, @@ -2984,46 +2970,39 @@ "Alpha": 255.0 } }, - "Bold": { - "Type": 2.0, - "Boolean": 0.0 + "BackColour": { + "Type": 4.0, + "Color": { + "Red": 255.0, + "Green": 255.0, + "Blue": 255.0, + "Alpha": 255.0 + } }, - "FontSize": { + "TabOrder": { "Type": 3.0, - "Integer": 0.0 - }, - "WordWrap": { - "Type": 2.0, - "Boolean": 0.0 - }, - "AlignRight": { - "Type": 2.0, - "Boolean": 0.0 - }, - "AlignTop": { - "Type": 2.0, - "Boolean": 0.0 + "Integer": 18.0 } } }, - "Label": { + "Numeric": { "Visible": 1.0, "ObjectProperties": { "Name": { "Type": 5.0, - "String": "object 7432" + "String": "standalonebatt.cost.sales_tax.value" }, "X": { "Type": 3.0, - "Integer": 621.0 + "Integer": 444.0 }, "Y": { "Type": 3.0, - "Integer": 51.0 + "Integer": 321.0 }, "Width": { "Type": 3.0, - "Integer": 18.0 + "Integer": 60.0 }, "Height": { "Type": 3.0, @@ -3033,11 +3012,39 @@ "Type": 5.0, "String": "" }, - "Caption": { + "Value": { + "Type": 1.0, + "Double": 0.0 + }, + "Mode": { + "Type": 3.0, + "Integer": 1.0 + }, + "Format": { + "Type": 3.0, + "Integer": 1.0 + }, + "Decimals": { + "Type": 3.0, + "Integer": 3.0 + }, + "Prefix": { "Type": 5.0, - "String": "=" + "String": "" }, - "TextColour": { + "Suffix": { + "Type": 5.0, + "String": "" + }, + "ThousandsSep": { + "Type": 2.0, + "Boolean": 0.0 + }, + "Editable": { + "Type": 2.0, + "Boolean": 1.0 + }, + "ForeColour": { "Type": 4.0, "Color": { "Red": 0.0, @@ -3046,25 +3053,18 @@ "Alpha": 255.0 } }, - "Bold": { - "Type": 2.0, - "Boolean": 0.0 + "BackColour": { + "Type": 4.0, + "Color": { + "Red": 255.0, + "Green": 255.0, + "Blue": 255.0, + "Alpha": 255.0 + } }, - "FontSize": { + "TabOrder": { "Type": 3.0, - "Integer": 0.0 - }, - "WordWrap": { - "Type": 2.0, - "Boolean": 0.0 - }, - "AlignRight": { - "Type": 2.0, - "Boolean": 0.0 - }, - "AlignTop": { - "Type": 2.0, - "Boolean": 0.0 + "Integer": 16.0 } } }, @@ -3501,19 +3501,6 @@ "sscVariableName": "", "sscVariableValue": "" }, - "standalonebatt.cost.per_watt": { - "Version": 4.0, - "Type": 1.0, - "Label": "Cost per watt", - "Units": "$/W", - "Group": "Installation Costs", - "IndexLabels": "", - "Flags": 0.0, - "DefaultValue": 0.0, - "UIObject": "Numeric", - "sscVariableName": "", - "sscVariableValue": "" - }, "standalonebatt.cost.plm.fixed": { "Version": 4.0, "Type": 1.0, diff --git a/deploy/runtime/ui/TES Pressurized Water Cylinder with Piston Separator.json b/deploy/runtime/ui/TES Pressurized Water Cylinder with Piston Separator.json index 2f42a6743..68490203b 100644 --- a/deploy/runtime/ui/TES Pressurized Water Cylinder with Piston Separator.json +++ b/deploy/runtime/ui/TES Pressurized Water Cylinder with Piston Separator.json @@ -852,7 +852,7 @@ "Version": 4.0, "Type": 1.0, "Label": "Tank wall density", - "Units": "kg/m3", + "Units": "kg/m³", "Group": "", "IndexLabels": "", "Flags": 0.0, diff --git a/deploy/runtime/versions.lk b/deploy/runtime/versions.lk index d84a69726..b9aaf5d67 100644 --- a/deploy/runtime/versions.lk +++ b/deploy/runtime/versions.lk @@ -21,17 +21,17 @@ The value() function cannot change the data type of a variable, as that is set b To upgrade an old variable that no longer exists: x = oldvalue('derate1'); - value( 'loss1', 100*(1-x) ); + value( 'loss1', 100*(1-x), 'The fraction derate1 is now the percentage loss1' ); To upgrade an old variable that has a new datatype: x = oldvalue('derate1'); - value( 'derate1', [ x ] ); // derate is now an array to support schedules + value( 'derate1', [ x ], 'derate is now an array to support schedules' ); To upgrade just the value of an old variable (same name and datatype), such as when the units have changed: x = value('loss1'); - value( 'loss1', 100*x ); // units changed from fraction to percent + value( 'loss1', 100*x, 'units changed from fraction to percent' ); You don't need to delete any variables. Old variables are discarded when a project is saved, and only the currently valid values are saved in the project file. @@ -51,14 +51,19 @@ Some more examples: //*********************************************************************************************************************************************************** //CURRENT WORKING VERSION (see SAM/main_add.h) - CHANGE THIS VERSION NUMBER WHEN RELEASES ARE CREATED AND MAKE A NEW CURRENT WORKING VERSION FUNCTION +function variable_name_change(new, old){ + value(new, oldvalue(old), 'Variable name changed from \"' + old + '\" to \"' + new + '\"'); +} + version_upgrade{'2024.12.12'} = define() { const cfg = config(); // Physical Trough Model Changes - if(cfg.tech == 'Physical Trough') + if(cfg.tech == 'Physical Trough' || cfg.tech == 'Physical Trough IPH') { - message('We added new TES models and modified certain TES variable names in the physical trough model', 'warning'); + message('We added new packed bed and pressurized water cylinder TES options to the existing two-tank option on the Thermal Storage page. We also changed some TES variable names for the physical trough model.' + , 'warning'); if(isalnum(oldvalue('tes_tank_insul_percent')) == true) { @@ -68,48 +73,84 @@ version_upgrade{'2024.12.12'} = define() { { tes_type = 3; } - value('tes_type', tes_type); - value('TES_DISP_tes_type', tes_type - 1); + value('tes_type', tes_type, 'Update TES type option for SSC variable (1=two tank, 2=packed bed, 3=pressurized water)'); + value('TES_DISP_tes_type', tes_type - 1, 'Update TES type option for SAM user interface copy of variable (0=two tank, 1=packed bed, 2=pressurized water)'); } - value('tes_cyl_tank_thick', oldvalue('tes_tank_thick'), 'Updated variable name'); - value('tes_cyl_tank_cp', oldvalue('tes_tank_cp'), 'Updated variable name'); - value('tes_cyl_tank_dens', oldvalue('tes_tank_dens'), 'Updated variable name'); - value('tes_cyl_piston_loss_poly', oldvalue('tes_NT_piston_loss_poly'), 'Updated variable name'); - value('tes_cyl_tank_insul_percent', oldvalue('tes_tank_insul_percent'), 'Updated variable name'); + variable_name_change('tes_cyl_tank_thick', 'tes_tank_thick'); + variable_name_change('tes_cyl_tank_cp', 'tes_tank_cp'); + variable_name_change('tes_cyl_tank_dens', 'tes_tank_dens'); + variable_name_change('tes_cyl_tank_insul_percent', 'tes_tank_insul_percent'); + variable_name_change('tes_n_tsteps', 'tes_NT_nstep'); + + variable_name_change('tes_cyl_piston_loss_poly', 'tes_NT_piston_loss_poly'); + + piston_loss_poly = oldvalue('tes_NT_piston_loss_poly'); + if(piston_loss_poly!=null) { + piston_loss_poly_labels = ['tes_cyl_piston_loss_poly_0', + 'tes_cyl_piston_loss_poly_1', + 'tes_cyl_piston_loss_poly_2', + 'tes_cyl_piston_loss_poly_3']; + N_piston_loss_poly = #piston_loss_poly; + for (i = 0; i < #piston_loss_poly_labels; i++) { + if(i < N_piston_loss_poly) + val = piston_loss_poly[i]; + else + val = 0; + value(piston_loss_poly_labels[i], val); + } + } + + message('We added an option on the Solar Field page to specify the trough loop minimum and maximum mass flow rate limits as either absolute (kg/s) or relative (fraction) values.' + ' The default relative factors for minimum and maximum mass flow are 0.25 and 1.2, respectively.' + , 'warning'); + + value('use_abs_or_rel_mdot_limit', 0, 'Use relative minimum and maximum flow rate limits (fractions) by default'); + value('f_htfmin', 0.25, 'Set default minimum mass flow rate fraction'); + value('f_htfmax', 1.2, 'Set default maximum mass flow rate fraction'); } -}; - - -version_upgrade{'2024.5.28'} = define() { - const cfg = config(); - - is_btm_fin = ( cfg.fin == 'Residential' || cfg.fin == 'Commercial' || cfg.fin == 'Host Developer' || cfg.fin == 'Third Party' ); - is_fom_fin = ( cfg.fin == 'Single Owner' || cfg.fin == 'Leveraged Partnership Flip' || cfg.fin == 'All Equity Partnership Flip' || cfg.fin == 'Sale Leaseback' || cfg.fin == 'Merchant Plant' ); + // Linear Fresnel Model Changes + if(cfg.tech == 'MSLF' || cfg.tech == 'MSLF IPH') + { + message('We added an option on the Solar Field page to specify the trough loop minimum and maximum mass flow rate limits as either absolute (kg/s) or relative (fraction) values.' + ' The default relative factors for min and max mass flow are 0.25 and 1.2, respectively.' + , 'warning'); + + value('use_abs_or_rel_mdot_limit', 'Use relative (fraction) minimum and maximum flow rate limits by default'); + value('f_htfmin', 0.25, 'Set default minimum mass flow rate fraction'); + value('f_htfmax', 1.2, 'Set default maximum mass flow rate fraction'); + } // Detailed PV Model Changes if(cfg.tech == 'Flat Plate PV') { - gpmp = oldvalue('cec_gamma_r'); - value('cec_gamma_pmp', gpmp); - cgpmp = oldvalue('gamma_r_calc'); - value('gamma_pmp_calc', cgpmp); + variable_name_change('cec_gamma_pmp', 'cec_gamma_r'); + variable_name_change('gamma_pmp_calc', 'gamma_r_calc'); } + is_btm_fin = ( cfg.fin == 'Residential' || cfg.fin == 'Commercial' || cfg.fin == 'Host Developer' || cfg.fin == 'Third Party' ); + is_fom_fin = ( cfg.fin == 'Single Owner' || cfg.fin == 'Leveraged Partnership Flip' || cfg.fin == 'All Equity Partnership Flip' || cfg.fin == 'Sale Leaseback' || cfg.fin == 'Merchant Plant' ); + // Standalone Battery Changes if(cfg.tech == 'Standalone Battery') { + message('We added a new Battery Time Step input page to explicitly define the simulation time step for standalone batteries. (For batteries coupled with a power generation system, the simulation time step is defined by the system model.)', 'warning'); timestep_mins = 60; ts_per_hour = 1; if (is_btm_fin) { load = value("load"); ts_per_hour = #load / 8760; - } if (is_fom_fin) { - curtailment = value("grid_curtailment"); - ts_per_hour = #curtailment / 8760; + if ( value('batt_dispatch_choice_ui') == 1 ) { + custom_dispatch = value('batt_custom_dispatch'); + ts_per_hour = #custom_dispatch / 8760; + } + else { + curtailment = value("grid_curtailment"); + ts_per_hour = #curtailment / 8760; + } } timestep_mins /= ts_per_hour; options = [60, 30, 20, 15, 10, 5, 1]; @@ -118,34 +159,11 @@ version_upgrade{'2024.5.28'} = define() { i++; } - value("timestep_minutes", timestep_mins); - value("timestep_minutes_ui", i); + value("timestep_minutes", timestep_mins, 'Simulation time step in minutes'); + value("timestep_minutes_ui", i, 'Simulation time step option (0=60 min, 1=30 min, 2=20 min, 3=15 min, 4=10 min, 5=5 min, 6=1 min)'); } - // Physical Trough Model Changes - if(cfg.tech == 'Physical Trough' || cfg.tech == 'Physical Trough IPH') - { - message('We modified the trough loop min and max mass flow rate limits to allow either absolute or relative values.' - ' The default relative factors for min and max mass flow are 0.25 and 1.2, respectively.' - , 'warning'); - - value('use_abs_or_rel_mdot_limit', 0); - value('f_htfmin', 0.25); - value('f_htfmax', 1.2); - } - - // Linear Fresnel Model Changes - if(cfg.tech == 'MSLF' || cfg.tech == 'MSLF IPH') - { - message('We modified the linear fresnel loop min and max mass flow rate limits to allow either absolute or relative values.' - ' The default relative factors for min and max mass flow are 0.25 and 1.2, respectively.' - , 'warning'); - - value('use_abs_or_rel_mdot_limit', 0); - value('f_htfmin', 0.25); - value('f_htfmax', 1.2); - } - + //Check for renamed generic system configs if(cfg.tech == 'Generic System' || cfg.tech == 'Generic Battery' || cfg.tech == 'Generic PVWatts Wind FuelCell Battery Hybrid') { @@ -160,73 +178,67 @@ version_upgrade{'2024.5.28'} = define() { } if(cfg.tech == 'Generic PVWatts Wind FuelCell Battery Hybrid') { - message('We renamed Generic PVWatts Wind FuelCell Battery Hybrid to CustomGeneration PVWatts Wind FuelCell Battery Hybrid', 'warning'); + message('We renamed Generic PVWatts Wind FuelCell Battery Hybrid to CustomGeneration PVWatts Wind FuelCell Battery Hybrid.', 'warning'); config('CustomGeneration PVWatts Wind FuelCell Battery Hybrid', cfg.fin); - value('customgeneration_system_capacity', oldvalue('generic_system_capacity'), 'Variable name changed'); - value('customgeneration_total_installed_cost', oldvalue('generic_total_installed_cost'), 'Variable name changed'); + //value('customgeneration_system_capacity', oldvalue('generic_system_capacity'), 'Variable name changed'); + //value('customgeneration_total_installed_cost', oldvalue('generic_total_installed_cost'), 'Variable name changed'); } - - config_update_with_old_values(); - value('customgen.cost.contingency', oldvalue("genericsys.cost.contingency"), 'Variable name changed'); - value("customgen.cost.contingency_percent", oldvalue("genericsys.cost.contingency"), 'Variable name changed'); - value("customgen.cost.epc.fixed", oldvalue('customgen.cost.epc.fixed'), 'Variable name changed'); - value("customgen.cost.epc.nonfixed", oldvalue("genericsys.cost.epc.nonfixed"), 'Variable name changed'); - value("customgen.cost.epc.percent", oldvalue('custom.cost.epc.percent'), 'Variable name changed'); - value('customgen.cost.epc.total',oldvalue("genericsys.cost.epc.total"), 'Variable name changed'); - value('customgen.cost.installed_per_capacity',oldvalue("genericsys.cost.installed_per_capacity"), 'Variable name changed'); - value('customgen.cost.per_watt',oldvalue("genericsys.cost.per_watt"), 'Variable name changed'); - value('customgen.cost.plant',oldvalue("genericsys.cost.plant"), 'Variable name changed'); - value('customgen.cost.plant_scaled',oldvalue("genericsys.cost.plant_scaled"), 'Variable name changed'); - value('customgen.cost.plm.fixed',oldvalue("genericsys.cost.plm.fixed"), 'Variable name changed'); - value('customgen.cost.plm.nonfixed',oldvalue("genericsys.cost.plm.nonfixed"), 'Variable name changed'); - value('customgen.cost.plm.percent',oldvalue("genericsys.cost.plm.percent"), 'Variable name changed'); - value('customgen.cost.plm.total',oldvalue("genericsys.cost.plm.total"), 'Variable name changed'); - value('customgen.cost.sales_tax.percent',oldvalue("genericsys.cost.sales_tax.percent"), 'Variable name changed'); - value('customgen.cost.sales_tax.total',oldvalue("genericsys.cost.sales_tax.total"), 'Variable name changed'); - value('customgen.cost.sales_tax.value',oldvalue("genericsys.cost.sales_tax.value"), 'Variable name changed'); + config_update_with_old_values(); + + variable_name_change('customgen.cost.contingency', 'genericsys.cost.contingency'); + variable_name_change('customgen.cost.contingency_percent', 'genericsys.cost.contingency_percent'); + variable_name_change('customgen.cost.epc.fixed', 'genericsys.cost.epc.fixed'); + variable_name_change('customgen.cost.epc.nonfixed', 'genericsys.cost.epc.nonfixed'); + variable_name_change('customgen.cost.epc.percent', 'genericsys.cost.epc.percent'); + variable_name_change('customgen.cost.epc.total','genericsys.cost.epc.total'); + variable_name_change('customgen.cost.installed_per_capacity','genericsys.cost.installed_per_capacity'); + variable_name_change('customgen.cost.per_watt','genericsys.cost.per_watt'); + variable_name_change('customgen.cost.plant','genericsys.cost.plant'); + variable_name_change('customgen.cost.plant_scaled','genericsys.cost.plant_scaled'); + variable_name_change('customgen.cost.plm.fixed','genericsys.cost.plm.fixed'); + variable_name_change('customgen.cost.plm.nonfixed','genericsys.cost.plm.nonfixed'); + variable_name_change('customgen.cost.plm.percent','genericsys.cost.plm.percent'); + variable_name_change('customgen.cost.plm.total','genericsys.cost.plm.total'); + variable_name_change('customgen.cost.sales_tax.percent','genericsys.cost.sales_tax.percent'); + variable_name_change('customgen.cost.sales_tax.total','genericsys.cost.sales_tax.total'); + variable_name_change('customgen.cost.sales_tax.value','genericsys.cost.sales_tax.value'); } //Check for renamed marine battery cost variables - if(cfg.tech == "Marine Wave Battery") { - value('marinebatt.cost.contingency', oldvalue("genericsys.cost.contingency"), 'Variable name changed'); - value("marinebatt.cost.contingency_percent", oldvalue("genericsys.cost.contingency"), 'Variable name changed'); - value("marinebatt.cost.epc.fixed", oldvalue('customgen.cost.epc.fixed'), 'Variable name changed'); - value("marinebatt.cost.epc.nonfixed", oldvalue("genericsys.cost.epc.nonfixed"), 'Variable name changed'); - value("marinebatt.cost.epc.percent", oldvalue('custom.cost.epc.percent'), 'Variable name changed'); - value('marinebatt.cost.epc.total',oldvalue("genericsys.cost.epc.total"), 'Variable name changed'); - value('marinebatt.cost.installed_per_capacity',oldvalue("genericsys.cost.installed_per_capacity"), 'Variable name changed'); - value('marinebatt.cost.per_watt',oldvalue("genericsys.cost.per_watt"), 'Variable name changed'); - value('marinebatt.cost.plant',oldvalue("genericsys.cost.plant"), 'Variable name changed'); - value('marinebatt.cost.plant_scaled',oldvalue("genericsys.cost.plant_scaled"), 'Variable name changed'); - value('marinebatt.cost.plm.fixed',oldvalue("genericsys.cost.plm.fixed"), 'Variable name changed'); - value('marinebatt.cost.plm.nonfixed',oldvalue("genericsys.cost.plm.nonfixed"), 'Variable name changed'); - value('marinebatt.cost.plm.percent',oldvalue("genericsys.cost.plm.percent"), 'Variable name changed'); - value('marinebatt.cost.plm.total',oldvalue("genericsys.cost.plm.total"), 'Variable name changed'); - value('marinebatt.cost.sales_tax.percent',oldvalue("genericsys.cost.sales_tax.percent"), 'Variable name changed'); - value('marinebatt.cost.sales_tax.total',oldvalue("genericsys.cost.sales_tax.total"), 'Variable name changed'); - value('marinebatt.cost.sales_tax.value',oldvalue("genericsys.cost.sales_tax.value"), 'Variable name changed'); + if(cfg.tech == "MEwave Battery") { + variable_name_change('marinebatt.cost.contingency', 'genericsys.cost.contingency'); + variable_name_change('marinebatt.cost.contingency_percent', 'genericsys.cost.contingency_percent'); + variable_name_change('marinebatt.cost.epc.fixed', 'customgen.cost.epc.fixed'); + variable_name_change('marinebatt.cost.epc.nonfixed', 'genericsys.cost.epc.nonfixed'); + variable_name_change('marinebatt.cost.epc.percent', 'custom.cost.epc.percent'); + variable_name_change('marinebatt.cost.epc.total','genericsys.cost.epc.total'); + variable_name_change('marinebatt.cost.installed_per_capacity','genericsys.cost.installed_per_capacity'); + variable_name_change('marinebatt.cost.plm.fixed','genericsys.cost.plm.fixed'); + variable_name_change('marinebatt.cost.plm.nonfixed','genericsys.cost.plm.nonfixed'); + variable_name_change('marinebatt.cost.plm.percent','genericsys.cost.plm.percent'); + variable_name_change('marinebatt.cost.plm.total','genericsys.cost.plm.total'); + variable_name_change('marinebatt.cost.sales_tax.percent','genericsys.cost.sales_tax.percent'); + variable_name_change('marinebatt.cost.sales_tax.total','genericsys.cost.sales_tax.total'); + variable_name_change('marinebatt.cost.sales_tax.value','genericsys.cost.sales_tax.value'); } //Check for renamed standalone battery cost variables if(cfg.tech == "Standalone Battery") { - value('standalonebatt.cost.contingency', oldvalue("genericsys.cost.contingency"), 'Variable name changed'); - value("standalonebatt.cost.contingency_percent", oldvalue("genericsys.cost.contingency"), 'Variable name changed'); - value("standalonebatt.cost.epc.fixed", oldvalue('customgen.cost.epc.fixed'), 'Variable name changed'); - value("standalonebatt.cost.epc.nonfixed", oldvalue("genericsys.cost.epc.nonfixed"), 'Variable name changed'); - value("standalonebatt.cost.epc.percent", oldvalue('custom.cost.epc.percent'), 'Variable name changed'); - value('standalonebatt.cost.epc.total',oldvalue("genericsys.cost.epc.total"), 'Variable name changed'); - value('standalonebatt.cost.installed_per_capacity',oldvalue("genericsys.cost.installed_per_capacity"), 'Variable name changed'); - value('standalonebatt.cost.per_watt',oldvalue("genericsys.cost.per_watt"), 'Variable name changed'); - value('standalonebatt.cost.plant',oldvalue("genericsys.cost.plant"), 'Variable name changed'); - value('standalonebatt.cost.plant_scaled',oldvalue("genericsys.cost.plant_scaled"), 'Variable name changed'); - value('standalonebatt.cost.plm.fixed',oldvalue("genericsys.cost.plm.fixed"), 'Variable name changed'); - value('standalonebatt.cost.plm.nonfixed',oldvalue("genericsys.cost.plm.nonfixed"), 'Variable name changed'); - value('standalonebatt.cost.plm.percent',oldvalue("genericsys.cost.plm.percent"), 'Variable name changed'); - value('standalonebatt.cost.plm.total',oldvalue("genericsys.cost.plm.total"), 'Variable name changed'); - value('standalonebatt.cost.sales_tax.percent',oldvalue("genericsys.cost.sales_tax.percent"), 'Variable name changed'); - value('standalonebatt.cost.sales_tax.total',oldvalue("genericsys.cost.sales_tax.total"), 'Variable name changed'); - value('standalonebatt.cost.sales_tax.value',oldvalue("genericsys.cost.sales_tax.value"), 'Variable name changed'); + variable_name_change('standalonebatt.cost.contingency', 'genericsys.cost.contingency'); + variable_name_change('standalonebatt.cost.contingency_percent', 'genericsys.cost.contingency_percent'); + variable_name_change('standalonebatt.cost.epc.fixed', 'customgen.cost.epc.fixed'); + variable_name_change('standalonebatt.cost.epc.nonfixed', 'genericsys.cost.epc.nonfixed'); + variable_name_change('standalonebatt.cost.epc.percent', 'custom.cost.epc.percent'); + variable_name_change('standalonebatt.cost.epc.total','genericsys.cost.epc.total'); + variable_name_change('standalonebatt.cost.installed_per_capacity','genericsys.cost.installed_per_capacity'); + variable_name_change('standalonebatt.cost.plm.fixed','genericsys.cost.plm.fixed'); + variable_name_change('standalonebatt.cost.plm.nonfixed','genericsys.cost.plm.nonfixed'); + variable_name_change('standalonebatt.cost.plm.percent','genericsys.cost.plm.percent'); + variable_name_change('standalonebatt.cost.plm.total','genericsys.cost.plm.total'); + variable_name_change('standalonebatt.cost.sales_tax.percent','genericsys.cost.sales_tax.percent'); + variable_name_change('standalonebatt.cost.sales_tax.total','genericsys.cost.sales_tax.total'); + variable_name_change('standalonebatt.cost.sales_tax.value','genericsys.cost.sales_tax.value'); } diff --git a/src/project.cpp b/src/project.cpp index 5faa1e816..04c7f9cb1 100644 --- a/src/project.cpp +++ b/src/project.cpp @@ -502,11 +502,11 @@ static void fcall_vuc_value( lk::invoke_t &cxt ) VersionUpgrade::log( VersionUpgrade::VAR_ADDED, "Added '" + label + "', " + vv_strtypes[type] + ": " + valstr, reason ) ); } - else + else // variable's value or its name may have changed { vuc->GetLog( vuc->GetName() ).push_back( VersionUpgrade::log( VersionUpgrade::VAR_CHANGED, - "Changed '" + label + "' to: " + valstr, reason ) ); + label + " = " + valstr, reason ) ); } cxt.result().assign( ok ? 1.0 : 0.0 );