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

Marine, Geothermal UI fixes #1591

Merged
merged 22 commits into from
Nov 28, 2023
Merged

Marine, Geothermal UI fixes #1591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
1bb080f
Mac form fixes, UI fixes for marine, geothermal, updates library reading
mjprilliman Nov 15, 2023
750d44b
Update defaults
mjprilliman Nov 15, 2023
565dcc6
UI layout fixes
cpaulgilman Nov 15, 2023
d4838c1
Fix #1576 PVWatts battery above advanced inputs
cpaulgilman Nov 15, 2023
d0fdb1f
Merge branch 'develop' into marine-geothermal-fixes
mjprilliman Nov 16, 2023
89f24fc
Fix text too long for config and navigation tree
cpaulgilman Nov 16, 2023
86e45ea
Navigation menu width for Linux
cpaulgilman Nov 16, 2023
9454015
UI form fixes for Linux
cpaulgilman Nov 16, 2023
956327d
Hard code tech width in configuration chooser
cpaulgilman Nov 16, 2023
4b13309
Merge branch 'ui-mac-fixes' of https://github.com/NREL/SAM into ui-ma…
cpaulgilman Nov 16, 2023
8c00740
Merge branch 'develop' into ui-mac-fixes
cpaulgilman Nov 16, 2023
14cf809
Merge branch 'develop' into marine-geothermal-fixes
mjprilliman Nov 16, 2023
9905a69
Update wave time series library, fix UI alignment
mjprilliman Nov 17, 2023
f71dd38
Merge branch 'develop' into marine-geothermal-fixes
mjprilliman Nov 17, 2023
a449f2c
Remove capacity factor from standalone battery metrics table
mjprilliman Nov 17, 2023
5520a53
Merge branch 'develop' into marine-geothermal-fixes
mjprilliman Nov 17, 2023
d88721f
Update location names for tidal resource files, delete unused file
mjprilliman Nov 17, 2023
3b6d88a
PR review UI fixes
cpaulgilman Nov 17, 2023
0bc282f
Merge branch 'develop' into ui-mac-fixes
cpaulgilman Nov 17, 2023
b7921a1
Merge branch 'ui-mac-fixes' into marine-geothermal-fixes
cpaulgilman Nov 17, 2023
97e9be2
Fix overlap on Mac
cpaulgilman Nov 17, 2023
dd7bbdb
Merge branch 'develop' into marine-geothermal-fixes
mjprilliman Nov 28, 2023
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
2 changes: 1 addition & 1 deletion deploy/runtime/defaults/Geothermal Power_All Equity Partnership Flip.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19819,7 +19819,7 @@
],
"reservoir_model_inputs_shown": 0.0,
"reservoir_permeability": 0.05,
"reservoir_pressure_change": 0.4,
"reservoir_pressure_change": 2500.0,
"reservoir_pressure_change_type": 0.0,
"reservoir_pressure_change_type_old_setting": 0.0,
"reservoir_width": 500.0,
Expand Down
2 changes: 1 addition & 1 deletion deploy/runtime/defaults/Geothermal Power_LCOE Calculator.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9512,7 +9512,7 @@
],
"reservoir_model_inputs_shown": 0.0,
"reservoir_permeability": 0.05,
"reservoir_pressure_change": 0.4,
"reservoir_pressure_change": 2500.0,
"reservoir_pressure_change_type": 0.0,
"reservoir_pressure_change_type_old_setting": 0.0,
"reservoir_width": 500.0,
Expand Down
2 changes: 1 addition & 1 deletion deploy/runtime/defaults/Geothermal Power_Leveraged Partnership Flip.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19829,7 +19829,7 @@
],
"reservoir_model_inputs_shown": 0.0,
"reservoir_permeability": 0.05,
"reservoir_pressure_change": 0.4,
"reservoir_pressure_change": 2500.0,
"reservoir_pressure_change_type": 0.0,
"reservoir_pressure_change_type_old_setting": 0.0,
"reservoir_width": 500.0,
Expand Down
2 changes: 1 addition & 1 deletion deploy/runtime/defaults/Geothermal Power_Merchant Plant.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666915,7 +666915,7 @@
],
"reservoir_model_inputs_shown": 0.0,
"reservoir_permeability": 0.05,
"reservoir_pressure_change": 0.4,
"reservoir_pressure_change": 2500.0,
"reservoir_pressure_change_type": 0.0,
"reservoir_pressure_change_type_old_setting": 0.0,
"reservoir_width": 500.0,
Expand Down
2 changes: 1 addition & 1 deletion deploy/runtime/defaults/Geothermal Power_None.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9397,7 +9397,7 @@
],
"reservoir_model_inputs_shown": 0.0,
"reservoir_permeability": 0.05,
"reservoir_pressure_change": 0.4,
"reservoir_pressure_change": 2500.0,
"reservoir_pressure_change_type": 0.0,
"reservoir_pressure_change_type_old_setting": 0.0,
"reservoir_width": 500.0,
Expand Down
2 changes: 1 addition & 1 deletion deploy/runtime/defaults/Geothermal Power_Sale Leaseback.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19814,7 +19814,7 @@
],
"reservoir_model_inputs_shown": 0.0,
"reservoir_permeability": 0.05,
"reservoir_pressure_change": 0.4,
"reservoir_pressure_change": 2500.0,
"reservoir_pressure_change_type": 0.0,
"reservoir_pressure_change_type_old_setting": 0.0,
"reservoir_width": 500.0,
Expand Down
2 changes: 1 addition & 1 deletion deploy/runtime/defaults/Geothermal Power_Single Owner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19834,7 +19834,7 @@
],
"reservoir_model_inputs_shown": 0.0,
"reservoir_permeability": 0.05,
"reservoir_pressure_change": 0.4,
"reservoir_pressure_change": 2500.0,
"reservoir_pressure_change_type": 0.0,
"reservoir_pressure_change_type_old_setting": 0.0,
"reservoir_width": 500.0,
Expand Down
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 @@ -463,6 +463,7 @@
"library_or_input_tidal": 0.0,
"load_grid_voltage": 8.0,
"load_grid_voltage_options": 0.0,
"location": "<invalid>",
"location_id": "COD0911",
"lon": -70.6829,
"long_term_service_agreement_cost": 0.0,
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 @@ -174,6 +174,7 @@
"library_or_input_tidal": 0.0,
"load_grid_voltage": 8.0,
"load_grid_voltage_options": 0.0,
"location": "<invalid>",
"location_id": "COD0911",
"lon": -70.6829,
"loss_additional": 0.0,
Expand Down
1 change: 1 addition & 0 deletions deploy/runtime/defaults/MEwave Battery_Single Owner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32040,6 +32040,7 @@
"load_grid_voltage_options": 0.0,
"loan_moratorium": 0.0,
"location_id": 596791.0,
"location_name": "<invalid>",
"location_ts": "lat40.84_lon-124.25__2010",
"lon": -124.25,
"long_term_service_agreement_cost": 0.0,
Expand Down
1 change: 1 addition & 0 deletions deploy/runtime/defaults/MEwave_LCOE Calculator.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3762,6 +3762,7 @@
"load_grid_voltage_options": 0.0,
"location": "Humboldt Bay - DOE Reference",
"location_id": 596791.0,
"location_name": "<invalid>",
"location_ts": "lat40.84_lon-124.25__2010",
"lon": -124.25,
"long_term_service_agreement_cost": 0.0,
Expand Down
1 change: 1 addition & 0 deletions deploy/runtime/defaults/MEwave_None.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3471,6 +3471,7 @@
"load_grid_voltage_options": 0.0,
"location": "Humboldt Bay - DOE Reference",
"location_id": 596791.0,
"location_name": "<invalid>",
"location_ts": "lat40.84_lon-124.25__2010",
"lon": -124.25,
"loss_additional": 0.0,
Expand Down
1 change: 1 addition & 0 deletions deploy/runtime/defaults/MEwave_Single Owner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22153,6 +22153,7 @@
"load_grid_voltage_options": 0.0,
"loan_moratorium": 0.0,
"location_id": 596791.0,
"location_name": "<invalid>",
"location_ts": "lat40.84_lon-124.25__2010",
"lon": -124.25,
"long_term_service_agreement_cost": 0.0,
Expand Down
1 change: 0 additions & 1 deletion deploy/runtime/metrics.lk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,6 @@ function generic_battery_metrics()
function standalone_battery_metrics()
{
metric( 'average_battery_roundtrip_efficiency', {'label'='Battery roundtrip efficiency', 'mode'='f', 'deci'='2', 'post'='%' } );
metric( 'capacity_factor_sales', {'label'='Capacity factor based on AC electricity to grid', 'mode'='f', 'deci'='2', 'post'='%' } );
//metric( 'kwh_per_kw', {'label'='First year kWhAC/kWDC', 'mode'='f', 'deci'='0', 'thousep'='true' } );
metric( 'batt_system_charge_percent', {'label'='Battery charge energy from system', 'mode'='f', 'deci'='1', 'thousep'='false', 'post'='%' } );
}
Expand Down
4 changes: 2 additions & 2 deletions deploy/runtime/startup.lk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2230,12 +2230,12 @@ function setup_metidal_pages(lcoe_fcr)
}
}
setconfig( 'MEtidal', 'LCOE Calculator' );
setmodules( ['mhk_tidal', 'lcoefcr']);
setmodules( ['tidal_file_reader', 'mhk_tidal', 'lcoefcr']);
setup_metidal_pages(1);
addpage( [[ 'Financial LCOE Calc with Costs Page']], { 'sidebar'='Financial Parameters', 'help'='fin_lcoefcr'} );

setconfig( 'MEtidal', 'None' );
setmodules( ['mhk_tidal'] );
setmodules( ['tidal_file_reader', 'mhk_tidal'] );
setup_metidal_pages(0);

// Battery /////////////////////////////////////////////////////////////////////
Expand Down
Loading
Loading