From 137893c5c71f34b37dd972bea5fe01089d07ffab Mon Sep 17 00:00:00 2001 From: Paul Gilman Date: Mon, 9 Dec 2024 15:54:45 -0800 Subject: [PATCH] UI fixes 2024 (#1926) * initial MSPT fixes * IPH UI fixes * UI fixes for Linux * IPH MSLF UI fixes * Revert to ^2 and ^3 to be consistent with ^4 * fixes for mac (#1929) Co-authored-by: Paul Gilman * Remove unused UI form for IPH electricity purchases --------- Co-authored-by: Darice L Guittet Co-authored-by: Brian Mirletz --- deploy/runtime/startup.lk | 1 - deploy/runtime/ui/Battery Thermal.json | 8 +- .../runtime/ui/Custom Generation Plant.json | 8 +- .../ui/Electricity Purchases Heat Model.json | 212 ----------- .../runtime/ui/Financial DSIRE Download.json | 4 +- .../ui/Financial Depreciation Simple.json | 12 +- .../runtime/ui/Financial LCOE Calculator.json | 48 +-- deploy/runtime/ui/Geothermal Costs.json | 110 +++--- .../ui/Geothermal Plant and Equipment.json | 32 +- deploy/runtime/ui/Geothermal Power Block.json | 12 +- .../ui/MSLF Collector and Receiver.json | 352 +++++++++--------- deploy/runtime/ui/MSLF IPH Capital Costs.json | 132 +++---- .../runtime/ui/MSLF IPH Dispatch Control.json | 96 ++--- .../runtime/ui/MSLF IPH System Control.json | 62 +-- deploy/runtime/ui/MSLF IPH System Design.json | 58 +-- deploy/runtime/ui/MSLF Solar Field.json | 10 +- .../runtime/ui/MSPT IPH Dispatch Control.json | 60 +-- .../runtime/ui/MSPT IPH System Control.json | 149 ++++---- deploy/runtime/ui/MSPT IPH System Design.json | 156 ++++---- deploy/runtime/ui/MSPT Parallel Heater.json | 2 +- deploy/runtime/ui/MSPT Receiver.json | 24 +- deploy/runtime/ui/PTES Capital Costs.json | 4 +- deploy/runtime/ui/PTES Heat Pump.json | 34 +- deploy/runtime/ui/PTES Power Cycle.json | 38 +- deploy/runtime/ui/PV Land Area.json | 8 +- deploy/runtime/ui/PV Losses.json | 14 +- .../ui/Physical Trough IPH Capital Costs.json | 2 +- .../ui/Physical Trough Solar Field.json | 8 +- .../ui/Physical Trough System Design.json | 34 +- .../ui/Physical Trough Thermal Storage.json | 2 +- deploy/runtime/ui/TES Two Tank.json | 2 +- .../ui/Tower SolarPilot Solar Field.json | 66 ++-- .../ui/Utility Rate - Description.json | 12 +- deploy/runtime/ui/Utility Rate - Flat.json | 50 +-- deploy/runtime/ui/Utility Rate - Unused.json | 28 +- 35 files changed, 822 insertions(+), 1028 deletions(-) delete mode 100644 deploy/runtime/ui/Electricity Purchases Heat Model.json diff --git a/deploy/runtime/startup.lk b/deploy/runtime/startup.lk index ef5f2fbd77..e5e0f817cc 100644 --- a/deploy/runtime/startup.lk +++ b/deploy/runtime/startup.lk @@ -1985,7 +1985,6 @@ setmodules(['mspt_iph', 'utilityrate5', 'singleowner_heat']); setup_MSPT_IPH_pages(); setup_lifetime_page(DEGRADATION_AC_SINGLE_YEAR); addpage( [['MSPT IPH Capital Costs' ]],{ 'sidebar'='Installation Costs', 'help'='cc_tower' } ); -//addpage([['Electricity Purchases Heat Model','Operating Costs']], {'sidebar' = 'Operating Costs', 'help'='oc_operating'} ); addpage([['Operating Costs IPH']], {'sidebar' = 'Operating Costs', 'help'='oc_operating'} ); addpage( [[ 'Utility Rate - Flat', { 'name'='Utility Rate - Description', 'caption'='Description and Applicability', 'collapsible'=true, 'collapsible_var'='ur_desc_is_shown', 'collapsed_by_default'=true }, diff --git a/deploy/runtime/ui/Battery Thermal.json b/deploy/runtime/ui/Battery Thermal.json index 4062c9b62e..058a289715 100644 --- a/deploy/runtime/ui/Battery Thermal.json +++ b/deploy/runtime/ui/Battery Thermal.json @@ -53,7 +53,7 @@ }, "Y": { "Type": 3.0, - "Integer": 102.0 + "Integer": 96.0 }, "Width": { "Type": 3.0, @@ -136,7 +136,7 @@ }, "Y": { "Type": 3.0, - "Integer": 129.0 + "Integer": 123.0 }, "Width": { "Type": 3.0, @@ -679,7 +679,7 @@ }, "Y": { "Type": 3.0, - "Integer": 156.0 + "Integer": 150.0 }, "Width": { "Type": 3.0, @@ -687,7 +687,7 @@ }, "Height": { "Type": 3.0, - "Integer": 24.0 + "Integer": 28.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/Custom Generation Plant.json b/deploy/runtime/ui/Custom Generation Plant.json index b90588e82a..40d1eb6569 100644 --- a/deploy/runtime/ui/Custom Generation Plant.json +++ b/deploy/runtime/ui/Custom Generation Plant.json @@ -24,7 +24,7 @@ }, "Height": { "Type": 3.0, - "Integer": 437.0 + "Integer": 440.0 }, "Tool Tip": { "Type": 5.0, @@ -308,7 +308,7 @@ }, "Y": { "Type": 3.0, - "Integer": 411.0 + "Integer": 414.0 }, "Width": { "Type": 3.0, @@ -1338,7 +1338,7 @@ "IndexLabels": "", "Flags": 0.0, "DefaultValue": 0.0, - "UIObject": "", + "UIObject": "LossAdjustment", "sscVariableName": "", "sscVariableValue": "" }, @@ -1554,7 +1554,7 @@ "IndexLabels": "", "Flags": 0.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, diff --git a/deploy/runtime/ui/Electricity Purchases Heat Model.json b/deploy/runtime/ui/Electricity Purchases Heat Model.json deleted file mode 100644 index 583bb790b3..0000000000 --- a/deploy/runtime/ui/Electricity Purchases Heat Model.json +++ /dev/null @@ -1,212 +0,0 @@ -{ - "Name": "Electricity Purchases Heat Model", - "Width": 821.0, - "Height": 113.0, - "FormObjects": { - "GroupBox": { - "Visible": 1.0, - "ObjectProperties": { - "Name": { - "Type": 5.0, - "String": "object 4" - }, - "X": { - "Type": 3.0, - "Integer": 12.0 - }, - "Y": { - "Type": 3.0, - "Integer": 12.0 - }, - "Width": { - "Type": 3.0, - "Integer": 789.0 - }, - "Height": { - "Type": 3.0, - "Integer": 84.0 - }, - "Tool Tip": { - "Type": 5.0, - "String": "" - }, - "Caption": { - "Type": 5.0, - "String": "Electricity Purchases" - }, - "Bold": { - "Type": 2.0, - "Boolean": 1.0 - } - } - }, - "SchedNumeric": { - "Visible": 1.0, - "ObjectProperties": { - "Name": { - "Type": 5.0, - "String": "om_elec_price_for_heat_techs" - }, - "X": { - "Type": 3.0, - "Integer": 276.0 - }, - "Y": { - "Type": 3.0, - "Integer": 42.0 - }, - "Width": { - "Type": 3.0, - "Integer": 90.0 - }, - "Height": { - "Type": 3.0, - "Integer": 21.0 - }, - "Tool Tip": { - "Type": 5.0, - "String": "" - }, - "Label": { - "Type": 5.0, - "String": "$/kWe-hr" - }, - "UseSchedule": { - "Type": 2.0, - "Boolean": 0.0 - }, - "ScheduleOnly": { - "Type": 2.0, - "Boolean": 0.0 - }, - "FixedLength": { - "Type": 3.0, - "Integer": -1.0 - }, - "Description": { - "Type": 5.0, - "String": "" - }, - "TabOrder": { - "Type": 3.0, - "Integer": -1.0 - } - } - }, - "Numeric": { - "Visible": 1.0, - "ObjectProperties": { - "Name": { - "Type": 5.0, - "String": "om_elec_price_for_heat_techs_escal" - }, - "X": { - "Type": 3.0, - "Integer": 591.0 - }, - "Y": { - "Type": 3.0, - "Integer": 42.0 - }, - "Width": { - "Type": 3.0, - "Integer": 90.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 - }, - "Decimals": { - "Type": 3.0, - "Integer": 3.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": { - "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": -1.0 - } - } - } - }, - "VarDatabase": { - "om_elec_price_for_heat_techs": { - "Version": 4.0, - "Type": 2.0, - "Label": "Price of electricity consumed by parasitics", - "Units": "$/kWe-hr", - "Group": "", - "IndexLabels": "", - "Flags": 0.0, - "DefaultValue": [ - 0.0 - ], - "UIObject": "SchedNumeric", - "sscVariableName": "", - "sscVariableValue": "" - }, - "om_elec_price_for_heat_techs_escal": { - "Version": 4.0, - "Type": 1.0, - "Label": "%", - "Units": "", - "Group": "", - "IndexLabels": "", - "Flags": 2.0, - "DefaultValue": 0.0, - "UIObject": "Numeric", - "sscVariableName": "", - "sscVariableValue": "" - } - }, - "Equations": [], - "Callbacks": [] -} \ No newline at end of file diff --git a/deploy/runtime/ui/Financial DSIRE Download.json b/deploy/runtime/ui/Financial DSIRE Download.json index a83f17502d..0d91cdccca 100644 --- a/deploy/runtime/ui/Financial DSIRE Download.json +++ b/deploy/runtime/ui/Financial DSIRE Download.json @@ -57,11 +57,11 @@ }, "Width": { "Type": 3.0, - "Integer": 110.0 + "Integer": 130.0 }, "Height": { "Type": 3.0, - "Integer": 21.0 + "Integer": 28.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/Financial Depreciation Simple.json b/deploy/runtime/ui/Financial Depreciation Simple.json index 6597b08dc7..879c66a02f 100644 --- a/deploy/runtime/ui/Financial Depreciation Simple.json +++ b/deploy/runtime/ui/Financial Depreciation Simple.json @@ -363,7 +363,7 @@ }, "Y": { "Type": 3.0, - "Integer": 120.0 + "Integer": 123.0 }, "Width": { "Type": 3.0, @@ -425,7 +425,7 @@ }, "Y": { "Type": 3.0, - "Integer": 120.0 + "Integer": 123.0 }, "Width": { "Type": 3.0, @@ -487,7 +487,7 @@ }, "Y": { "Type": 3.0, - "Integer": 120.0 + "Integer": 123.0 }, "Width": { "Type": 3.0, @@ -495,7 +495,7 @@ }, "Height": { "Type": 3.0, - "Integer": 21.0 + "Integer": 28.0 }, "Tool Tip": { "Type": 5.0, @@ -672,7 +672,7 @@ }, "Y": { "Type": 3.0, - "Integer": 120.0 + "Integer": 123.0 }, "Width": { "Type": 3.0, @@ -680,7 +680,7 @@ }, "Height": { "Type": 3.0, - "Integer": 21.0 + "Integer": 28.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/Financial LCOE Calculator.json b/deploy/runtime/ui/Financial LCOE Calculator.json index bac8d20fab..6b9d4d4306 100644 --- a/deploy/runtime/ui/Financial LCOE Calculator.json +++ b/deploy/runtime/ui/Financial LCOE Calculator.json @@ -20,7 +20,7 @@ }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 105.0 }, "Height": { "Type": 3.0, @@ -73,7 +73,7 @@ }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 105.0 }, "Height": { "Type": 3.0, @@ -156,7 +156,7 @@ }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 105.0 }, "Height": { "Type": 3.0, @@ -239,7 +239,7 @@ }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 105.0 }, "Height": { "Type": 3.0, @@ -292,7 +292,7 @@ }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 105.0 }, "Height": { "Type": 3.0, @@ -375,7 +375,7 @@ }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 105.0 }, "Height": { "Type": 3.0, @@ -458,7 +458,7 @@ }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 105.0 }, "Height": { "Type": 3.0, @@ -541,7 +541,7 @@ }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 105.0 }, "Height": { "Type": 3.0, @@ -624,7 +624,7 @@ }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 105.0 }, "Height": { "Type": 3.0, @@ -707,7 +707,7 @@ }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 105.0 }, "Height": { "Type": 3.0, @@ -790,7 +790,7 @@ }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 105.0 }, "Height": { "Type": 3.0, @@ -873,7 +873,7 @@ }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 105.0 }, "Height": { "Type": 3.0, @@ -1453,7 +1453,7 @@ }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 105.0 }, "Height": { "Type": 3.0, @@ -1536,7 +1536,7 @@ }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 105.0 }, "Height": { "Type": 3.0, @@ -1619,7 +1619,7 @@ }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 105.0 }, "Height": { "Type": 3.0, @@ -1751,7 +1751,7 @@ }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 105.0 }, "Height": { "Type": 3.0, @@ -1883,7 +1883,7 @@ }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 105.0 }, "Height": { "Type": 3.0, @@ -2028,7 +2028,7 @@ }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 105.0 }, "Height": { "Type": 3.0, @@ -2111,7 +2111,7 @@ }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 105.0 }, "Height": { "Type": 3.0, @@ -2194,7 +2194,7 @@ }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 105.0 }, "Height": { "Type": 3.0, @@ -2277,7 +2277,7 @@ }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 105.0 }, "Height": { "Type": 3.0, @@ -2360,7 +2360,7 @@ }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 105.0 }, "Height": { "Type": 3.0, @@ -2443,7 +2443,7 @@ }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 105.0 }, "Height": { "Type": 3.0, @@ -2526,7 +2526,7 @@ }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 105.0 }, "Height": { "Type": 3.0, diff --git a/deploy/runtime/ui/Geothermal Costs.json b/deploy/runtime/ui/Geothermal Costs.json index 794fc41b1d..34ebc99267 100644 --- a/deploy/runtime/ui/Geothermal Costs.json +++ b/deploy/runtime/ui/Geothermal Costs.json @@ -333,11 +333,11 @@ }, "X": { "Type": 3.0, - "Integer": 174.0 + "Integer": 195.0 }, "Y": { "Type": 3.0, - "Integer": 504.0 + "Integer": 507.0 }, "Width": { "Type": 3.0, @@ -581,15 +581,15 @@ }, "X": { "Type": 3.0, - "Integer": 12.0 + "Integer": 27.0 }, "Y": { "Type": 3.0, - "Integer": 549.0 + "Integer": 552.0 }, "Width": { "Type": 3.0, - "Integer": 161.0 + "Integer": 167.0 }, "Height": { "Type": 3.0, @@ -829,11 +829,11 @@ }, "X": { "Type": 3.0, - "Integer": 372.0 + "Integer": 393.0 }, "Y": { "Type": 3.0, - "Integer": 483.0 + "Integer": 486.0 }, "Width": { "Type": 3.0, @@ -953,11 +953,11 @@ }, "X": { "Type": 3.0, - "Integer": 477.0 + "Integer": 498.0 }, "Y": { "Type": 3.0, - "Integer": 483.0 + "Integer": 486.0 }, "Width": { "Type": 3.0, @@ -1015,15 +1015,15 @@ }, "X": { "Type": 3.0, - "Integer": 12.0 + "Integer": 27.0 }, "Y": { "Type": 3.0, - "Integer": 525.0 + "Integer": 528.0 }, "Width": { "Type": 3.0, - "Integer": 161.0 + "Integer": 167.0 }, "Height": { "Type": 3.0, @@ -1449,11 +1449,11 @@ }, "X": { "Type": 3.0, - "Integer": 582.0 + "Integer": 603.0 }, "Y": { "Type": 3.0, - "Integer": 483.0 + "Integer": 486.0 }, "Width": { "Type": 3.0, @@ -1511,11 +1511,11 @@ }, "X": { "Type": 3.0, - "Integer": 174.0 + "Integer": 195.0 }, "Y": { "Type": 3.0, - "Integer": 483.0 + "Integer": 486.0 }, "Width": { "Type": 3.0, @@ -1759,11 +1759,11 @@ }, "X": { "Type": 3.0, - "Integer": 699.0 + "Integer": 720.0 }, "Y": { "Type": 3.0, - "Integer": 483.0 + "Integer": 486.0 }, "Width": { "Type": 3.0, @@ -1945,11 +1945,11 @@ }, "X": { "Type": 3.0, - "Integer": 267.0 + "Integer": 288.0 }, "Y": { "Type": 3.0, - "Integer": 483.0 + "Integer": 486.0 }, "Width": { "Type": 3.0, @@ -2347,11 +2347,11 @@ }, "X": { "Type": 3.0, - "Integer": 477.0 + "Integer": 498.0 }, "Y": { "Type": 3.0, - "Integer": 549.0 + "Integer": 552.0 }, "Width": { "Type": 3.0, @@ -2430,11 +2430,11 @@ }, "X": { "Type": 3.0, - "Integer": 174.0 + "Integer": 195.0 }, "Y": { "Type": 3.0, - "Integer": 549.0 + "Integer": 552.0 }, "Width": { "Type": 3.0, @@ -2513,11 +2513,11 @@ }, "X": { "Type": 3.0, - "Integer": 582.0 + "Integer": 603.0 }, "Y": { "Type": 3.0, - "Integer": 549.0 + "Integer": 552.0 }, "Width": { "Type": 3.0, @@ -2596,11 +2596,11 @@ }, "X": { "Type": 3.0, - "Integer": 372.0 + "Integer": 393.0 }, "Y": { "Type": 3.0, - "Integer": 549.0 + "Integer": 552.0 }, "Width": { "Type": 3.0, @@ -2679,11 +2679,11 @@ }, "X": { "Type": 3.0, - "Integer": 267.0 + "Integer": 288.0 }, "Y": { "Type": 3.0, - "Integer": 549.0 + "Integer": 552.0 }, "Width": { "Type": 3.0, @@ -2762,11 +2762,11 @@ }, "X": { "Type": 3.0, - "Integer": 687.0 + "Integer": 708.0 }, "Y": { "Type": 3.0, - "Integer": 549.0 + "Integer": 552.0 }, "Width": { "Type": 3.0, @@ -3633,11 +3633,11 @@ }, "X": { "Type": 3.0, - "Integer": 477.0 + "Integer": 498.0 }, "Y": { "Type": 3.0, - "Integer": 525.0 + "Integer": 528.0 }, "Width": { "Type": 3.0, @@ -3716,11 +3716,11 @@ }, "X": { "Type": 3.0, - "Integer": 174.0 + "Integer": 195.0 }, "Y": { "Type": 3.0, - "Integer": 525.0 + "Integer": 528.0 }, "Width": { "Type": 3.0, @@ -3799,11 +3799,11 @@ }, "X": { "Type": 3.0, - "Integer": 582.0 + "Integer": 603.0 }, "Y": { "Type": 3.0, - "Integer": 525.0 + "Integer": 528.0 }, "Width": { "Type": 3.0, @@ -3882,11 +3882,11 @@ }, "X": { "Type": 3.0, - "Integer": 372.0 + "Integer": 393.0 }, "Y": { "Type": 3.0, - "Integer": 525.0 + "Integer": 528.0 }, "Width": { "Type": 3.0, @@ -3965,11 +3965,11 @@ }, "X": { "Type": 3.0, - "Integer": 267.0 + "Integer": 288.0 }, "Y": { "Type": 3.0, - "Integer": 525.0 + "Integer": 528.0 }, "Width": { "Type": 3.0, @@ -4048,11 +4048,11 @@ }, "X": { "Type": 3.0, - "Integer": 687.0 + "Integer": 708.0 }, "Y": { "Type": 3.0, - "Integer": 525.0 + "Integer": 528.0 }, "Width": { "Type": 3.0, @@ -4267,7 +4267,7 @@ }, "Height": { "Type": 3.0, - "Integer": 21.0 + "Integer": 28.0 }, "Tool Tip": { "Type": 5.0, @@ -4308,7 +4308,7 @@ }, "Height": { "Type": 3.0, - "Integer": 21.0 + "Integer": 28.0 }, "Tool Tip": { "Type": 5.0, @@ -4349,7 +4349,7 @@ }, "Height": { "Type": 3.0, - "Integer": 21.0 + "Integer": 28.0 }, "Tool Tip": { "Type": 5.0, @@ -5800,7 +5800,7 @@ }, "Height": { "Type": 3.0, - "Integer": 24.0 + "Integer": 28.0 }, "Tool Tip": { "Type": 5.0, @@ -5841,7 +5841,7 @@ }, "Height": { "Type": 3.0, - "Integer": 24.0 + "Integer": 28.0 }, "Tool Tip": { "Type": 5.0, @@ -5882,7 +5882,7 @@ }, "Height": { "Type": 3.0, - "Integer": 24.0 + "Integer": 28.0 }, "Tool Tip": { "Type": 5.0, @@ -8769,11 +8769,11 @@ }, "X": { "Type": 3.0, - "Integer": 813.0 + "Integer": 834.0 }, "Y": { "Type": 3.0, - "Integer": 546.0 + "Integer": 549.0 }, "Width": { "Type": 3.0, @@ -8806,11 +8806,11 @@ }, "X": { "Type": 3.0, - "Integer": 813.0 + "Integer": 834.0 }, "Y": { "Type": 3.0, - "Integer": 522.0 + "Integer": 525.0 }, "Width": { "Type": 3.0, @@ -10537,7 +10537,7 @@ }, "Height": { "Type": 3.0, - "Integer": 24.0 + "Integer": 28.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/Geothermal Plant and Equipment.json b/deploy/runtime/ui/Geothermal Plant and Equipment.json index 521c289636..ffe248e38f 100644 --- a/deploy/runtime/ui/Geothermal Plant and Equipment.json +++ b/deploy/runtime/ui/Geothermal Plant and Equipment.json @@ -1,7 +1,7 @@ { "Name": "Geothermal Plant and Equipment", - "Width": 857.0, - "Height": 1016.0, + "Width": 844.0, + "Height": 774.0, "FormObjects": { "CheckBox": { "Visible": 1.0, @@ -526,11 +526,11 @@ }, "X": { "Type": 3.0, - "Integer": 660.0 + "Integer": 693.0 }, "Y": { "Type": 3.0, - "Integer": 480.0 + "Integer": 483.0 }, "Width": { "Type": 3.0, @@ -1848,7 +1848,7 @@ }, "X": { "Type": 3.0, - "Integer": 792.0 + "Integer": 807.0 }, "Y": { "Type": 3.0, @@ -1897,7 +1897,7 @@ }, "Height": { "Type": 3.0, - "Integer": 96.0 + "Integer": 105.0 }, "Tool Tip": { "Type": 5.0, @@ -2362,11 +2362,11 @@ }, "X": { "Type": 3.0, - "Integer": 399.0 + "Integer": 411.0 }, "Y": { "Type": 3.0, - "Integer": 456.0 + "Integer": 459.0 }, "Width": { "Type": 3.0, @@ -3004,7 +3004,7 @@ }, "X": { "Type": 3.0, - "Integer": 297.0 + "Integer": 309.0 }, "Y": { "Type": 3.0, @@ -3087,11 +3087,11 @@ }, "X": { "Type": 3.0, - "Integer": 297.0 + "Integer": 309.0 }, "Y": { "Type": 3.0, - "Integer": 456.0 + "Integer": 459.0 }, "Width": { "Type": 3.0, @@ -3294,11 +3294,11 @@ }, "X": { "Type": 3.0, - "Integer": 660.0 + "Integer": 693.0 }, "Y": { "Type": 3.0, - "Integer": 432.0 + "Integer": 435.0 }, "Width": { "Type": 3.0, @@ -3377,11 +3377,11 @@ }, "X": { "Type": 3.0, - "Integer": 660.0 + "Integer": 693.0 }, "Y": { "Type": 3.0, - "Integer": 456.0 + "Integer": 459.0 }, "Width": { "Type": 3.0, @@ -3462,7 +3462,7 @@ "IndexLabels": "", "Flags": 0.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "LossAdjustment", "sscVariableName": "", "sscVariableValue": "" }, diff --git a/deploy/runtime/ui/Geothermal Power Block.json b/deploy/runtime/ui/Geothermal Power Block.json index 9bcf423377..33bc0379f1 100644 --- a/deploy/runtime/ui/Geothermal Power Block.json +++ b/deploy/runtime/ui/Geothermal Power Block.json @@ -164,7 +164,7 @@ }, "Y": { "Type": 3.0, - "Integer": 255.0 + "Integer": 252.0 }, "Width": { "Type": 3.0, @@ -722,7 +722,7 @@ }, "Y": { "Type": 3.0, - "Integer": 447.0 + "Integer": 450.0 }, "Width": { "Type": 3.0, @@ -730,7 +730,7 @@ }, "Height": { "Type": 3.0, - "Integer": 66.0 + "Integer": 63.0 }, "Tool Tip": { "Type": 5.0, @@ -1676,7 +1676,7 @@ }, "Y": { "Type": 3.0, - "Integer": 258.0 + "Integer": 249.0 }, "Width": { "Type": 3.0, @@ -1684,7 +1684,7 @@ }, "Height": { "Type": 3.0, - "Integer": 21.0 + "Integer": 28.0 }, "Tool Tip": { "Type": 5.0, @@ -2600,7 +2600,7 @@ }, "Height": { "Type": 3.0, - "Integer": 21.0 + "Integer": 28.0 }, "Tool Tip": { "Type": 5.0, diff --git a/deploy/runtime/ui/MSLF Collector and Receiver.json b/deploy/runtime/ui/MSLF Collector and Receiver.json index bcf8b2c11c..db694ab9f4 100644 --- a/deploy/runtime/ui/MSLF Collector and Receiver.json +++ b/deploy/runtime/ui/MSLF Collector and Receiver.json @@ -1,7 +1,7 @@ { "Name": "MSLF Collector and Receiver", - "Width": 774.0, - "Height": 1543.0, + "Width": 773.0, + "Height": 1527.0, "FormObjects": { "Numeric": { "Visible": 1.0, @@ -680,15 +680,15 @@ }, "Y": { "Type": 3.0, - "Integer": 1020.0 + "Integer": 1023.0 }, "Width": { "Type": 3.0, - "Integer": 100.0 + "Integer": 166.0 }, "Height": { "Type": 3.0, - "Integer": 21.0 + "Integer": 28.0 }, "Tool Tip": { "Type": 5.0, @@ -729,7 +729,7 @@ }, "Height": { "Type": 3.0, - "Integer": 21.0 + "Integer": 28.0 }, "Tool Tip": { "Type": 5.0, @@ -770,7 +770,7 @@ }, "Height": { "Type": 3.0, - "Integer": 21.0 + "Integer": 28.0 }, "Tool Tip": { "Type": 5.0, @@ -811,7 +811,7 @@ }, "Height": { "Type": 3.0, - "Integer": 21.0 + "Integer": 28.0 }, "Tool Tip": { "Type": 5.0, @@ -852,7 +852,7 @@ }, "Height": { "Type": 3.0, - "Integer": 21.0 + "Integer": 28.0 }, "Tool Tip": { "Type": 5.0, @@ -1632,7 +1632,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1296.0 + "Integer": 1302.0 }, "Width": { "Type": 3.0, @@ -1715,7 +1715,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1296.0 + "Integer": 1302.0 }, "Width": { "Type": 3.0, @@ -1798,7 +1798,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1296.0 + "Integer": 1302.0 }, "Width": { "Type": 3.0, @@ -1881,7 +1881,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1296.0 + "Integer": 1302.0 }, "Width": { "Type": 3.0, @@ -1968,11 +1968,11 @@ }, "Width": { "Type": 3.0, - "Integer": 100.0 + "Integer": 166.0 }, "Height": { "Type": 3.0, - "Integer": 21.0 + "Integer": 28.0 }, "Tool Tip": { "Type": 5.0, @@ -2169,7 +2169,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1080.0 + "Integer": 1074.0 }, "Width": { "Type": 3.0, @@ -2252,7 +2252,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1080.0 + "Integer": 1074.0 }, "Width": { "Type": 3.0, @@ -2335,7 +2335,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1080.0 + "Integer": 1074.0 }, "Width": { "Type": 3.0, @@ -2418,7 +2418,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1080.0 + "Integer": 1074.0 }, "Width": { "Type": 3.0, @@ -4161,7 +4161,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1272.0 + "Integer": 1278.0 }, "Width": { "Type": 3.0, @@ -4244,7 +4244,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1272.0 + "Integer": 1278.0 }, "Width": { "Type": 3.0, @@ -4327,7 +4327,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1272.0 + "Integer": 1278.0 }, "Width": { "Type": 3.0, @@ -4410,7 +4410,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1272.0 + "Integer": 1278.0 }, "Width": { "Type": 3.0, @@ -4576,7 +4576,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1320.0 + "Integer": 1326.0 }, "Width": { "Type": 3.0, @@ -4659,7 +4659,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1320.0 + "Integer": 1326.0 }, "Width": { "Type": 3.0, @@ -4742,7 +4742,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1320.0 + "Integer": 1326.0 }, "Width": { "Type": 3.0, @@ -4825,7 +4825,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1320.0 + "Integer": 1326.0 }, "Width": { "Type": 3.0, @@ -5240,7 +5240,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1104.0 + "Integer": 1098.0 }, "Width": { "Type": 3.0, @@ -5323,7 +5323,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1104.0 + "Integer": 1098.0 }, "Width": { "Type": 3.0, @@ -5406,7 +5406,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1104.0 + "Integer": 1098.0 }, "Width": { "Type": 3.0, @@ -5489,7 +5489,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1104.0 + "Integer": 1098.0 }, "Width": { "Type": 3.0, @@ -5904,7 +5904,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1344.0 + "Integer": 1350.0 }, "Width": { "Type": 3.0, @@ -5987,7 +5987,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1344.0 + "Integer": 1350.0 }, "Width": { "Type": 3.0, @@ -6070,7 +6070,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1344.0 + "Integer": 1350.0 }, "Width": { "Type": 3.0, @@ -6153,7 +6153,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1344.0 + "Integer": 1350.0 }, "Width": { "Type": 3.0, @@ -6617,7 +6617,7 @@ }, "Y": { "Type": 3.0, - "Integer": 654.0 + "Integer": 651.0 }, "Width": { "Type": 3.0, @@ -6625,7 +6625,7 @@ }, "Height": { "Type": 3.0, - "Integer": 21.0 + "Integer": 28.0 }, "Tool Tip": { "Type": 5.0, @@ -7035,7 +7035,7 @@ }, "Height": { "Type": 3.0, - "Integer": 740.0 + "Integer": 743.0 }, "Tool Tip": { "Type": 5.0, @@ -7736,7 +7736,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1128.0 + "Integer": 1122.0 }, "Width": { "Type": 3.0, @@ -7984,7 +7984,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1104.0 + "Integer": 1098.0 }, "Width": { "Type": 3.0, @@ -8046,7 +8046,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1080.0 + "Integer": 1074.0 }, "Width": { "Type": 3.0, @@ -8232,7 +8232,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1320.0 + "Integer": 1326.0 }, "Width": { "Type": 3.0, @@ -8294,7 +8294,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1296.0 + "Integer": 1302.0 }, "Width": { "Type": 3.0, @@ -8480,7 +8480,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1344.0 + "Integer": 1350.0 }, "Width": { "Type": 3.0, @@ -8542,7 +8542,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1272.0 + "Integer": 1278.0 }, "Width": { "Type": 3.0, @@ -8600,7 +8600,7 @@ }, "X": { "Type": 3.0, - "Integer": 312.0 + "Integer": 303.0 }, "Y": { "Type": 3.0, @@ -8608,7 +8608,7 @@ }, "Width": { "Type": 3.0, - "Integer": 53.0 + "Integer": 73.0 }, "Height": { "Type": 3.0, @@ -8645,7 +8645,7 @@ }, "AlignRight": { "Type": 2.0, - "Boolean": 1.0 + "Boolean": 0.0 }, "AlignTop": { "Type": 2.0, @@ -8662,7 +8662,7 @@ }, "X": { "Type": 3.0, - "Integer": 387.0 + "Integer": 378.0 }, "Y": { "Type": 3.0, @@ -8670,7 +8670,7 @@ }, "Width": { "Type": 3.0, - "Integer": 53.0 + "Integer": 73.0 }, "Height": { "Type": 3.0, @@ -8707,7 +8707,7 @@ }, "AlignRight": { "Type": 2.0, - "Boolean": 1.0 + "Boolean": 0.0 }, "AlignTop": { "Type": 2.0, @@ -8724,7 +8724,7 @@ }, "X": { "Type": 3.0, - "Integer": 537.0 + "Integer": 528.0 }, "Y": { "Type": 3.0, @@ -8732,7 +8732,7 @@ }, "Width": { "Type": 3.0, - "Integer": 53.0 + "Integer": 73.0 }, "Height": { "Type": 3.0, @@ -8769,7 +8769,7 @@ }, "AlignRight": { "Type": 2.0, - "Boolean": 1.0 + "Boolean": 0.0 }, "AlignTop": { "Type": 2.0, @@ -8794,7 +8794,7 @@ }, "Width": { "Type": 3.0, - "Integer": 95.0 + "Integer": 85.0 }, "Height": { "Type": 3.0, @@ -8856,7 +8856,7 @@ }, "Width": { "Type": 3.0, - "Integer": 95.0 + "Integer": 98.0 }, "Height": { "Type": 3.0, @@ -8918,7 +8918,7 @@ }, "Width": { "Type": 3.0, - "Integer": 95.0 + "Integer": 107.0 }, "Height": { "Type": 3.0, @@ -8980,7 +8980,7 @@ }, "Width": { "Type": 3.0, - "Integer": 95.0 + "Integer": 85.0 }, "Height": { "Type": 3.0, @@ -9104,7 +9104,7 @@ }, "Width": { "Type": 3.0, - "Integer": 95.0 + "Integer": 85.0 }, "Height": { "Type": 3.0, @@ -9228,7 +9228,7 @@ }, "Width": { "Type": 3.0, - "Integer": 83.0 + "Integer": 85.0 }, "Height": { "Type": 3.0, @@ -9290,7 +9290,7 @@ }, "Width": { "Type": 3.0, - "Integer": 83.0 + "Integer": 98.0 }, "Height": { "Type": 3.0, @@ -9352,7 +9352,7 @@ }, "Width": { "Type": 3.0, - "Integer": 83.0 + "Integer": 85.0 }, "Height": { "Type": 3.0, @@ -9468,7 +9468,7 @@ }, "X": { "Type": 3.0, - "Integer": 462.0 + "Integer": 453.0 }, "Y": { "Type": 3.0, @@ -9476,7 +9476,7 @@ }, "Width": { "Type": 3.0, - "Integer": 53.0 + "Integer": 73.0 }, "Height": { "Type": 3.0, @@ -9513,7 +9513,7 @@ }, "AlignRight": { "Type": 2.0, - "Boolean": 1.0 + "Boolean": 0.0 }, "AlignTop": { "Type": 2.0, @@ -9530,7 +9530,7 @@ }, "X": { "Type": 3.0, - "Integer": 615.0 + "Integer": 603.0 }, "Y": { "Type": 3.0, @@ -9538,7 +9538,7 @@ }, "Width": { "Type": 3.0, - "Integer": 53.0 + "Integer": 73.0 }, "Height": { "Type": 3.0, @@ -9575,7 +9575,7 @@ }, "AlignRight": { "Type": 2.0, - "Boolean": 1.0 + "Boolean": 0.0 }, "AlignTop": { "Type": 2.0, @@ -9600,7 +9600,7 @@ }, "Width": { "Type": 3.0, - "Integer": 95.0 + "Integer": 85.0 }, "Height": { "Type": 3.0, @@ -9662,7 +9662,7 @@ }, "Width": { "Type": 3.0, - "Integer": 95.0 + "Integer": 101.0 }, "Height": { "Type": 3.0, @@ -9724,7 +9724,7 @@ }, "Width": { "Type": 3.0, - "Integer": 95.0 + "Integer": 85.0 }, "Height": { "Type": 3.0, @@ -9786,7 +9786,7 @@ }, "Width": { "Type": 3.0, - "Integer": 83.0 + "Integer": 85.0 }, "Height": { "Type": 3.0, @@ -9848,7 +9848,7 @@ }, "Width": { "Type": 3.0, - "Integer": 83.0 + "Integer": 85.0 }, "Height": { "Type": 3.0, @@ -9910,7 +9910,7 @@ }, "Width": { "Type": 3.0, - "Integer": 83.0 + "Integer": 85.0 }, "Height": { "Type": 3.0, @@ -10350,7 +10350,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1128.0 + "Integer": 1122.0 }, "Width": { "Type": 3.0, @@ -10358,7 +10358,7 @@ }, "Height": { "Type": 3.0, - "Integer": 24.0 + "Integer": 28.0 }, "Tool Tip": { "Type": 5.0, @@ -10395,7 +10395,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1128.0 + "Integer": 1122.0 }, "Width": { "Type": 3.0, @@ -10403,7 +10403,7 @@ }, "Height": { "Type": 3.0, - "Integer": 24.0 + "Integer": 28.0 }, "Tool Tip": { "Type": 5.0, @@ -10440,7 +10440,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1128.0 + "Integer": 1122.0 }, "Width": { "Type": 3.0, @@ -10448,7 +10448,7 @@ }, "Height": { "Type": 3.0, - "Integer": 24.0 + "Integer": 28.0 }, "Tool Tip": { "Type": 5.0, @@ -10485,7 +10485,7 @@ }, "Y": { "Type": 3.0, - "Integer": 1128.0 + "Integer": 1122.0 }, "Width": { "Type": 3.0, @@ -10493,7 +10493,7 @@ }, "Height": { "Type": 3.0, - "Integer": 24.0 + "Integer": 28.0 }, "Tool Tip": { "Type": 5.0, @@ -10611,7 +10611,7 @@ "IndexLabels": "", "Flags": 2.0, "DefaultValue": 470.3, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -10654,7 +10654,7 @@ "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -10667,7 +10667,7 @@ "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -10680,7 +10680,7 @@ "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -10693,7 +10693,7 @@ "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -10719,7 +10719,7 @@ "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -10732,7 +10732,7 @@ "IndexLabels": "", "Flags": 2.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -10745,7 +10745,7 @@ "IndexLabels": "304L|216L|321H|B42 Copper", "Flags": 2.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "ListBox", "sscVariableName": "", "sscVariableValue": "" }, @@ -10758,7 +10758,7 @@ "IndexLabels": "Air|Argon|Hydrogen", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "ListBox", "sscVariableName": "", "sscVariableValue": "" }, @@ -10771,7 +10771,7 @@ "IndexLabels": "Air|Argon|Hydrogen", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "ListBox", "sscVariableName": "", "sscVariableValue": "" }, @@ -10784,7 +10784,7 @@ "IndexLabels": "Air|Argon|Hydrogen", "Flags": 3.0, "DefaultValue": 2.0, - "UIObject": "Default", + "UIObject": "ListBox", "sscVariableName": "", "sscVariableValue": "" }, @@ -10797,7 +10797,7 @@ "IndexLabels": "Air|Argon|Hydrogen", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "ListBox", "sscVariableName": "", "sscVariableValue": "" }, @@ -10810,7 +10810,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -10823,7 +10823,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -10836,7 +10836,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -10849,7 +10849,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -10862,7 +10862,7 @@ "IndexLabels": "", "Flags": 2.0, "DefaultValue": 0.066, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -10875,7 +10875,7 @@ "IndexLabels": "", "Flags": 2.0, "DefaultValue": 0.07, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -10888,7 +10888,7 @@ "IndexLabels": "", "Flags": 2.0, "DefaultValue": 0.115, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -10901,7 +10901,7 @@ "IndexLabels": "", "Flags": 2.0, "DefaultValue": 0.12, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -10914,7 +10914,7 @@ "IndexLabels": "", "Flags": 2.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -10927,7 +10927,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 150.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -10940,7 +10940,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 1100.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -10953,7 +10953,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 1500.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -10966,7 +10966,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -10979,7 +10979,7 @@ "IndexLabels": "Tube flow|Annular flow", "Flags": 2.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "ListBox", "sscVariableName": "", "sscVariableValue": "" }, @@ -10992,7 +10992,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "CheckBox", "sscVariableName": "", "sscVariableValue": "" }, @@ -11005,7 +11005,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "CheckBox", "sscVariableName": "", "sscVariableValue": "" }, @@ -11018,7 +11018,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 1.0, - "UIObject": "Default", + "UIObject": "CheckBox", "sscVariableName": "", "sscVariableValue": "" }, @@ -11031,7 +11031,7 @@ "IndexLabels": "", "Flags": 1.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "CheckBox", "sscVariableName": "", "sscVariableValue": "" }, @@ -11044,7 +11044,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.985, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11057,7 +11057,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.01, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11070,7 +11070,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.005, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11083,7 +11083,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11096,7 +11096,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11109,7 +11109,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.672, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11122,7 +11122,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.002556, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11135,7 +11135,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11148,7 +11148,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11161,7 +11161,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 1.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11174,7 +11174,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11187,7 +11187,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11200,7 +11200,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11213,7 +11213,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11226,7 +11226,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 1.0031, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11239,7 +11239,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": -0.2259, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11252,7 +11252,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.5368, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11265,7 +11265,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": -1.6434, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11278,7 +11278,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.7222, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11291,7 +11291,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.9896, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11304,7 +11304,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.044, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11330,7 +11330,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": -0.2327, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11343,7 +11343,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11356,7 +11356,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0001, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11369,7 +11369,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 750.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11382,7 +11382,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 750.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11395,7 +11395,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11408,7 +11408,7 @@ "IndexLabels": "", "Flags": 2.0, "DefaultValue": 0.000045, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11421,7 +11421,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.96, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11434,7 +11434,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.96, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11447,7 +11447,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.96, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11460,7 +11460,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.963, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11473,7 +11473,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.963, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11486,7 +11486,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.963, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11499,7 +11499,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 1.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11512,7 +11512,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11525,7 +11525,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.96, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11538,7 +11538,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.96, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11551,7 +11551,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.8, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11564,7 +11564,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11577,7 +11577,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.02, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11590,7 +11590,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.02, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11603,7 +11603,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11616,7 +11616,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11629,7 +11629,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.98, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11642,7 +11642,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.98, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11655,7 +11655,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 1.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11668,7 +11668,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.98, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11681,7 +11681,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.86, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11694,7 +11694,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.86, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11707,7 +11707,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 1.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11720,7 +11720,7 @@ "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11730,10 +11730,10 @@ "Label": "Optical model type", "Units": " ", "Group": "MSLF Collector and Receiver", - "IndexLabels": "Solar position|Collector incidence table|IAM polys", + "IndexLabels": "Solar position|Collector incidence table|Incidence angle modifiers", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "RadioChoice", "sscVariableName": "", "sscVariableValue": "" }, @@ -11774,7 +11774,7 @@ "IndexLabels": "", "Flags": 2.0, "DefaultValue": 2.5, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11877,7 +11877,7 @@ "IndexLabels": "", "Flags": 2.0, "DefaultValue": 0.95, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11890,7 +11890,7 @@ "IndexLabels": "", "Flags": 2.0, "DefaultValue": 0.99, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -11918,7 +11918,7 @@ "IndexLabels": "", "Flags": 2.0, "DefaultValue": 0.98, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -12034,7 +12034,7 @@ "IndexLabels": "", "Flags": 2.0, "DefaultValue": 15.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -12047,7 +12047,7 @@ "IndexLabels": "", "Flags": 2.0, "DefaultValue": 44.8, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -12060,7 +12060,7 @@ "IndexLabels": "", "Flags": 2.0, "DefaultValue": 1.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -12080,7 +12080,7 @@ 1.0 ] ], - "UIObject": "Default", + "UIObject": "DataMatrix", "sscVariableName": "", "sscVariableValue": "" }, @@ -12205,7 +12205,7 @@ "IndexLabels": "", "Flags": 2.0, "DefaultValue": 0.994, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -12437,7 +12437,7 @@ "IndexLabels": "", "Flags": 2.0, "DefaultValue": 0.935, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, diff --git a/deploy/runtime/ui/MSLF IPH Capital Costs.json b/deploy/runtime/ui/MSLF IPH Capital Costs.json index 990d0fcc7c..4aee4d18b2 100644 --- a/deploy/runtime/ui/MSLF IPH Capital Costs.json +++ b/deploy/runtime/ui/MSLF IPH Capital Costs.json @@ -4015,11 +4015,11 @@ "Type": 1.0, "Label": " ", "Units": " ", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -4028,11 +4028,11 @@ "Type": 1.0, "Label": " ", "Units": " ", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -4041,11 +4041,11 @@ "Type": 1.0, "Label": "", "Units": " ", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -4054,11 +4054,11 @@ "Type": 1.0, "Label": " ", "Units": " ", - "Group": "MSLF IPH Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -4067,11 +4067,11 @@ "Type": 1.0, "Label": " ", "Units": " ", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -4080,7 +4080,7 @@ "Type": 1.0, "Label": "Estimated total installed cost per net capacity ($/kW)", "Units": " ", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, @@ -4093,11 +4093,11 @@ "Type": 1.0, "Label": " ", "Units": " ", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -4106,11 +4106,11 @@ "Type": 1.0, "Label": " ", "Units": " ", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -4119,11 +4119,11 @@ "Type": 1.0, "Label": " ", "Units": " ", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -4132,11 +4132,11 @@ "Type": 1.0, "Label": " ", "Units": " ", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -4145,7 +4145,7 @@ "Type": 1.0, "Label": "Total direct cost", "Units": " ", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, @@ -4158,7 +4158,7 @@ "Type": 1.0, "Label": "Total indirect cost", "Units": " ", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, @@ -4171,7 +4171,7 @@ "Type": 1.0, "Label": "Total installed cost", "Units": " ", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, @@ -4184,7 +4184,7 @@ "Type": 1.0, "Label": " ", "Units": " ", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, @@ -4197,7 +4197,7 @@ "Type": 1.0, "Label": "Storage", "Units": "MWht", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, @@ -4210,7 +4210,7 @@ "Type": 1.0, "Label": "Nameplate", "Units": "MWt", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, @@ -4223,7 +4223,7 @@ "Type": 1.0, "Label": "Sales Tax of", "Units": " ", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, @@ -4236,7 +4236,7 @@ "Type": 1.0, "Label": "Total land area", "Units": "acres", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, @@ -4249,7 +4249,7 @@ "Type": 1.0, "Label": "Balance of plant", "Units": "MWt, Gross", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, @@ -4262,7 +4262,7 @@ "Type": 1.0, "Label": "Heat Sink", "Units": "MWt", - "Group": "MSLF IPH Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, @@ -4275,7 +4275,7 @@ "Type": 1.0, "Label": "HTF system", "Units": "m²", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, @@ -4288,7 +4288,7 @@ "Type": 1.0, "Label": "Site improvements", "Units": "m²", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, @@ -4301,7 +4301,7 @@ "Type": 1.0, "Label": "Solar field", "Units": "m²", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, @@ -4314,11 +4314,11 @@ "Type": 1.0, "Label": "Balance of Plant Cost per kWe", "Units": "$/kWe", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -4327,11 +4327,11 @@ "Type": 1.0, "Label": "Contingency", "Units": " ", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 2.0, "DefaultValue": 10.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -4340,11 +4340,11 @@ "Type": 1.0, "Label": "Fixed EPC Cost", "Units": "$", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -4353,11 +4353,11 @@ "Type": 1.0, "Label": "EPC Costs acre", "Units": "per acre", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -4366,11 +4366,11 @@ "Type": 1.0, "Label": "EPC Cost Wac", "Units": "per Wac", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -4379,11 +4379,11 @@ "Type": 1.0, "Label": "EPC Costs % direct", "Units": "% direct", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 3.0, "DefaultValue": 15.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -4392,11 +4392,11 @@ "Type": 1.0, "Label": "Heat Sink Cost per kWe", "Units": "", - "Group": "MSLF IPH Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 1.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -4405,11 +4405,11 @@ "Type": 1.0, "Label": "HTF System Cost Per m2", "Units": "$/m2", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 3.0, "DefaultValue": 50.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -4418,11 +4418,11 @@ "Type": 1.0, "Label": "Fixed Land Cost", "Units": "$", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -4431,11 +4431,11 @@ "Type": 1.0, "Label": "Land Cost acre", "Units": "per acre", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 3.0, "DefaultValue": 10000.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -4444,11 +4444,11 @@ "Type": 1.0, "Label": "Land Cost Wac", "Units": "per Wac", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -4457,11 +4457,11 @@ "Type": 1.0, "Label": "Land Cost % direct", "Units": "% direct", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -4470,11 +4470,11 @@ "Type": 1.0, "Label": "Sales Tax Percentage of Direct Cost", "Units": "%", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 3.0, "DefaultValue": 80.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -4483,11 +4483,11 @@ "Type": 1.0, "Label": "Site Improvement Cost per m2", "Units": "$/m2", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 3.0, "DefaultValue": 20.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -4496,11 +4496,11 @@ "Type": 1.0, "Label": "Solar Field Cost per m2", "Units": "$/m2", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 3.0, "DefaultValue": 350.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -4509,7 +4509,7 @@ "Type": 1.0, "Label": "Storage cost per kWht", "Units": "$/kWht", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0, @@ -4522,11 +4522,11 @@ "Type": 1.0, "Label": " ", "Units": " ", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -4535,7 +4535,7 @@ "Type": 1.0, "Label": "Total installed cost", "Units": " ", - "Group": "MSLF Capital Costs", + "Group": "Capital Costs", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, diff --git a/deploy/runtime/ui/MSLF IPH Dispatch Control.json b/deploy/runtime/ui/MSLF IPH Dispatch Control.json index 33986e17e5..3b8e0e7455 100644 --- a/deploy/runtime/ui/MSLF IPH Dispatch Control.json +++ b/deploy/runtime/ui/MSLF IPH Dispatch Control.json @@ -1,7 +1,7 @@ { "Name": "MSLF IPH Dispatch Control", - "Width": 844.0, - "Height": 719.0, + "Width": 841.0, + "Height": 744.0, "FormObjects": { "Label": { "Visible": 1.0, @@ -16,7 +16,7 @@ }, "Y": { "Type": 3.0, - "Integer": 306.0 + "Integer": 315.0 }, "Width": { "Type": 3.0, @@ -74,19 +74,19 @@ }, "X": { "Type": 3.0, - "Integer": 288.0 + "Integer": 270.0 }, "Y": { "Type": 3.0, - "Integer": 72.0 + "Integer": 78.0 }, "Width": { "Type": 3.0, - "Integer": 512.0 + "Integer": 530.0 }, "Height": { "Type": 3.0, - "Integer": 24.0 + "Integer": 36.0 }, "Tool Tip": { "Type": 5.0, @@ -148,7 +148,7 @@ }, "Height": { "Type": 3.0, - "Integer": 713.0 + "Integer": 737.0 }, "Tool Tip": { "Type": 5.0, @@ -177,7 +177,7 @@ }, "Y": { "Type": 3.0, - "Integer": 99.0 + "Integer": 117.0 }, "Width": { "Type": 3.0, @@ -214,7 +214,7 @@ }, "Y": { "Type": 3.0, - "Integer": 402.0 + "Integer": 420.0 }, "Width": { "Type": 3.0, @@ -867,15 +867,15 @@ }, "X": { "Type": 3.0, - "Integer": 486.0 + "Integer": 384.0 }, "Y": { "Type": 3.0, - "Integer": 15.0 + "Integer": 21.0 }, "Width": { "Type": 3.0, - "Integer": 186.0 + "Integer": 350.0 }, "Height": { "Type": 3.0, @@ -887,7 +887,7 @@ }, "Caption": { "Type": 5.0, - "String": "Use hourly heat sink fraction?" + "String": "Use hourly heat sink fractions" }, "State": { "Type": 2.0, @@ -908,15 +908,15 @@ }, "X": { "Type": 3.0, - "Integer": 24.0 + "Integer": 18.0 }, "Y": { "Type": 3.0, - "Integer": 24.0 + "Integer": 21.0 }, "Width": { "Type": 3.0, - "Integer": 289.0 + "Integer": 350.0 }, "Height": { "Type": 3.0, @@ -928,7 +928,7 @@ }, "Caption": { "Type": 5.0, - "String": "Use output fraction as maximum heat sink output?" + "String": "Use output fraction as maximum heat sink output" }, "State": { "Type": 2.0, @@ -949,11 +949,11 @@ }, "X": { "Type": 3.0, - "Integer": 474.0 + "Integer": 567.0 }, "Y": { "Type": 3.0, - "Integer": 42.0 + "Integer": 48.0 }, "Width": { "Type": 3.0, @@ -1745,7 +1745,7 @@ }, "Y": { "Type": 3.0, - "Integer": 120.0 + "Integer": 138.0 }, "Width": { "Type": 3.0, @@ -1790,7 +1790,7 @@ }, "Y": { "Type": 3.0, - "Integer": 423.0 + "Integer": 441.0 }, "Width": { "Type": 3.0, @@ -1829,7 +1829,7 @@ "Type": 2.0, "Label": "Turbine output fraction TOU periods", "Units": " ", - "Group": "System Control", + "Group": "Dispatch Control", "IndexLabels": "", "Flags": 9.0, "DefaultValue": [ @@ -1842,9 +1842,9 @@ "is_timestep_load_fractions": { "Version": 4.0, "Type": 1.0, - "Label": "", + "Label": "Use hourly heat sink fractions", "Units": "", - "Group": "", + "Group": "Dispatch Control", "IndexLabels": "", "Flags": 1.0, "DefaultValue": 0.0, @@ -1857,11 +1857,11 @@ "Type": 1.0, "Label": "Use turbine output fraction as maximum cycle output", "Units": " ", - "Group": "System Control", + "Group": "Dispatch Control", "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "CheckBox", "sscVariableName": "", "sscVariableValue": "" }, @@ -1870,7 +1870,7 @@ "Type": 2.0, "Label": "Hourly heat sink fractions", "Units": "", - "Group": "", + "Group": "Dispatch Control", "IndexLabels": "", "Flags": 0.0, "DefaultValue": [ @@ -1885,11 +1885,11 @@ "Type": 1.0, "Label": "Turbine output fraction period 1", "Units": " ", - "Group": "System Control", + "Group": "Dispatch Control", "IndexLabels": "", "Flags": 3.0, "DefaultValue": 1.1, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -1898,11 +1898,11 @@ "Type": 1.0, "Label": "Turbine output fraction period 2", "Units": " ", - "Group": "System Control", + "Group": "Dispatch Control", "IndexLabels": "", "Flags": 3.0, "DefaultValue": 1.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -1911,11 +1911,11 @@ "Type": 1.0, "Label": "Turbine output fraction period 3", "Units": " ", - "Group": "System Control", + "Group": "Dispatch Control", "IndexLabels": "", "Flags": 3.0, "DefaultValue": 1.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -1924,11 +1924,11 @@ "Type": 1.0, "Label": "Turbine output fraction period 4", "Units": " ", - "Group": "System Control", + "Group": "Dispatch Control", "IndexLabels": "", "Flags": 3.0, "DefaultValue": 1.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -1937,11 +1937,11 @@ "Type": 1.0, "Label": "Turbine output fraction period 5", "Units": " ", - "Group": "System Control", + "Group": "Dispatch Control", "IndexLabels": "", "Flags": 3.0, "DefaultValue": 1.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -1950,11 +1950,11 @@ "Type": 1.0, "Label": "Turbine output fraction period 6", "Units": " ", - "Group": "System Control", + "Group": "Dispatch Control", "IndexLabels": "", "Flags": 3.0, "DefaultValue": 1.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -1963,11 +1963,11 @@ "Type": 1.0, "Label": "Turbine output fraction period 7", "Units": " ", - "Group": "System Control", + "Group": "Dispatch Control", "IndexLabels": "", "Flags": 3.0, "DefaultValue": 1.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -1976,11 +1976,11 @@ "Type": 1.0, "Label": "Turbine output fraction period 8", "Units": " ", - "Group": "System Control", + "Group": "Dispatch Control", "IndexLabels": "", "Flags": 3.0, "DefaultValue": 1.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -1989,11 +1989,11 @@ "Type": 1.0, "Label": "Turbine output fraction period 9", "Units": " ", - "Group": "System Control", + "Group": "Dispatch Control", "IndexLabels": "", "Flags": 3.0, "DefaultValue": 1.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -2002,7 +2002,7 @@ "Type": 3.0, "Label": "Dispatch weekday schedule matrix", "Units": " ", - "Group": "System Control", + "Group": "Dispatch Control", "IndexLabels": "", "Flags": 3.0, "DefaultValue": [ @@ -2328,7 +2328,7 @@ "Type": 3.0, "Label": "Dispatch weekend schedule matrix", "Units": " ", - "Group": "System Control", + "Group": "Dispatch Control", "IndexLabels": "", "Flags": 3.0, "DefaultValue": [ diff --git a/deploy/runtime/ui/MSLF IPH System Control.json b/deploy/runtime/ui/MSLF IPH System Control.json index 09095f5d4d..6bac1ef178 100644 --- a/deploy/runtime/ui/MSLF IPH System Control.json +++ b/deploy/runtime/ui/MSLF IPH System Control.json @@ -2359,7 +2359,7 @@ "Type": 1.0, "Label": "Aux", "Units": "MWe", - "Group": "MSLF System Control", + "Group": "System Control", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, @@ -2372,7 +2372,7 @@ "Type": 1.0, "Label": "BOP", "Units": "MWe", - "Group": "MSLF System Control", + "Group": "System Control", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, @@ -2385,7 +2385,7 @@ "Type": 1.0, "Label": "Aux heater boiler parasitic", "Units": "MWe/MWtcap", - "Group": "MSLF System Control", + "Group": "System Control", "IndexLabels": "", "Flags": 0.0, "DefaultValue": 0.023, @@ -2398,7 +2398,7 @@ "Type": 1.0, "Label": "", "Units": "", - "Group": "MSLF System Control", + "Group": "System Control", "IndexLabels": "", "Flags": 0.0, "DefaultValue": 0.483, @@ -2411,7 +2411,7 @@ "Type": 1.0, "Label": "", "Units": "", - "Group": "MSLF System Control", + "Group": "System Control", "IndexLabels": "", "Flags": 0.0, "DefaultValue": 0.571, @@ -2424,7 +2424,7 @@ "Type": 1.0, "Label": "", "Units": "", - "Group": "MSLF System Control", + "Group": "System Control", "IndexLabels": "", "Flags": 0.0, "DefaultValue": 0.0, @@ -2437,7 +2437,7 @@ "Type": 1.0, "Label": "", "Units": "", - "Group": "MSLF System Control", + "Group": "System Control", "IndexLabels": "", "Flags": 0.0, "DefaultValue": 1.0, @@ -2450,7 +2450,7 @@ "Type": 1.0, "Label": "Balance of plant parasitic", "Units": "MWe/MWtcap", - "Group": "MSLF System Control", + "Group": "System Control", "IndexLabels": "", "Flags": 0.0, "DefaultValue": 0.025, @@ -2463,7 +2463,7 @@ "Type": 1.0, "Label": "", "Units": "", - "Group": "MSLF System Control", + "Group": "System Control", "IndexLabels": "", "Flags": 0.0, "DefaultValue": 0.0, @@ -2476,7 +2476,7 @@ "Type": 1.0, "Label": "", "Units": "", - "Group": "MSLF System Control", + "Group": "System Control", "IndexLabels": "", "Flags": 0.0, "DefaultValue": 0.483, @@ -2489,7 +2489,7 @@ "Type": 1.0, "Label": "", "Units": "", - "Group": "MSLF System Control", + "Group": "System Control", "IndexLabels": "", "Flags": 0.0, "DefaultValue": 0.0, @@ -2502,7 +2502,7 @@ "Type": 1.0, "Label": "", "Units": "", - "Group": "MSLF System Control", + "Group": "System Control", "IndexLabels": "", "Flags": 0.0, "DefaultValue": 1.0, @@ -2515,7 +2515,7 @@ "Type": 5.0, "Label": "Performance adjustment factors", "Units": "", - "Group": "MSLF System Control", + "Group": "System Control", "IndexLabels": "", "Flags": 1.0, "DefaultValue": {}, @@ -2528,7 +2528,7 @@ "Type": 1.0, "Label": "Constant performance adjustment", "Units": "%", - "Group": "MSLF System Control", + "Group": "System Control", "IndexLabels": "", "Flags": 0.0, "DefaultValue": 0.0, @@ -2541,7 +2541,7 @@ "Type": 1.0, "Label": "Enable custom period performance adjustments", "Units": "0/1", - "Group": "MSLF System Control", + "Group": "System Control", "IndexLabels": "", "Flags": 0.0, "DefaultValue": 0.0, @@ -2554,7 +2554,7 @@ "Type": 1.0, "Label": "Enable timeseries performance adjustments", "Units": "0/1", - "Group": "MSLF System Control", + "Group": "System Control", "IndexLabels": "", "Flags": 0.0, "DefaultValue": 0.0, @@ -2567,7 +2567,7 @@ "Type": 3.0, "Label": "Custom period performance adjustments", "Units": "%", - "Group": "MSLF System Control", + "Group": "System Control", "IndexLabels": "", "Flags": 0.0, "DefaultValue": [ @@ -2584,7 +2584,7 @@ "Type": 2.0, "Label": "Timeseries performance adjustments", "Units": "%", - "Group": "MSLF System Control", + "Group": "System Control", "IndexLabels": "", "Flags": 0.0, "DefaultValue": [ @@ -2599,7 +2599,7 @@ "Type": 2.0, "Label": "Coefficients for auxiliary heater parasitics calcs", "Units": "", - "Group": "MSLF System Control", + "Group": "System Control", "IndexLabels": "", "Flags": 9.0, "DefaultValue": [ @@ -2614,7 +2614,7 @@ "Type": 2.0, "Label": "Coefficients for balance of plant parasitics calcs", "Units": "", - "Group": "MSLF System Control", + "Group": "System Control", "IndexLabels": "", "Flags": 9.0, "DefaultValue": [ @@ -2629,7 +2629,7 @@ "Type": 1.0, "Label": "Cycle startup cost penalty", "Units": "$/MWe-cycle/start", - "Group": "MSLF System Control", + "Group": "System Control", "IndexLabels": "", "Flags": 2.0, "DefaultValue": 87.0, @@ -2642,7 +2642,7 @@ "Type": 1.0, "Label": "Frequency for dispatch reoptimization", "Units": "hour", - "Group": "MSLF System Control", + "Group": "System Control", "IndexLabels": "", "Flags": 2.0, "DefaultValue": 24.0, @@ -2655,7 +2655,7 @@ "Type": 1.0, "Label": "Time horizon for dispatch optimization", "Units": "hour", - "Group": "MSLF System Control", + "Group": "System Control", "IndexLabels": "", "Flags": 2.0, "DefaultValue": 48.0, @@ -2668,7 +2668,7 @@ "Type": 1.0, "Label": "Maximum branch and bound iterations", "Units": "", - "Group": "MSLF System Control", + "Group": "System Control", "IndexLabels": "", "Flags": 2.0, "DefaultValue": 10000.0, @@ -2681,7 +2681,7 @@ "Type": 1.0, "Label": "Solution optimality gap tolerance", "Units": "", - "Group": "MSLF System Control", + "Group": "System Control", "IndexLabels": "", "Flags": 2.0, "DefaultValue": 0.055, @@ -2694,7 +2694,7 @@ "Type": 1.0, "Label": "Power generation ramping penalty", "Units": "$/ΔMWe", - "Group": "MSLF System Control", + "Group": "System Control", "IndexLabels": "", "Flags": 2.0, "DefaultValue": 1.0, @@ -2707,7 +2707,7 @@ "Type": 1.0, "Label": "Receiver startup cost penalty", "Units": "$/MWt-field/start", - "Group": "MSLF System Control", + "Group": "System Control", "IndexLabels": "", "Flags": 2.0, "DefaultValue": 1.4, @@ -2720,7 +2720,7 @@ "Type": 1.0, "Label": "Objective function time weighting exponent", "Units": "", - "Group": "MSLF System Control", + "Group": "System Control", "IndexLabels": "", "Flags": 2.0, "DefaultValue": 0.99, @@ -2733,7 +2733,7 @@ "Type": 1.0, "Label": "Optimization solver timeout limit", "Units": "sec", - "Group": "MSLF System Control", + "Group": "System Control", "IndexLabels": "", "Flags": 2.0, "DefaultValue": 5.0, @@ -2746,7 +2746,7 @@ "Type": 1.0, "Label": "Enable dispatch optimization", "Units": "", - "Group": "MSLF System Control", + "Group": "System Control", "IndexLabels": "", "Flags": 2.0, "DefaultValue": 0.0, @@ -2759,7 +2759,7 @@ "Type": 1.0, "Label": "Fraction of rated gross power consumed all times", "Units": "MWe/MWtcap", - "Group": "MSLF System Control", + "Group": "System Control", "IndexLabels": "", "Flags": 2.0, "DefaultValue": 0.0, diff --git a/deploy/runtime/ui/MSLF IPH System Design.json b/deploy/runtime/ui/MSLF IPH System Design.json index 6b4739dabd..3a685ccd55 100644 --- a/deploy/runtime/ui/MSLF IPH System Design.json +++ b/deploy/runtime/ui/MSLF IPH System Design.json @@ -1470,11 +1470,11 @@ "Type": 1.0, "Label": "Design point DNI", "Units": "W/m²", - "Group": "MSLF System Design", + "Group": "System Design", "IndexLabels": "", "Flags": 2.0, "DefaultValue": 950.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -1483,7 +1483,7 @@ "Type": 1.0, "Label": "Cycle design HTF mass flow rate", "Units": "kg/s", - "Group": "MSLF System Design", + "Group": "System Design", "IndexLabels": "", "Flags": 0.0, "DefaultValue": 0.0, @@ -1496,7 +1496,7 @@ "Type": 1.0, "Label": "Number of loops", "Units": " ", - "Group": "MSLF System Design", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 8.0, @@ -1509,7 +1509,7 @@ "Type": 1.0, "Label": "", "Units": " ", - "Group": "MSLF System Design", + "Group": "System Design", "IndexLabels": "", "Flags": 10.0, "DefaultValue": 2.0, @@ -1522,7 +1522,7 @@ "Type": 1.0, "Label": "", "Units": "m²", - "Group": "MSLF System Design", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, @@ -1535,11 +1535,11 @@ "Type": 1.0, "Label": "Actual field thermal power", "Units": "MWt", - "Group": "", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -1548,11 +1548,11 @@ "Type": 1.0, "Label": "Field thermal power w/ no defocus constraints", "Units": "MWt", - "Group": "", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -1561,7 +1561,7 @@ "Type": 1.0, "Label": "ONLY USED FOR USER DEFINED POWER CYCLE", "Units": "", - "Group": "MSLF System Design", + "Group": "System Design", "IndexLabels": "", "Flags": 0.0, "DefaultValue": 0.0, @@ -1574,11 +1574,11 @@ "Type": 1.0, "Label": "Loop inlet HTF temperature", "Units": "°C", - "Group": "MSLF System Design", + "Group": "System Design", "IndexLabels": "", "Flags": 2.0, "DefaultValue": 293.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -1587,11 +1587,11 @@ "Type": 1.0, "Label": "Loop outlet HTF temperature", "Units": "°C", - "Group": "MSLF System Design", + "Group": "System Design", "IndexLabels": "", "Flags": 2.0, "DefaultValue": 391.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -1600,7 +1600,7 @@ "Type": 1.0, "Label": " ", "Units": " ", - "Group": "MSLF System Design", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 1.0, @@ -1717,7 +1717,7 @@ "Type": 1.0, "Label": "Copy of nameplate (needed for financial models)", "Units": "MWt", - "Group": "MSLF System Design", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, @@ -1730,11 +1730,11 @@ "Type": 1.0, "Label": "Pumping power for HTF through heat sink", "Units": "kW/kg/s", - "Group": "MSLF IPH System Design", + "Group": "System Design", "IndexLabels": "", "Flags": 0.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -1743,11 +1743,11 @@ "Type": 1.0, "Label": "Heat sink thermal power", "Units": "MWt", - "Group": "MSLF IPH System Design", + "Group": "System Design", "IndexLabels": "", "Flags": 0.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -1756,7 +1756,7 @@ "Type": 1.0, "Label": "Solar multiple", "Units": " ", - "Group": "MSLF System Design", + "Group": "System Design", "IndexLabels": "", "Flags": 2.0, "DefaultValue": 2.0, @@ -1769,7 +1769,7 @@ "Type": 1.0, "Label": "Solar field mode (0=SM, 1=area)", "Units": " ", - "Group": "MSLF System Design", + "Group": "System Design", "IndexLabels": "", "Flags": 1.0, "DefaultValue": 0.0, @@ -1782,7 +1782,7 @@ "Type": 1.0, "Label": "", "Units": "", - "Group": "", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1795,11 +1795,11 @@ "Type": 1.0, "Label": "", "Units": "MMBtu/hr", - "Group": "MSLF IPH System Design", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -1808,7 +1808,7 @@ "Type": 1.0, "Label": "Field aperture", "Units": "", - "Group": "MSLF System Design", + "Group": "System Design", "IndexLabels": "", "Flags": 2.0, "DefaultValue": 877000.0, @@ -1821,11 +1821,11 @@ "Type": 1.0, "Label": "Hours of storage at design point", "Units": "hours", - "Group": "MSLF System Design", + "Group": "System Design", "IndexLabels": "", "Flags": 2.0, "DefaultValue": 6.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" } diff --git a/deploy/runtime/ui/MSLF Solar Field.json b/deploy/runtime/ui/MSLF Solar Field.json index 6fef9eb226..049432d574 100644 --- a/deploy/runtime/ui/MSLF Solar Field.json +++ b/deploy/runtime/ui/MSLF Solar Field.json @@ -4665,7 +4665,7 @@ }, "X": { "Type": 3.0, - "Integer": 516.0 + "Integer": 536.0 }, "Y": { "Type": 3.0, @@ -6549,7 +6549,7 @@ "T_fp": { "Version": 4.0, "Type": 1.0, - "Label": "Freeze point heat trace activation temperature", + "Label": "Freeze point heat trace activation temp", "Units": "°C", "Group": "MSLF Solar Field", "IndexLabels": "", @@ -6717,7 +6717,7 @@ "mc_bal_cold": { "Version": 4.0, "Type": 1.0, - "Label": "Heat capacity of the balance of plant on the cold side", + "Label": "Heat capacity of the balance of plant, cold side", "Units": "kWht/K-MWt", "Group": "MSLF Solar Field", "IndexLabels": "", @@ -6730,7 +6730,7 @@ "mc_bal_hot": { "Version": 4.0, "Type": 1.0, - "Label": "Heat capacity of the balance of plant on the hot side", + "Label": "Heat capacity of the balance of plant, hot side", "Units": "kWht/K-MWt", "Group": "MSLF Solar Field", "IndexLabels": "", @@ -6743,7 +6743,7 @@ "mc_bal_sca": { "Version": 4.0, "Type": 1.0, - "Label": "Non-HTF heat capacity associated with each SCA", + "Label": "Non-HTF heat capacity of each SCA", "Units": "Wht/K-m", "Group": "MSLF Solar Field", "IndexLabels": "", diff --git a/deploy/runtime/ui/MSPT IPH Dispatch Control.json b/deploy/runtime/ui/MSPT IPH Dispatch Control.json index 5d9ac2b6b4..ecee22fbcf 100644 --- a/deploy/runtime/ui/MSPT IPH Dispatch Control.json +++ b/deploy/runtime/ui/MSPT IPH Dispatch Control.json @@ -1,7 +1,7 @@ { "Name": "MSPT IPH Dispatch Control", - "Width": 851.0, - "Height": 742.0, + "Width": 845.0, + "Height": 775.0, "FormObjects": { "Label": { "Visible": 1.0, @@ -74,19 +74,19 @@ }, "X": { "Type": 3.0, - "Integer": 297.0 + "Integer": 270.0 }, "Y": { "Type": 3.0, - "Integer": 96.0 + "Integer": 105.0 }, "Width": { "Type": 3.0, - "Integer": 497.0 + "Integer": 557.0 }, "Height": { "Type": 3.0, - "Integer": 21.0 + "Integer": 36.0 }, "Tool Tip": { "Type": 5.0, @@ -148,7 +148,7 @@ }, "Height": { "Type": 3.0, - "Integer": 728.0 + "Integer": 758.0 }, "Tool Tip": { "Type": 5.0, @@ -177,7 +177,7 @@ }, "Y": { "Type": 3.0, - "Integer": 117.0 + "Integer": 144.0 }, "Width": { "Type": 3.0, @@ -214,7 +214,7 @@ }, "Y": { "Type": 3.0, - "Integer": 420.0 + "Integer": 447.0 }, "Width": { "Type": 3.0, @@ -247,11 +247,11 @@ }, "X": { "Type": 3.0, - "Integer": 414.0 + "Integer": 465.0 }, "Y": { "Type": 3.0, - "Integer": 69.0 + "Integer": 78.0 }, "Width": { "Type": 3.0, @@ -292,7 +292,7 @@ }, "Width": { "Type": 3.0, - "Integer": 210.0 + "Integer": 237.0 }, "Height": { "Type": 3.0, @@ -393,11 +393,11 @@ }, "Y": { "Type": 3.0, - "Integer": 15.0 + "Integer": 24.0 }, "Width": { "Type": 3.0, - "Integer": 183.0 + "Integer": 291.0 }, "Height": { "Type": 3.0, @@ -409,7 +409,7 @@ }, "Caption": { "Type": 5.0, - "String": "Use hourly heat sink fraction?" + "String": "Use hourly heat sink fraction" }, "State": { "Type": 2.0, @@ -434,11 +434,11 @@ }, "Y": { "Type": 3.0, - "Integer": 21.0 + "Integer": 24.0 }, "Width": { "Type": 3.0, - "Integer": 290.0 + "Integer": 365.0 }, "Height": { "Type": 3.0, @@ -450,7 +450,7 @@ }, "Caption": { "Type": 5.0, - "String": "Use output fraction as maximum heat sink output?" + "String": "Use output fraction as maximum heat sink output" }, "State": { "Type": 2.0, @@ -475,7 +475,7 @@ }, "Y": { "Type": 3.0, - "Integer": 42.0 + "Integer": 51.0 }, "Width": { "Type": 3.0, @@ -520,7 +520,7 @@ }, "Y": { "Type": 3.0, - "Integer": 138.0 + "Integer": 165.0 }, "Width": { "Type": 3.0, @@ -565,7 +565,7 @@ }, "Y": { "Type": 3.0, - "Integer": 441.0 + "Integer": 468.0 }, "Width": { "Type": 3.0, @@ -604,7 +604,7 @@ "Type": 2.0, "Label": "Heat sink output fraction", "Units": " ", - "Group": "System Control", + "Group": "Dispatch Control", "IndexLabels": "", "Flags": 3.0, "DefaultValue": [ @@ -625,9 +625,9 @@ "is_timestep_load_fractions": { "Version": 4.0, "Type": 1.0, - "Label": "Use hourly heat sink fraction?", + "Label": "Use hourly heat sink fraction", "Units": "", - "Group": "", + "Group": "Dispatch Control", "IndexLabels": "", "Flags": 1.0, "DefaultValue": 0.0, @@ -638,13 +638,13 @@ "is_tod_pc_target_also_pc_max": { "Version": 4.0, "Type": 1.0, - "Label": " ", + "Label": "Use output fraction as maximum heat sink output", "Units": " ", - "Group": "System Control", + "Group": "Dispatch Control", "IndexLabels": "", "Flags": 3.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "CheckBox", "sscVariableName": " ", "sscVariableValue": "" }, @@ -653,7 +653,7 @@ "Type": 2.0, "Label": "Hourly heat sink fractions", "Units": "", - "Group": "", + "Group": "Dispatch Control", "IndexLabels": "", "Flags": 0.0, "DefaultValue": [ @@ -668,7 +668,7 @@ "Type": 3.0, "Label": "Dispatch weekday schedule matrix", "Units": " ", - "Group": "System Control", + "Group": "Dispatch Control", "IndexLabels": "", "Flags": 3.0, "DefaultValue": [ @@ -994,7 +994,7 @@ "Type": 3.0, "Label": "Dispatch weekend schedule matrix", "Units": " ", - "Group": "System Control", + "Group": "Dispatch Control", "IndexLabels": "", "Flags": 3.0, "DefaultValue": [ diff --git a/deploy/runtime/ui/MSPT IPH System Control.json b/deploy/runtime/ui/MSPT IPH System Control.json index c6040474c7..58433889b1 100644 --- a/deploy/runtime/ui/MSPT IPH System Control.json +++ b/deploy/runtime/ui/MSPT IPH System Control.json @@ -358,11 +358,11 @@ }, "X": { "Type": 3.0, - "Integer": 195.0 + "Integer": 192.0 }, "Y": { "Type": 3.0, - "Integer": 102.0 + "Integer": 99.0 }, "Width": { "Type": 3.0, @@ -773,11 +773,11 @@ }, "X": { "Type": 3.0, - "Integer": 195.0 + "Integer": 192.0 }, "Y": { "Type": 3.0, - "Integer": 78.0 + "Integer": 75.0 }, "Width": { "Type": 3.0, @@ -1354,7 +1354,7 @@ }, "X": { "Type": 3.0, - "Integer": 237.0 + "Integer": 252.0 }, "Y": { "Type": 3.0, @@ -1437,7 +1437,7 @@ }, "X": { "Type": 3.0, - "Integer": 237.0 + "Integer": 252.0 }, "Y": { "Type": 3.0, @@ -1520,7 +1520,7 @@ }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 672.0 }, "Y": { "Type": 3.0, @@ -1603,7 +1603,7 @@ }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 672.0 }, "Y": { "Type": 3.0, @@ -1686,7 +1686,7 @@ }, "X": { "Type": 3.0, - "Integer": 237.0 + "Integer": 252.0 }, "Y": { "Type": 3.0, @@ -1769,7 +1769,7 @@ }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 672.0 }, "Y": { "Type": 3.0, @@ -1852,7 +1852,7 @@ }, "X": { "Type": 3.0, - "Integer": 642.0 + "Integer": 672.0 }, "Y": { "Type": 3.0, @@ -1935,7 +1935,7 @@ }, "X": { "Type": 3.0, - "Integer": 240.0 + "Integer": 255.0 }, "Y": { "Type": 3.0, @@ -2062,7 +2062,7 @@ }, "Height": { "Type": 3.0, - "Integer": 69.0 + "Integer": 57.0 }, "Tool Tip": { "Type": 5.0, @@ -2191,13 +2191,13 @@ "adjust": { "Version": 4.0, "Type": 1.0, - "Label": "", + "Label": "System availability", "Units": "", - "Group": "", + "Group": "Sytem Control", "IndexLabels": "", - "Flags": 0.0, + "Flags": 1.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "LossAdjustment", "sscVariableName": "", "sscVariableValue": "" }, @@ -2281,59 +2281,59 @@ "IndexLabels": "", "Flags": 0.0, "DefaultValue": 0.023, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": " ", "sscVariableValue": "" }, "aux_par_0": { "Version": 4.0, "Type": 1.0, - "Label": " ", + "Label": "Aux heater boiler parasitic coefficient 0", "Units": " ", "Group": "System Control", "IndexLabels": "", - "Flags": 0.0, + "Flags": 1.0, "DefaultValue": 0.483, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": " ", "sscVariableValue": "" }, "aux_par_1": { "Version": 4.0, "Type": 1.0, - "Label": " ", + "Label": "Aux heater boiler parasitic coefficent 1", "Units": " ", "Group": "System Control", "IndexLabels": "", - "Flags": 0.0, + "Flags": 1.0, "DefaultValue": 0.571, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": " ", "sscVariableValue": "" }, "aux_par_2": { "Version": 4.0, "Type": 1.0, - "Label": " ", + "Label": "Aux heater boiler parasitic coefficient 2", "Units": " ", "Group": "System Control", "IndexLabels": "", - "Flags": 0.0, + "Flags": 1.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": " ", "sscVariableValue": "" }, "aux_par_f": { "Version": 4.0, "Type": 1.0, - "Label": " ", + "Label": "Aux heater boiler parasitic factor", "Units": " ", "Group": "System Control", "IndexLabels": "", - "Flags": 0.0, + "Flags": 1.0, "DefaultValue": 1.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": " ", "sscVariableValue": "" }, @@ -2346,18 +2346,18 @@ "IndexLabels": "", "Flags": 0.0, "DefaultValue": 0.025, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": " ", "sscVariableValue": "" }, "bop_par_0": { "Version": 4.0, "Type": 1.0, - "Label": " ", + "Label": "Balance of plant parasitic coefficient 0", "Units": " ", "Group": "System Control", "IndexLabels": "", - "Flags": 0.0, + "Flags": 1.0, "DefaultValue": 0.0, "UIObject": "Numeric", "sscVariableName": " ", @@ -2366,39 +2366,39 @@ "bop_par_1": { "Version": 4.0, "Type": 1.0, - "Label": " ", + "Label": "Balance of plant parasitic coefficient 1", "Units": " ", "Group": "System Control", "IndexLabels": "", - "Flags": 0.0, + "Flags": 1.0, "DefaultValue": 0.483, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": " ", "sscVariableValue": "" }, "bop_par_2": { "Version": 4.0, "Type": 1.0, - "Label": " ", + "Label": "Balance of plant parasitic coefficient 2", "Units": " ", "Group": "System Control", "IndexLabels": "", - "Flags": 0.0, + "Flags": 1.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": " ", "sscVariableValue": "" }, "bop_par_f": { "Version": 4.0, "Type": 1.0, - "Label": " ", + "Label": "Balance of plant parasitic factor", "Units": " ", "Group": "System Control", "IndexLabels": "", - "Flags": 0.0, + "Flags": 1.0, "DefaultValue": 1.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": " ", "sscVariableValue": "" }, @@ -2411,7 +2411,7 @@ "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": " ", "sscVariableValue": "" }, @@ -2424,7 +2424,7 @@ "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": " ", "sscVariableValue": "" }, @@ -2450,7 +2450,7 @@ "IndexLabels": "", "Flags": 2.0, "DefaultValue": 24.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": " ", "sscVariableValue": "" }, @@ -2463,7 +2463,7 @@ "IndexLabels": "", "Flags": 2.0, "DefaultValue": 48.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": " ", "sscVariableValue": "" }, @@ -2472,7 +2472,7 @@ "Type": 1.0, "Label": "Heater startup cost penalty", "Units": "$/MWt/start", - "Group": " ", + "Group": "System Control", "IndexLabels": "", "Flags": 2.0, "DefaultValue": 0.015, @@ -2489,7 +2489,7 @@ "IndexLabels": "", "Flags": 2.0, "DefaultValue": 10000.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": " ", "sscVariableValue": "" }, @@ -2502,7 +2502,7 @@ "IndexLabels": "", "Flags": 2.0, "DefaultValue": 0.055, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": " ", "sscVariableValue": "" }, @@ -2528,7 +2528,7 @@ "IndexLabels": "", "Flags": 2.0, "DefaultValue": 1.4, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": " ", "sscVariableValue": "" }, @@ -2541,7 +2541,7 @@ "IndexLabels": "", "Flags": 2.0, "DefaultValue": 0.99, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": " ", "sscVariableValue": "" }, @@ -2554,7 +2554,7 @@ "IndexLabels": "", "Flags": 2.0, "DefaultValue": 5.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": " ", "sscVariableValue": "" }, @@ -2567,7 +2567,7 @@ "IndexLabels": "", "Flags": 2.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "CheckBox", "sscVariableName": " ", "sscVariableValue": "" }, @@ -2580,7 +2580,7 @@ "IndexLabels": "", "Flags": 2.0, "DefaultValue": 0.0055, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": " ", "sscVariableValue": "" }, @@ -2625,24 +2625,31 @@ "};" ], "Callbacks": [ - "on_load{\"MSPT IPH System Control\"} = define()", - "{\r", - "\tenable('is_dispatch', false);\r", - "\tshow('is_dispatch', false);", - "\ton_change{\"is_dispatch\"}();", - "};", + "on_load{ 'MSPT IPH Dispatch Control' } = define() {", + "", + " fin = financing();", + " if ( fin == \"Commercial\" || fin == \"None\" || fin == \"LCOH Calculator\") ", + " show( 'copy_schedule', false );", "\r", - "on_change{\"is_dispatch\"} = define() {\r", - " en = value(\"is_dispatch\");\r", - " \r", - " enable(\"disp_horizon\", en==1);\r", - " enable(\"disp_frequency\", en==1);\r", - " enable(\"disp_rsu_cost_rel\", en==1);\r", - " enable(\"disp_max_iter\", en==1);\r", - " enable(\"disp_timeout\", en==1);\r", - " enable(\"disp_mip_gap\", en==1);\r", - " enable(\"disp_time_weighting\", en==1);\r", + "\ton_change{\"is_timestep_load_fractions\"}();\r", + "", + "};", "\r", - "};" + "on_change{ 'is_timestep_load_fractions' }= define(){\r", + "\tmode = value(\"is_timestep_load_fractions\");\r", + "\tenable(\"timestep_load_fractions\",mode==1);\r", + "\tenable(\"f_turb_tou_periods\",mode==0);\r", + "\tenable(\"copy_schedule\",mode==0);\r", + "\tenable(\"weekday_schedule\",mode==0);\r", + "\tenable(\"weekend_schedule\",mode==0);\r", + "};\r", + "", + "on_change{ 'copy_schedule' } = define() {", + "", + " value( 'weekday_schedule' , value ( 'dispatch_sched_weekday' ) );", + " value( 'weekend_schedule' , value ( 'dispatch_sched_weekend' ) );", + "", + "};", + "" ] } \ No newline at end of file diff --git a/deploy/runtime/ui/MSPT IPH System Design.json b/deploy/runtime/ui/MSPT IPH System Design.json index 16f1fb00f3..400e1c2233 100644 --- a/deploy/runtime/ui/MSPT IPH System Design.json +++ b/deploy/runtime/ui/MSPT IPH System Design.json @@ -684,7 +684,7 @@ }, "Y": { "Type": 3.0, - "Integer": 171.0 + "Integer": 165.0 }, "Width": { "Type": 3.0, @@ -1275,7 +1275,7 @@ "Type": 1.0, "Label": " ", "Units": "m2", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1288,7 +1288,7 @@ "Type": 1.0, "Label": " ", "Units": "m2", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1301,7 +1301,7 @@ "Type": 1.0, "Label": " ", "Units": "m", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1314,7 +1314,7 @@ "Type": 1.0, "Label": " ", "Units": " ", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1327,7 +1327,7 @@ "Type": 1.0, "Label": " ", "Units": "m", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1340,7 +1340,7 @@ "Type": 1.0, "Label": " ", "Units": " ", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1357,7 +1357,7 @@ "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": " ", "sscVariableValue": "" }, @@ -1366,7 +1366,7 @@ "Type": 1.0, "Label": " ", "Units": "MWh-t", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1383,7 +1383,7 @@ "IndexLabels": "", "Flags": 2.0, "DefaultValue": 290.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": " ", "sscVariableValue": "" }, @@ -1396,7 +1396,7 @@ "IndexLabels": "", "Flags": 2.0, "DefaultValue": 574.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": " ", "sscVariableValue": "" }, @@ -1405,7 +1405,7 @@ "Type": 1.0, "Label": " ", "Units": "MWe", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1418,7 +1418,7 @@ "Type": 1.0, "Label": " ", "Units": "MWe", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1431,7 +1431,7 @@ "Type": 1.0, "Label": " ", "Units": "MWe", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1444,7 +1444,7 @@ "Type": 1.0, "Label": " ", "Units": " ", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1457,7 +1457,7 @@ "Type": 1.0, "Label": " ", "Units": "MWe", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1470,7 +1470,7 @@ "Type": 1.0, "Label": " ", "Units": "MWe", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1483,7 +1483,7 @@ "Type": 1.0, "Label": " ", "Units": "MWe", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1496,7 +1496,7 @@ "Type": 1.0, "Label": " ", "Units": " ", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1509,7 +1509,7 @@ "Type": 1.0, "Label": " ", "Units": "$", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1522,7 +1522,7 @@ "Type": 1.0, "Label": " ", "Units": "m", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1535,7 +1535,7 @@ "Type": 1.0, "Label": " ", "Units": "m", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1548,7 +1548,7 @@ "Type": 1.0, "Label": " ", "Units": "m2", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1561,7 +1561,7 @@ "Type": 1.0, "Label": " ", "Units": "m", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1574,7 +1574,7 @@ "Type": 1.0, "Label": " ", "Units": "m", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1587,7 +1587,7 @@ "Type": 1.0, "Label": " ", "Units": "$", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1600,7 +1600,7 @@ "Type": 1.0, "Label": "", "Units": "", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, @@ -1617,7 +1617,7 @@ "IndexLabels": "", "Flags": 2.0, "DefaultValue": 950.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": " ", "sscVariableValue": "" }, @@ -1626,7 +1626,7 @@ "Type": 1.0, "Label": " ", "Units": "$", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1639,7 +1639,7 @@ "Type": 1.0, "Label": " ", "Units": " ", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1652,7 +1652,7 @@ "Type": 1.0, "Label": " ", "Units": "m2", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1665,7 +1665,7 @@ "Type": 1.0, "Label": " ", "Units": "$", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1678,7 +1678,7 @@ "Type": 1.0, "Label": " ", "Units": "m", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1691,7 +1691,7 @@ "Type": 1.0, "Label": " ", "Units": "m", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1704,7 +1704,7 @@ "Type": 1.0, "Label": " ", "Units": "$", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1717,7 +1717,7 @@ "Type": 1.0, "Label": "Heater multiple", "Units": " ", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 2.0, "DefaultValue": 1.0, @@ -1730,7 +1730,7 @@ "Type": 1.0, "Label": " ", "Units": " ", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1743,7 +1743,7 @@ "Type": 1.0, "Label": " ", "Units": "$", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1860,7 +1860,7 @@ "Type": 1.0, "Label": " ", "Units": "$/kWe", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1873,7 +1873,7 @@ "Type": 1.0, "Label": " Enable electric heater to charge cold HTF", "Units": " ", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 0.0, "DefaultValue": 0.0, @@ -1886,7 +1886,7 @@ "Type": 1.0, "Label": " ", "Units": "acre", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1899,7 +1899,7 @@ "Type": 1.0, "Label": " ", "Units": " ", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1912,7 +1912,7 @@ "Type": 1.0, "Label": " ", "Units": " ", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1925,7 +1925,7 @@ "Type": 1.0, "Label": " ", "Units": "kg/s", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1938,7 +1938,7 @@ "Type": 1.0, "Label": " ", "Units": "kg/s", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1964,11 +1964,11 @@ "Type": 1.0, "Label": "Pumping power for HTF through heat sink", "Units": "kW/kg/s", - "Group": "", + "Group": "System Design", "IndexLabels": "", "Flags": 0.0, "DefaultValue": 0.55, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -1977,7 +1977,7 @@ "Type": 1.0, "Label": " ", "Units": "$", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -1990,7 +1990,7 @@ "Type": 1.0, "Label": " ", "Units": "$", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -2003,7 +2003,7 @@ "Type": 1.0, "Label": "Heater thermal power", "Units": "MWt", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -2016,7 +2016,7 @@ "Type": 1.0, "Label": " ", "Units": "MWe", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -2029,7 +2029,7 @@ "Type": 1.0, "Label": " ", "Units": "MWt", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -2046,7 +2046,7 @@ "IndexLabels": "", "Flags": 0.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": " ", "sscVariableValue": "" }, @@ -2055,7 +2055,7 @@ "Type": 1.0, "Label": " ", "Units": " ", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -2068,7 +2068,7 @@ "Type": 1.0, "Label": " ", "Units": "m", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -2081,7 +2081,7 @@ "Type": 1.0, "Label": " ", "Units": "$", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -2094,7 +2094,7 @@ "Type": 1.0, "Label": " ", "Units": " ", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -2107,7 +2107,7 @@ "Type": 1.0, "Label": " ", "Units": "$", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -2133,7 +2133,7 @@ "Type": 1.0, "Label": " ", "Units": "$", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -2150,7 +2150,7 @@ "IndexLabels": "", "Flags": 2.0, "DefaultValue": 1.9, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": " ", "sscVariableValue": "" }, @@ -2159,7 +2159,7 @@ "Type": 1.0, "Label": " ", "Units": "$", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -2172,7 +2172,7 @@ "Type": 1.0, "Label": "kWt", "Units": "", - "Group": "", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -2185,11 +2185,11 @@ "Type": 1.0, "Label": "", "Units": "MMBtu/hr", - "Group": "", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": "", "sscVariableValue": "" }, @@ -2198,7 +2198,7 @@ "Type": 1.0, "Label": " ", "Units": "m3", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -2211,7 +2211,7 @@ "Type": 1.0, "Label": " ", "Units": " ", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -2224,7 +2224,7 @@ "Type": 1.0, "Label": " ", "Units": "m", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -2237,7 +2237,7 @@ "Type": 1.0, "Label": " ", "Units": "m3", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -2250,7 +2250,7 @@ "Type": 1.0, "Label": " ", "Units": "$", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -2263,7 +2263,7 @@ "Type": 1.0, "Label": " ", "Units": "$", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -2276,7 +2276,7 @@ "Type": 1.0, "Label": " ", "Units": "$", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -2289,7 +2289,7 @@ "Type": 1.0, "Label": " ", "Units": "acre", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -2302,7 +2302,7 @@ "Type": 1.0, "Label": " ", "Units": "$", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -2319,7 +2319,7 @@ "IndexLabels": "", "Flags": 2.0, "DefaultValue": 6.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": " ", "sscVariableValue": "" }, @@ -2328,7 +2328,7 @@ "Type": 1.0, "Label": "Heater hours of storage", "Units": "hours", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -2345,7 +2345,7 @@ "IndexLabels": "", "Flags": 8.0, "DefaultValue": 0.0, - "UIObject": "Default", + "UIObject": "Numeric", "sscVariableName": " ", "sscVariableValue": "" }, @@ -2354,7 +2354,7 @@ "Type": 1.0, "Label": " ", "Units": "$", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, @@ -2380,7 +2380,7 @@ "Type": 1.0, "Label": " ", "Units": "m/s", - "Group": " ", + "Group": "System Design", "IndexLabels": "", "Flags": 8.0, "DefaultValue": -999.0, diff --git a/deploy/runtime/ui/MSPT Parallel Heater.json b/deploy/runtime/ui/MSPT Parallel Heater.json index 178c0457d7..577bf4786e 100644 --- a/deploy/runtime/ui/MSPT Parallel Heater.json +++ b/deploy/runtime/ui/MSPT Parallel Heater.json @@ -990,7 +990,7 @@ "f_q_dot_des_allowable_su": { "Version": 4.0, "Type": 1.0, - "Label": "Fraction of design power allowed during startup", + "Label": "Design power fraction allowed at startup", "Units": " ", "Group": "MSPT Parallel Heater", "IndexLabels": "", diff --git a/deploy/runtime/ui/MSPT Receiver.json b/deploy/runtime/ui/MSPT Receiver.json index cd03fb91d0..d65c412186 100644 --- a/deploy/runtime/ui/MSPT Receiver.json +++ b/deploy/runtime/ui/MSPT Receiver.json @@ -53,7 +53,7 @@ }, "Y": { "Type": 3.0, - "Integer": 135.0 + "Integer": 129.0 }, "Width": { "Type": 3.0, @@ -61,7 +61,7 @@ }, "Height": { "Type": 3.0, - "Integer": 173.0 + "Integer": 182.0 }, "Tool Tip": { "Type": 5.0, @@ -1093,7 +1093,7 @@ }, "Y": { "Type": 3.0, - "Integer": 27.0 + "Integer": 24.0 }, "Width": { "Type": 3.0, @@ -1101,7 +1101,7 @@ }, "Height": { "Type": 3.0, - "Integer": 24.0 + "Integer": 28.0 }, "Tool Tip": { "Type": 5.0, @@ -1134,15 +1134,15 @@ }, "Y": { "Type": 3.0, - "Integer": 156.0 + "Integer": 153.0 }, "Width": { "Type": 3.0, - "Integer": 130.0 + "Integer": 160.0 }, "Height": { "Type": 3.0, - "Integer": 21.0 + "Integer": 28.0 }, "Tool Tip": { "Type": 5.0, @@ -1341,7 +1341,7 @@ }, "Y": { "Type": 3.0, - "Integer": 180.0 + "Integer": 186.0 }, "Width": { "Type": 3.0, @@ -1507,7 +1507,7 @@ }, "Y": { "Type": 3.0, - "Integer": 228.0 + "Integer": 234.0 }, "Width": { "Type": 3.0, @@ -1992,7 +1992,7 @@ }, "Y": { "Type": 3.0, - "Integer": 276.0 + "Integer": 282.0 }, "Width": { "Type": 3.0, @@ -2647,7 +2647,7 @@ }, "Y": { "Type": 3.0, - "Integer": 252.0 + "Integer": 258.0 }, "Width": { "Type": 3.0, @@ -2979,7 +2979,7 @@ }, "Y": { "Type": 3.0, - "Integer": 204.0 + "Integer": 210.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/PTES Capital Costs.json b/deploy/runtime/ui/PTES Capital Costs.json index bcde9b0178..6d26aa8e98 100644 --- a/deploy/runtime/ui/PTES Capital Costs.json +++ b/deploy/runtime/ui/PTES Capital Costs.json @@ -3928,7 +3928,7 @@ "CT_tes_spec_cost": { "Version": 4.0, "Type": 1.0, - "Label": "Thermal energy storage cost", + "Label": "Storage cost", "Units": "$/kWt", "Group": " ", "IndexLabels": "PTES Cost", @@ -4097,7 +4097,7 @@ "tes_spec_cost": { "Version": 4.0, "Type": 1.0, - "Label": "Thermal energy storage cost", + "Label": "Storage cost", "Units": "$/kWht", "Group": "PTES Cost", "IndexLabels": "", diff --git a/deploy/runtime/ui/PTES Heat Pump.json b/deploy/runtime/ui/PTES Heat Pump.json index 5f875dc4a9..4ec9a78a36 100644 --- a/deploy/runtime/ui/PTES Heat Pump.json +++ b/deploy/runtime/ui/PTES Heat Pump.json @@ -12,7 +12,7 @@ }, "X": { "Type": 3.0, - "Integer": 741.0 + "Integer": 765.0 }, "Y": { "Type": 3.0, @@ -261,7 +261,7 @@ }, "X": { "Type": 3.0, - "Integer": 741.0 + "Integer": 765.0 }, "Y": { "Type": 3.0, @@ -344,7 +344,7 @@ }, "X": { "Type": 3.0, - "Integer": 741.0 + "Integer": 765.0 }, "Y": { "Type": 3.0, @@ -510,7 +510,7 @@ }, "X": { "Type": 3.0, - "Integer": 453.0 + "Integer": 456.0 }, "Y": { "Type": 3.0, @@ -518,7 +518,7 @@ }, "Width": { "Type": 3.0, - "Integer": 300.0 + "Integer": 400.0 }, "Height": { "Type": 3.0, @@ -568,7 +568,7 @@ }, "Width": { "Type": 3.0, - "Integer": 300.0 + "Integer": 400.0 }, "Height": { "Type": 3.0, @@ -618,7 +618,7 @@ }, "Width": { "Type": 3.0, - "Integer": 300.0 + "Integer": 400.0 }, "Height": { "Type": 3.0, @@ -668,7 +668,7 @@ }, "Width": { "Type": 3.0, - "Integer": 300.0 + "Integer": 400.0 }, "Height": { "Type": 3.0, @@ -834,7 +834,7 @@ }, "X": { "Type": 3.0, - "Integer": 741.0 + "Integer": 765.0 }, "Y": { "Type": 3.0, @@ -1332,7 +1332,7 @@ }, "X": { "Type": 3.0, - "Integer": 741.0 + "Integer": 765.0 }, "Y": { "Type": 3.0, @@ -1415,7 +1415,7 @@ }, "X": { "Type": 3.0, - "Integer": 741.0 + "Integer": 765.0 }, "Y": { "Type": 3.0, @@ -1498,7 +1498,7 @@ }, "X": { "Type": 3.0, - "Integer": 741.0 + "Integer": 765.0 }, "Y": { "Type": 3.0, @@ -1581,7 +1581,7 @@ }, "X": { "Type": 3.0, - "Integer": 741.0 + "Integer": 765.0 }, "Y": { "Type": 3.0, @@ -1747,7 +1747,7 @@ }, "X": { "Type": 3.0, - "Integer": 741.0 + "Integer": 765.0 }, "Y": { "Type": 3.0, @@ -1830,7 +1830,7 @@ }, "X": { "Type": 3.0, - "Integer": 741.0 + "Integer": 765.0 }, "Y": { "Type": 3.0, @@ -1992,7 +1992,7 @@ "f_hp_parasitic_des": { "Version": 4.0, "Type": 1.0, - "Label": "Parasitics (non-pumping) as fraction of thermodynamic power", + "Label": "Parasitics (non-pumping) fraction of thermodynamic power", "Units": " ", "Group": "PTES Heat Pump", "IndexLabels": "", @@ -2005,7 +2005,7 @@ "f_q_dot_des_allowable_su": { "Version": 4.0, "Type": 1.0, - "Label": "Fraction of design power allowed during startup", + "Label": "Fraction of design power allowed at startup", "Units": " ", "Group": " ", "IndexLabels": "", diff --git a/deploy/runtime/ui/PTES Power Cycle.json b/deploy/runtime/ui/PTES Power Cycle.json index 083237f14a..274bc05332 100644 --- a/deploy/runtime/ui/PTES Power Cycle.json +++ b/deploy/runtime/ui/PTES Power Cycle.json @@ -1,7 +1,7 @@ { "Name": "PTES Power Cycle", - "Width": 941.0, - "Height": 553.0, + "Width": 960.0, + "Height": 549.0, "FormObjects": { "Numeric": { "Visible": 1.0, @@ -12,7 +12,7 @@ }, "X": { "Type": 3.0, - "Integer": 786.0 + "Integer": 810.0 }, "Y": { "Type": 3.0, @@ -261,7 +261,7 @@ }, "X": { "Type": 3.0, - "Integer": 786.0 + "Integer": 810.0 }, "Y": { "Type": 3.0, @@ -652,7 +652,7 @@ }, "Width": { "Type": 3.0, - "Integer": 921.0 + "Integer": 950.0 }, "Height": { "Type": 3.0, @@ -689,7 +689,7 @@ }, "Width": { "Type": 3.0, - "Integer": 921.0 + "Integer": 950.0 }, "Height": { "Type": 3.0, @@ -718,7 +718,7 @@ }, "X": { "Type": 3.0, - "Integer": 786.0 + "Integer": 810.0 }, "Y": { "Type": 3.0, @@ -1050,7 +1050,7 @@ }, "X": { "Type": 3.0, - "Integer": 786.0 + "Integer": 810.0 }, "Y": { "Type": 3.0, @@ -1133,7 +1133,7 @@ }, "X": { "Type": 3.0, - "Integer": 786.0 + "Integer": 810.0 }, "Y": { "Type": 3.0, @@ -1382,7 +1382,7 @@ }, "X": { "Type": 3.0, - "Integer": 786.0 + "Integer": 810.0 }, "Y": { "Type": 3.0, @@ -1465,7 +1465,7 @@ }, "X": { "Type": 3.0, - "Integer": 786.0 + "Integer": 810.0 }, "Y": { "Type": 3.0, @@ -1548,7 +1548,7 @@ }, "X": { "Type": 3.0, - "Integer": 786.0 + "Integer": 810.0 }, "Y": { "Type": 3.0, @@ -1631,7 +1631,7 @@ }, "X": { "Type": 3.0, - "Integer": 786.0 + "Integer": 810.0 }, "Y": { "Type": 3.0, @@ -1714,7 +1714,7 @@ }, "X": { "Type": 3.0, - "Integer": 786.0 + "Integer": 810.0 }, "Y": { "Type": 3.0, @@ -1797,7 +1797,7 @@ }, "X": { "Type": 3.0, - "Integer": 786.0 + "Integer": 810.0 }, "Y": { "Type": 3.0, @@ -1880,7 +1880,7 @@ }, "X": { "Type": 3.0, - "Integer": 786.0 + "Integer": 810.0 }, "Y": { "Type": 3.0, @@ -1963,7 +1963,7 @@ }, "X": { "Type": 3.0, - "Integer": 786.0 + "Integer": 810.0 }, "Y": { "Type": 3.0, @@ -2164,7 +2164,7 @@ "f_pc_parasitic_des": { "Version": 4.0, "Type": 1.0, - "Label": "Parasitics (non-pumping) as fraction of thermodynamic power", + "Label": "Parasitics (non-pumping) fraction of thermodynamic power", "Units": " ", "Group": "PTES Power Cycle", "IndexLabels": "", @@ -2203,7 +2203,7 @@ "startup_frac": { "Version": 4.0, "Type": 1.0, - "Label": "Fraction of design thermal energy (1 hr) needed for startup", + "Label": "Design thermal energy (1 hr) fraction for startup", "Units": " ", "Group": " ", "IndexLabels": "", diff --git a/deploy/runtime/ui/PV Land Area.json b/deploy/runtime/ui/PV Land Area.json index dffa3310ca..2b46988fe9 100644 --- a/deploy/runtime/ui/PV Land Area.json +++ b/deploy/runtime/ui/PV Land Area.json @@ -803,7 +803,7 @@ }, "X": { "Type": 3.0, - "Integer": 195.0 + "Integer": 200.0 }, "Y": { "Type": 3.0, @@ -886,7 +886,7 @@ }, "X": { "Type": 3.0, - "Integer": 195.0 + "Integer": 200.0 }, "Y": { "Type": 3.0, @@ -969,7 +969,7 @@ }, "X": { "Type": 3.0, - "Integer": 288.0 + "Integer": 292.0 }, "Y": { "Type": 3.0, @@ -1010,7 +1010,7 @@ }, "X": { "Type": 3.0, - "Integer": 195.0 + "Integer": 200.0 }, "Y": { "Type": 3.0, diff --git a/deploy/runtime/ui/PV Losses.json b/deploy/runtime/ui/PV Losses.json index 2bac637c4c..15fa392276 100644 --- a/deploy/runtime/ui/PV Losses.json +++ b/deploy/runtime/ui/PV Losses.json @@ -1011,7 +1011,7 @@ }, "Width": { "Type": 3.0, - "Integer": 59.0 + "Integer": 74.0 }, "Height": { "Type": 3.0, @@ -1048,7 +1048,7 @@ }, "AlignRight": { "Type": 2.0, - "Boolean": 1.0 + "Boolean": 0.0 }, "AlignTop": { "Type": 2.0, @@ -1073,7 +1073,7 @@ }, "Width": { "Type": 3.0, - "Integer": 59.0 + "Integer": 74.0 }, "Height": { "Type": 3.0, @@ -1110,7 +1110,7 @@ }, "AlignRight": { "Type": 2.0, - "Boolean": 1.0 + "Boolean": 0.0 }, "AlignTop": { "Type": 2.0, @@ -2121,7 +2121,7 @@ }, "X": { "Type": 3.0, - "Integer": 30.0 + "Integer": 27.0 }, "Y": { "Type": 3.0, @@ -2129,7 +2129,7 @@ }, "Width": { "Type": 3.0, - "Integer": 807.0 + "Integer": 813.0 }, "Height": { "Type": 3.0, @@ -2141,7 +2141,7 @@ }, "Caption": { "Type": 5.0, - "String": "Clipping correction accounts for inverter power limiting that may occur within the hour on partially cloudy days (for hourly simulations only)." + "String": "Clipping correction accounts for inverter power limiting that may occur within the hour on partly cloudy days (hourly simulations only)." }, "TextColour": { "Type": 4.0, diff --git a/deploy/runtime/ui/Physical Trough IPH Capital Costs.json b/deploy/runtime/ui/Physical Trough IPH Capital Costs.json index 75bb3d9716..f17b0e7954 100644 --- a/deploy/runtime/ui/Physical Trough IPH Capital Costs.json +++ b/deploy/runtime/ui/Physical Trough IPH Capital Costs.json @@ -1906,7 +1906,7 @@ }, "X": { "Type": 3.0, - "Integer": 531.0 + "Integer": 561.0 }, "Y": { "Type": 3.0, diff --git a/deploy/runtime/ui/Physical Trough Solar Field.json b/deploy/runtime/ui/Physical Trough Solar Field.json index 8f7bd74b37..ab2f51fcca 100644 --- a/deploy/runtime/ui/Physical Trough Solar Field.json +++ b/deploy/runtime/ui/Physical Trough Solar Field.json @@ -3002,7 +3002,7 @@ }, "Width": { "Type": 3.0, - "Integer": 100.0 + "Integer": 76.0 }, "Height": { "Type": 3.0, @@ -3948,7 +3948,7 @@ }, "X": { "Type": 3.0, - "Integer": 486.0 + "Integer": 490.0 }, "Y": { "Type": 3.0, @@ -3956,7 +3956,7 @@ }, "Width": { "Type": 3.0, - "Integer": 100.0 + "Integer": 76.0 }, "Height": { "Type": 3.0, @@ -4719,7 +4719,7 @@ }, "Width": { "Type": 3.0, - "Integer": 100.0 + "Integer": 76.0 }, "Height": { "Type": 3.0, diff --git a/deploy/runtime/ui/Physical Trough System Design.json b/deploy/runtime/ui/Physical Trough System Design.json index 7865b3901c..f63b9b0885 100644 --- a/deploy/runtime/ui/Physical Trough System Design.json +++ b/deploy/runtime/ui/Physical Trough System Design.json @@ -12,7 +12,7 @@ }, "X": { "Type": 3.0, - "Integer": 261.0 + "Integer": 280.0 }, "Y": { "Type": 3.0, @@ -95,7 +95,7 @@ }, "X": { "Type": 3.0, - "Integer": 261.0 + "Integer": 280.0 }, "Y": { "Type": 3.0, @@ -178,7 +178,7 @@ }, "X": { "Type": 3.0, - "Integer": 369.0 + "Integer": 385.0 }, "Y": { "Type": 3.0, @@ -261,7 +261,7 @@ }, "X": { "Type": 3.0, - "Integer": 261.0 + "Integer": 280.0 }, "Y": { "Type": 3.0, @@ -344,7 +344,7 @@ }, "X": { "Type": 3.0, - "Integer": 726.0 + "Integer": 760.0 }, "Y": { "Type": 3.0, @@ -427,7 +427,7 @@ }, "X": { "Type": 3.0, - "Integer": 261.0 + "Integer": 280.0 }, "Y": { "Type": 3.0, @@ -510,7 +510,7 @@ }, "X": { "Type": 3.0, - "Integer": 261.0 + "Integer": 280.0 }, "Y": { "Type": 3.0, @@ -593,7 +593,7 @@ }, "X": { "Type": 3.0, - "Integer": 726.0 + "Integer": 760.0 }, "Y": { "Type": 3.0, @@ -676,7 +676,7 @@ }, "X": { "Type": 3.0, - "Integer": 726.0 + "Integer": 760.0 }, "Y": { "Type": 3.0, @@ -759,7 +759,7 @@ }, "X": { "Type": 3.0, - "Integer": 726.0 + "Integer": 760.0 }, "Y": { "Type": 3.0, @@ -842,7 +842,7 @@ }, "X": { "Type": 3.0, - "Integer": 261.0 + "Integer": 280.0 }, "Y": { "Type": 3.0, @@ -1248,7 +1248,7 @@ }, "X": { "Type": 3.0, - "Integer": 726.0 + "Integer": 760.0 }, "Y": { "Type": 3.0, @@ -1331,7 +1331,7 @@ }, "X": { "Type": 3.0, - "Integer": 369.0 + "Integer": 385.0 }, "Y": { "Type": 3.0, @@ -1414,7 +1414,7 @@ }, "X": { "Type": 3.0, - "Integer": 261.0 + "Integer": 280.0 }, "Y": { "Type": 3.0, @@ -1497,7 +1497,7 @@ }, "X": { "Type": 3.0, - "Integer": 261.0 + "Integer": 280.0 }, "Y": { "Type": 3.0, @@ -1580,7 +1580,7 @@ }, "X": { "Type": 3.0, - "Integer": 726.0 + "Integer": 760.0 }, "Y": { "Type": 3.0, @@ -1721,7 +1721,7 @@ "COPY_field_thermal_output_ideal": { "Version": 4.0, "Type": 1.0, - "Label": "Field thermal power w/ no defocus constraints", + "Label": "Field thermal power w/o defocus constraints", "Units": "MWt", "Group": "", "IndexLabels": "", diff --git a/deploy/runtime/ui/Physical Trough Thermal Storage.json b/deploy/runtime/ui/Physical Trough Thermal Storage.json index 4095e085af..8fd670df23 100644 --- a/deploy/runtime/ui/Physical Trough Thermal Storage.json +++ b/deploy/runtime/ui/Physical Trough Thermal Storage.json @@ -1841,7 +1841,7 @@ }, "Width": { "Type": 3.0, - "Integer": 90.0 + "Integer": 100.0 }, "Height": { "Type": 3.0, diff --git a/deploy/runtime/ui/TES Two Tank.json b/deploy/runtime/ui/TES Two Tank.json index c3d3047009..74077e6d66 100644 --- a/deploy/runtime/ui/TES Two Tank.json +++ b/deploy/runtime/ui/TES Two Tank.json @@ -542,7 +542,7 @@ }, "Y": { "Type": 3.0, - "Integer": 99.0 + "Integer": 125.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/Tower SolarPilot Solar Field.json b/deploy/runtime/ui/Tower SolarPilot Solar Field.json index 9334cb3ede..c409037d7e 100644 --- a/deploy/runtime/ui/Tower SolarPilot Solar Field.json +++ b/deploy/runtime/ui/Tower SolarPilot Solar Field.json @@ -24,7 +24,7 @@ }, "Height": { "Type": 3.0, - "Integer": 485.0 + "Integer": 470.0 }, "Tool Tip": { "Type": 5.0, @@ -53,7 +53,7 @@ }, "Y": { "Type": 3.0, - "Integer": 495.0 + "Integer": 480.0 }, "Width": { "Type": 3.0, @@ -61,7 +61,7 @@ }, "Height": { "Type": 3.0, - "Integer": 293.0 + "Integer": 311.0 }, "Tool Tip": { "Type": 5.0, @@ -98,7 +98,7 @@ }, "Height": { "Type": 3.0, - "Integer": 144.0 + "Integer": 147.0 }, "Tool Tip": { "Type": 5.0, @@ -275,7 +275,7 @@ }, "Y": { "Type": 3.0, - "Integer": 663.0 + "Integer": 669.0 }, "Width": { "Type": 3.0, @@ -358,7 +358,7 @@ }, "Y": { "Type": 3.0, - "Integer": 687.0 + "Integer": 693.0 }, "Width": { "Type": 3.0, @@ -441,7 +441,7 @@ }, "Y": { "Type": 3.0, - "Integer": 711.0 + "Integer": 717.0 }, "Width": { "Type": 3.0, @@ -524,7 +524,7 @@ }, "Y": { "Type": 3.0, - "Integer": 735.0 + "Integer": 741.0 }, "Width": { "Type": 3.0, @@ -607,7 +607,7 @@ }, "Y": { "Type": 3.0, - "Integer": 759.0 + "Integer": 765.0 }, "Width": { "Type": 3.0, @@ -690,7 +690,7 @@ }, "Y": { "Type": 3.0, - "Integer": 732.0 + "Integer": 735.0 }, "Width": { "Type": 3.0, @@ -698,7 +698,7 @@ }, "Height": { "Type": 3.0, - "Integer": 21.0 + "Integer": 24.0 }, "Tool Tip": { "Type": 5.0, @@ -814,7 +814,7 @@ }, "Y": { "Type": 3.0, - "Integer": 585.0 + "Integer": 576.0 }, "Width": { "Type": 3.0, @@ -1146,7 +1146,7 @@ }, "Y": { "Type": 3.0, - "Integer": 561.0 + "Integer": 549.0 }, "Width": { "Type": 3.0, @@ -1229,7 +1229,7 @@ }, "Y": { "Type": 3.0, - "Integer": 609.0 + "Integer": 597.0 }, "Width": { "Type": 3.0, @@ -1312,7 +1312,7 @@ }, "Y": { "Type": 3.0, - "Integer": 633.0 + "Integer": 630.0 }, "Width": { "Type": 3.0, @@ -1444,7 +1444,7 @@ }, "Height": { "Type": 3.0, - "Integer": 21.0 + "Integer": 24.0 }, "Tool Tip": { "Type": 5.0, @@ -1477,7 +1477,7 @@ }, "Y": { "Type": 3.0, - "Integer": 513.0 + "Integer": 501.0 }, "Width": { "Type": 3.0, @@ -1726,7 +1726,7 @@ }, "Y": { "Type": 3.0, - "Integer": 537.0 + "Integer": 525.0 }, "Width": { "Type": 3.0, @@ -1809,7 +1809,7 @@ }, "Y": { "Type": 3.0, - "Integer": 495.0 + "Integer": 480.0 }, "Width": { "Type": 3.0, @@ -1817,7 +1817,7 @@ }, "Height": { "Type": 3.0, - "Integer": 144.0 + "Integer": 159.0 }, "Tool Tip": { "Type": 5.0, @@ -1846,7 +1846,7 @@ }, "Y": { "Type": 3.0, - "Integer": 609.0 + "Integer": 603.0 }, "Width": { "Type": 3.0, @@ -2042,7 +2042,7 @@ }, "Y": { "Type": 3.0, - "Integer": 759.0 + "Integer": 762.0 }, "Width": { "Type": 3.0, @@ -2125,7 +2125,7 @@ }, "Y": { "Type": 3.0, - "Integer": 513.0 + "Integer": 501.0 }, "Width": { "Type": 3.0, @@ -2847,7 +2847,7 @@ }, "Height": { "Type": 3.0, - "Integer": 106.0 + "Integer": 103.0 }, "Tool Tip": { "Type": 5.0, @@ -3117,11 +3117,11 @@ }, "Width": { "Type": 3.0, - "Integer": 375.0 + "Integer": 801.0 }, "Height": { "Type": 3.0, - "Integer": 54.0 + "Integer": 36.0 }, "Tool Tip": { "Type": 5.0, @@ -3237,7 +3237,7 @@ }, "Y": { "Type": 3.0, - "Integer": 330.0 + "Integer": 324.0 }, "Width": { "Type": 3.0, @@ -3245,7 +3245,7 @@ }, "Height": { "Type": 3.0, - "Integer": 111.0 + "Integer": 93.0 }, "Tool Tip": { "Type": 5.0, @@ -3523,7 +3523,7 @@ }, "Y": { "Type": 3.0, - "Integer": 561.0 + "Integer": 549.0 }, "Width": { "Type": 3.0, @@ -3606,7 +3606,7 @@ }, "Y": { "Type": 3.0, - "Integer": 585.0 + "Integer": 573.0 }, "Width": { "Type": 3.0, @@ -3779,7 +3779,7 @@ }, "Y": { "Type": 3.0, - "Integer": 537.0 + "Integer": 525.0 }, "Width": { "Type": 3.0, @@ -3862,7 +3862,7 @@ }, "Y": { "Type": 3.0, - "Integer": 972.0 + "Integer": 975.0 }, "Width": { "Type": 3.0, @@ -3945,7 +3945,7 @@ }, "Y": { "Type": 3.0, - "Integer": 948.0 + "Integer": 951.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/Utility Rate - Description.json b/deploy/runtime/ui/Utility Rate - Description.json index 92b8f99951..6fe8ca6b98 100644 --- a/deploy/runtime/ui/Utility Rate - Description.json +++ b/deploy/runtime/ui/Utility Rate - Description.json @@ -401,7 +401,7 @@ }, "Y": { "Type": 3.0, - "Integer": 198.0 + "Integer": 201.0 }, "Width": { "Type": 3.0, @@ -409,7 +409,7 @@ }, "Height": { "Type": 3.0, - "Integer": 168.0 + "Integer": 165.0 }, "Tool Tip": { "Type": 5.0, @@ -768,7 +768,7 @@ }, "Y": { "Type": 3.0, - "Integer": 102.0 + "Integer": 96.0 }, "Width": { "Type": 3.0, @@ -886,7 +886,7 @@ }, "Y": { "Type": 3.0, - "Integer": 126.0 + "Integer": 123.0 }, "Width": { "Type": 3.0, @@ -1004,7 +1004,7 @@ }, "Y": { "Type": 3.0, - "Integer": 174.0 + "Integer": 177.0 }, "Width": { "Type": 3.0, @@ -1063,7 +1063,7 @@ }, "Y": { "Type": 3.0, - "Integer": 78.0 + "Integer": 69.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/Utility Rate - Flat.json b/deploy/runtime/ui/Utility Rate - Flat.json index ea84472732..8947bb1a42 100644 --- a/deploy/runtime/ui/Utility Rate - Flat.json +++ b/deploy/runtime/ui/Utility Rate - Flat.json @@ -1,7 +1,7 @@ { "Name": "Utility Rate - Flat", - "Width": 1414.0, - "Height": 586.0, + "Width": 1413.0, + "Height": 567.0, "FormObjects": { "GroupBox": { "Visible": 1.0, @@ -234,7 +234,7 @@ }, "X": { "Type": 3.0, - "Integer": 612.0 + "Integer": 606.0 }, "Y": { "Type": 3.0, @@ -477,11 +477,11 @@ }, "Width": { "Type": 3.0, - "Integer": 655.0 + "Integer": 622.0 }, "Height": { "Type": 3.0, - "Integer": 64.0 + "Integer": 58.0 }, "Tool Tip": { "Type": 5.0, @@ -531,15 +531,15 @@ }, "X": { "Type": 3.0, - "Integer": 396.0 + "Integer": 393.0 }, "Y": { "Type": 3.0, - "Integer": 99.0 + "Integer": 105.0 }, "Width": { "Type": 3.0, - "Integer": 837.0 + "Integer": 737.0 }, "Height": { "Type": 3.0, @@ -729,15 +729,15 @@ }, "X": { "Type": 3.0, - "Integer": 663.0 + "Integer": 657.0 }, "Y": { "Type": 3.0, - "Integer": 342.0 + "Integer": 345.0 }, "Width": { "Type": 3.0, - "Integer": 422.0 + "Integer": 348.0 }, "Height": { "Type": 3.0, @@ -770,7 +770,7 @@ }, "X": { "Type": 3.0, - "Integer": 669.0 + "Integer": 657.0 }, "Y": { "Type": 3.0, @@ -778,7 +778,7 @@ }, "Width": { "Type": 3.0, - "Integer": 306.0 + "Integer": 348.0 }, "Height": { "Type": 3.0, @@ -1026,7 +1026,7 @@ }, "X": { "Type": 3.0, - "Integer": 978.0 + "Integer": 1008.0 }, "Y": { "Type": 3.0, @@ -1034,7 +1034,7 @@ }, "Width": { "Type": 3.0, - "Integer": 322.0 + "Integer": 391.0 }, "Height": { "Type": 3.0, @@ -1067,7 +1067,7 @@ }, "X": { "Type": 3.0, - "Integer": 978.0 + "Integer": 1008.0 }, "Y": { "Type": 3.0, @@ -1112,7 +1112,7 @@ }, "Y": { "Type": 3.0, - "Integer": 261.0 + "Integer": 255.0 }, "Width": { "Type": 3.0, @@ -1120,7 +1120,7 @@ }, "Height": { "Type": 3.0, - "Integer": 24.0 + "Integer": 28.0 }, "Tool Tip": { "Type": 5.0, @@ -1149,7 +1149,7 @@ }, "X": { "Type": 3.0, - "Integer": 978.0 + "Integer": 1008.0 }, "Y": { "Type": 3.0, @@ -1194,7 +1194,7 @@ }, "Y": { "Type": 3.0, - "Integer": 234.0 + "Integer": 228.0 }, "Width": { "Type": 3.0, @@ -1273,19 +1273,19 @@ }, "X": { "Type": 3.0, - "Integer": 396.0 + "Integer": 393.0 }, "Y": { "Type": 3.0, - "Integer": 75.0 + "Integer": 78.0 }, "Width": { "Type": 3.0, - "Integer": 404.0 + "Integer": 737.0 }, "Height": { "Type": 3.0, - "Integer": 21.0 + "Integer": 24.0 }, "Tool Tip": { "Type": 5.0, @@ -1377,7 +1377,7 @@ }, "Y": { "Type": 3.0, - "Integer": 369.0 + "Integer": 372.0 }, "Width": { "Type": 3.0, diff --git a/deploy/runtime/ui/Utility Rate - Unused.json b/deploy/runtime/ui/Utility Rate - Unused.json index bada07bcf1..af16d542c2 100644 --- a/deploy/runtime/ui/Utility Rate - Unused.json +++ b/deploy/runtime/ui/Utility Rate - Unused.json @@ -12,7 +12,7 @@ }, "X": { "Type": 3.0, - "Integer": 471.0 + "Integer": 483.0 }, "Y": { "Type": 3.0, @@ -20,7 +20,7 @@ }, "Width": { "Type": 3.0, - "Integer": 930.0 + "Integer": 918.0 }, "Height": { "Type": 3.0, @@ -99,7 +99,7 @@ }, "X": { "Type": 3.0, - "Integer": 888.0 + "Integer": 898.0 }, "Y": { "Type": 3.0, @@ -223,7 +223,7 @@ }, "X": { "Type": 3.0, - "Integer": 888.0 + "Integer": 898.0 }, "Y": { "Type": 3.0, @@ -268,7 +268,7 @@ }, "X": { "Type": 3.0, - "Integer": 480.0 + "Integer": 490.0 }, "Y": { "Type": 3.0, @@ -381,7 +381,7 @@ }, "X": { "Type": 3.0, - "Integer": 189.0 + "Integer": 201.0 }, "Y": { "Type": 3.0, @@ -440,7 +440,7 @@ }, "X": { "Type": 3.0, - "Integer": 189.0 + "Integer": 201.0 }, "Y": { "Type": 3.0, @@ -523,7 +523,7 @@ }, "X": { "Type": 3.0, - "Integer": 189.0 + "Integer": 201.0 }, "Y": { "Type": 3.0, @@ -606,7 +606,7 @@ }, "X": { "Type": 3.0, - "Integer": 189.0 + "Integer": 201.0 }, "Y": { "Type": 3.0, @@ -665,7 +665,7 @@ }, "X": { "Type": 3.0, - "Integer": 189.0 + "Integer": 201.0 }, "Y": { "Type": 3.0, @@ -724,7 +724,7 @@ }, "X": { "Type": 3.0, - "Integer": 186.0 + "Integer": 201.0 }, "Y": { "Type": 3.0, @@ -761,7 +761,7 @@ }, "X": { "Type": 3.0, - "Integer": 186.0 + "Integer": 201.0 }, "Y": { "Type": 3.0, @@ -844,7 +844,7 @@ }, "X": { "Type": 3.0, - "Integer": 189.0 + "Integer": 201.0 }, "Y": { "Type": 3.0, @@ -903,7 +903,7 @@ }, "X": { "Type": 3.0, - "Integer": 186.0 + "Integer": 201.0 }, "Y": { "Type": 3.0,