Skip to content

Commit

Permalink
Update report templates, clean up marine report template
Browse files Browse the repository at this point in the history
  • Loading branch information
mjprilliman committed Dec 4, 2024
1 parent e55ff35 commit 30b819f
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion deploy/runtime/defaults/MEtidal_LCOE Calculator.json
Original file line number Diff line number Diff line change
Expand Up @@ -1111,7 +1111,7 @@
"tidal_turbine_cutin": 0.0,
"tidal_turbine_hub_ht": 0.0,
"tidal_turbine_kw_rating": 0.0,
"tidal_turbine_kw_rating_input": 210.0,
"tidal_turbine_kw_rating_rotor": 0.0,
"tidal_turbine_max_cp": [
0.42
],
Expand Down
2 changes: 1 addition & 1 deletion deploy/runtime/defaults/MEtidal_None.json
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@
"tidal_turbine_cutin": 0.0,
"tidal_turbine_hub_ht": 0.0,
"tidal_turbine_kw_rating": 0.0,
"tidal_turbine_kw_rating_input": 210.0,
"tidal_turbine_kw_rating_rotor": 0.0,
"tidal_turbine_max_cp": [
0.42
],
Expand Down
Binary file modified deploy/runtime/reports/basic.samreport
Binary file not shown.
Binary file modified deploy/runtime/reports/mewave.samreport
Binary file not shown.
Binary file modified deploy/runtime/reports/pv.samreport
Binary file not shown.
6 changes: 3 additions & 3 deletions deploy/runtime/ui/Marine Tidal Turbine Design.json
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@
"ObjectProperties": {
"Name": {
"Type": 5.0,
"String": "tidal_turbine_kw_rating_input"
"String": "tidal_turbine_kw_rating_rotor"
},
"X": {
"Type": 3.0,
Expand Down Expand Up @@ -862,7 +862,7 @@
"sscVariableName": "",
"sscVariableValue": ""
},
"tidal_turbine_kw_rating_input": {
"tidal_turbine_kw_rating_rotor": {
"Version": 4.0,
"Type": 1.0,
"Label": "Rated power per rotor",
Expand Down Expand Up @@ -1071,7 +1071,7 @@
"\t${tidal_turbine_powercurve_powerout} = power_rated;\r",
"\t//${tidal_turbine_powercurve_powerout_electric} = power;\r",
"\t${tidal_turbine_kw_rating} = rated_power;\r",
"\t${tidal_turbine_kw_rating_input} = rated_power_rotor; //todo rename variables\r",
"\t${tidal_turbine_kw_rating_rotor} = rated_power_rotor; //todo rename variables\r",
"\t\r",
"\t\r",
"\t// other outputs\r",
Expand Down

0 comments on commit 30b819f

Please sign in to comment.