Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Add cf input to tidal turbine design page #1872

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
+8,939 −11
Open

Add cf input to tidal turbine design page #1872

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8425320
Add cf input to tidal turbine design page
mjprilliman Oct 8, 2024
f8f2d07
Update variable names, add target cf to callbacks for graphing
mjprilliman Oct 8, 2024
6b801b9
Add frequency distribution calculation for tidal turbine design with
mjprilliman Oct 9, 2024
d09ab91
Update defaults
mjprilliman Oct 10, 2024
22683bb
Merge branch 'develop' into tidal-turbine-cf
mjprilliman Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions deploy/runtime/defaults/MEtidal_LCOE Calculator.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1180,6 +1180,7 @@
"tidal_turbine_rotor_diameter": 0.0,
"tidal_turbine_rotor_diameter_input": 50.0,
"tidal_turbine_site_depth": 50.0,
"tidal_turbine_target_cf": 30.0,
"tidal_velocity": [
1.06411,
0.907655,
Expand Down
1 change: 1 addition & 0 deletions deploy/runtime/defaults/MEtidal_None.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,7 @@
"tidal_turbine_rotor_diameter": 0.0,
"tidal_turbine_rotor_diameter_input": 25.0,
"tidal_turbine_site_depth": 50.0,
"tidal_turbine_target_cf": 30.0,
"tidal_velocity": [
1.06411,
0.907655,
Expand Down
112 changes: 104 additions & 8 deletions deploy/runtime/ui/Marine Tidal Turbine Design.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
},
"Y": {
"Type": 3.0,
"Integer": 264.0
"Integer": 294.0
},
"Width": {
"Type": 3.0,
Expand Down Expand Up @@ -136,7 +136,7 @@
},
"Y": {
"Type": 3.0,
"Integer": 234.0
"Integer": 264.0
},
"Width": {
"Type": 3.0,
Expand Down Expand Up @@ -385,7 +385,7 @@
},
"Y": {
"Type": 3.0,
"Integer": 207.0
"Integer": 237.0
},
"Width": {
"Type": 3.0,
Expand Down Expand Up @@ -438,7 +438,7 @@
},
"Y": {
"Type": 3.0,
"Integer": 144.0
"Integer": 174.0
},
"Width": {
"Type": 3.0,
Expand Down Expand Up @@ -550,7 +550,7 @@
},
"Y": {
"Type": 3.0,
"Integer": 177.0
"Integer": 207.0
},
"Width": {
"Type": 3.0,
Expand Down Expand Up @@ -603,7 +603,7 @@
},
"Y": {
"Type": 3.0,
"Integer": 114.0
"Integer": 144.0
},
"Width": {
"Type": 3.0,
Expand Down Expand Up @@ -672,6 +672,89 @@
"Integer": 4.0
}
}
},
"Numeric": {
"Visible": 1.0,
"ObjectProperties": {
"Name": {
"Type": 5.0,
"String": "tidal_turbine_target_cf"
},
"X": {
"Type": 3.0,
"Integer": 198.0
},
"Y": {
"Type": 3.0,
"Integer": 114.0
},
"Width": {
"Type": 3.0,
"Integer": 118.0
},
"Height": {
"Type": 3.0,
"Integer": 24.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": {
Expand Down Expand Up @@ -910,6 +993,19 @@
"sscVariableName": "",
"sscVariableValue": ""
},
"tidal_turbine_target_cf": {
"Version": 4.0,
"Type": 1.0,
"Label": "Target capacity factor",
"Units": "%",
"Group": "ME Tidal Converter",
"IndexLabels": "",
"Flags": 2.0,
"DefaultValue": 0.0,
"UIObject": "Default",
"sscVariableName": "",
"sscVariableValue": ""
},
"tidal_velocity_power_law_fit": {
"Version": 4.0,
"Type": 1.0,
Expand Down Expand Up @@ -946,7 +1042,7 @@
"\tdata.tidal_resource = ${tidal_resource};\r",
"\t//data.generator_rated_capacity = ${tidal_turbine_kw_rating_input};\r",
"\tdata.pto_efficiency = ${tidal_turbine_pto_eff};\r",
"\t\r",
"\tdata.target_cf = ${tidal_turbine_target_cf};\r",
"\t\r",
"\tsuccess = ssc_eqn(\"tidal_turbine_calculate_powercurve\", data);\r",
"\t/*\r",
Expand Down Expand Up @@ -1032,6 +1128,6 @@
"on_change{'tidal_turbine_cutin'} = define() { plot_turbine_curve();};\r",
"on_change{'tidal_turbine_cut_out'} = define() { plot_turbine_curve();};\r",
"on_change{'tidal_turbine_number_rotors'} = define() { plot_turbine_curve();};\r",
""
"on_change{'tidal_turbine_target_cf'} = define() {plot_turbine_curve();};"
]
}
Loading