-
Notifications
You must be signed in to change notification settings - Fork 10
Glue draft #94
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.
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
Merged
jaredthomas68
merged 93 commits into
NLRWindSystems:develop
from
jaredthomas68:gluedraft
Jul 17, 2025
Merged
Glue draft #94
Changes from all commits
Commits
Show all changes
93 commits
Select commit
Hold shift + click to select a range
d84e843
(prep to) liberate python 3.13 (#69)
cfrontin b3c5bd6
add glue design doc temporarily (#89)
cfrontin 693ca35
copy in input files for IEA 740 10 ROWP
jaredthomas68 4a78304
reorganize example 01 a bit
jaredthomas68 58e6b5c
wip
jaredthomas68 76f63fe
glue code working, but not with wisdem yet
jaredthomas68 4e2f28c
minor typo correction
jaredthomas68 361a82d
recursive glue mostly working
jaredthomas68 1b8bb3e
run script and input file for glue code example
jaredthomas68 51c66e0
attempt to get laten variable setting working with glue code
jaredthomas68 3f114bc
Merge branch 'main' into develop
cfrontin 712563b
remove comments
cfrontin 9628a80
Merge branch 'develop' into gluedraft
cfrontin 4f8a180
fix merge conflicts
jaredthomas68 e38be0e
Merge remote-tracking branch 'myfork/gluedraft' into gluedraft
jaredthomas68 325fb57
run black
jaredthomas68 4e96ad1
Merge branch 'develop' into gluedraft
cfrontin 12d23c9
get latent variable setting working automatically
jaredthomas68 2dcc163
get 02_onshore running
jaredthomas68 dd19ebf
fix mapping bug in glue code
jaredthomas68 d3e6fc6
get optimization working for onshore example using glue code
jaredthomas68 c9869b9
Merge remote-tracking branch 'myfork/gluedraft' into gluedraft
jaredthomas68 5493937
optimization onshore example working with gluecode prototype
jaredthomas68 45a34bb
include convergence plot
jaredthomas68 1dad700
run black
jaredthomas68 4ceaac1
remove commented connections
jaredthomas68 0f51aba
update onshore example for new glue code
jaredthomas68 2d2d2ec
update file paths
jaredthomas68 175a21b
update onshore example to use set_up_ard_model
jaredthomas68 4a1bf66
wip creating default systems for ard api
jaredthomas68 d81097e
resolve merge conflict
jaredthomas68 ad62862
move LCOE stack tests into api test directory
jaredthomas68 5fc0f88
wip api
jaredthomas68 c260431
api unit test
jaredthomas68 dc4acfa
bring clarity to pyrite test
jaredthomas68 72f2d95
working out wisdem differences
jaredthomas68 f7d85fd
wip debug wisdem
jaredthomas68 94ecd60
roll back to older ard compoent
jaredthomas68 f6d6e84
wip working on debugging LandBOSSE Ard wrapper
jaredthomas68 24d7dba
restore old landbosse comp naming
jaredthomas68 9356e60
get all tests passing
jaredthomas68 03dad17
convert LCOE stack test to new glue code
jaredthomas68 6cb2170
fixing tests with new inputs
jaredthomas68 a597150
new files to work with path restrictions
jaredthomas68 e197b4b
all tests passing again
jaredthomas68 5bbfbf7
set up offshore fixed bottom and floating w/o cable default systems
jaredthomas68 866bc84
include new default systems in unit test
jaredthomas68 d4371bc
run black
jaredthomas68 d1390e7
include default system design files
jaredthomas68 75d9961
including initial des var values in modeling options
jaredthomas68 102510c
use total capex from landbosse and bos capex in financese
jaredthomas68 5c46c86
use decorator
jaredthomas68 72157da
include input files
jaredthomas68 8e39043
run black
jaredthomas68 9185146
include input files for onshore example
jaredthomas68 bdc4350
include deprecated api
jaredthomas68 72ed9a4
working towards offshore optimization demo refactor, still not matchi…
cfrontin 7050d1e
black refactor
cfrontin ffa9f79
black reformat 2
cfrontin 7e6b80a
fixed 03_offshore
cfrontin 80cf106
cleared out offshore folder of extraneous example data, still need to…
cfrontin 6101f5b
remove old FLORIS power comparison examples, they're no longer relevant
cfrontin ea17984
debugging
jaredthomas68 7c1c527
finish merge
jaredthomas68 be5d6e1
run black
jaredthomas68 144dda7
edit .gitignore and include example 04_offshore_fixed
jaredthomas68 b024643
update offshore fixed example for glue code
jaredthomas68 9f4b8d2
swap numbering for fixed and floating examples
jaredthomas68 46271a8
run black
jaredthomas68 10c4eb9
include inputs for all examples
jaredthomas68 db57f26
include system tests for new glue code for floating and offshore fixed
jaredthomas68 06f37dc
run black
jaredthomas68 d9eefd8
include offshore fixed and floating systems defaults with cable design
jaredthomas68 c802750
include system test inputs for offshore fixed and floating tests
jaredthomas68 b071b9d
close back ticks in docstring
jaredthomas68 099c8e5
remove deprecated examples
jaredthomas68 5efe4f6
update doc strings
jaredthomas68 ce6ca4e
update doc string
jaredthomas68 4e60bc8
update doc string
jaredthomas68 e9559bb
updated the example, removed LCOE stack
cfrontin 9ee3b13
Merge branch 'gluedraft' of github.com:jaredthomas68/Ard into gluedraft
cfrontin 92fda37
black reformat
cfrontin dc4bc64
include approx totals in all default systems and remove old debug code
jaredthomas68 39daa84
Merge remote-tracking branch 'myfork/gluedraft' into gluedraft
jaredthomas68 eec3645
run black
jaredthomas68 fa4147a
Update test/unit/ard/farm_aero/test_templates.py
jaredthomas68 984a9e4
Update test/system/ard/api/test_LCOE_OFL_stack.py
jaredthomas68 9fbda7a
Update test/unit/ard/farm_aero/test_templates.py
jaredthomas68 20e00c4
remove trailing comma and comment out unused check tol
jaredthomas68 a38e76f
Merge remote-tracking branch 'myfork/gluedraft' into gluedraft
jaredthomas68 164ae37
Merge remote-tracking branch 'upstream/develop' into gluedraft
cfrontin 9c1f57c
minor changes to accomodate optiwind net version update
jaredthomas68 2ca59aa
run black
jaredthomas68 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| from .interface import set_up_ard_model, replace_key_value, set_up_system_recursive |
107 changes: 107 additions & 0 deletions
107
ard/api/default_systems/ard_system_offshore_floating.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| type: group | ||
| systems: | ||
| layout2aep: | ||
| type: group | ||
| promotes: ["*"] | ||
| approx_totals: | ||
| method: "fd" | ||
| step: 1.0E-3 | ||
| form: "central" | ||
| step_calc: "rel_avg" | ||
| systems: | ||
| layout: | ||
| type: component | ||
| module: ard.layout.gridfarm | ||
| object: GridFarmLayout | ||
| promotes: ["*"] | ||
| kwargs: | ||
| modeling_options: | ||
| aepFLORIS: | ||
| type: component | ||
| module: ard.farm_aero.floris | ||
| object: FLORISAEP | ||
| promotes: ["x_turbines", "y_turbines", "AEP_farm"] | ||
| kwargs: | ||
| modeling_options: | ||
| case_title: "offshore-floating" | ||
| data_path: | ||
| landuse: | ||
| type: component | ||
| module: ard.layout.gridfarm | ||
| object: GridFarmLanduse | ||
| promotes: ["*"] | ||
| kwargs: | ||
| modeling_options: | ||
| collection: | ||
| type: component | ||
| module: ard.collection | ||
| object: OptiwindnetCollection | ||
| promotes: ["x_turbines", "y_turbines"] | ||
| kwargs: | ||
| modeling_options: | ||
| mooring_design: | ||
| type: component | ||
| module: ard.offshore.mooring_design_constant_depth | ||
| object: ConstantDepthMooringDesign | ||
| promotes: ["x_turbines", "y_turbines", "x_anchors", "y_anchors", "phi_platform"] | ||
| kwargs: | ||
| modeling_options: | ||
| wind_query: | ||
| mooring_constraint: | ||
| type: component | ||
| module: ard.offshore.mooring_constraint | ||
| object: MooringConstraint | ||
| promotes: ["x_turbines", "y_turbines", "x_anchors", "y_anchors"] | ||
| kwargs: | ||
| modeling_options: | ||
| spacing_constraint: | ||
| type: component | ||
| module: ard.layout.spacing | ||
| object: TurbineSpacing | ||
| promotes: ["x_turbines", "y_turbines"] | ||
| kwargs: | ||
| modeling_options: | ||
| tcc: | ||
| type: component | ||
| module: ard.cost.wisdem_wrap | ||
| object: TurbineCapitalCosts | ||
| promotes: [ | ||
| "turbine_number", | ||
| "machine_rating", | ||
| "tcc_per_kW", | ||
| "offset_tcc_per_kW", | ||
| ] | ||
| orbit: | ||
| type: component | ||
| module: ard.cost.wisdem_wrap | ||
| object: ORBIT | ||
| promotes: [ | ||
| ["plant_turbine_spacing", "spacing_effective_primary"], | ||
| ["plant_row_spacing", "spacing_effective_secondary"], | ||
| # "installation_capex", | ||
| ] | ||
| kwargs: | ||
| floating: true | ||
| opex: | ||
| type: component | ||
| module: ard.cost.wisdem_wrap | ||
| object: OperatingExpenses | ||
| promotes: [ | ||
| "turbine_number", | ||
| "machine_rating", | ||
| "opex_per_kW" | ||
| ] | ||
| financese: | ||
| type: component | ||
| module: ard.cost.wisdem_wrap | ||
| object: PlantFinance | ||
| promotes: [ | ||
| "turbine_number", | ||
| "machine_rating", | ||
| "tcc_per_kW", | ||
| "offset_tcc_per_kW", | ||
| "opex_per_kW", | ||
| ] | ||
| connections: | ||
| - ["AEP_farm", "financese.plant_aep_in"] | ||
| - ["orbit.total_capex_kW", "financese.bos_per_kW"] # For offshore systems |
78 changes: 78 additions & 0 deletions
78
ard/api/default_systems/ard_system_offshore_floating_no_cable_design.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| type: group | ||
| connections: | ||
| - ["AEP_farm", "financese.plant_aep_in"] | ||
| - ["orbit.installation_capex", "financese.bos_per_kW"] | ||
| systems: | ||
| layout2aep: | ||
| type: group | ||
| promotes: ["*"] | ||
| approx_totals: | ||
| method: "fd" | ||
| step: 1.0E-3 | ||
| form: "central" | ||
| step_calc: "rel_avg" | ||
| systems: | ||
| layout: | ||
| type: component | ||
| module: ard.layout.gridfarm | ||
| object: GridFarmLayout | ||
| promotes: ["*"] | ||
| kwargs: | ||
| modeling_options: | ||
| aepFLORIS: | ||
| type: component | ||
| module: ard.farm_aero.floris | ||
| object: FLORISAEP | ||
| promotes: ["x_turbines", "y_turbines", "AEP_farm"] | ||
| kwargs: | ||
| modeling_options: | ||
| data_path: | ||
| case_title: "default" | ||
| landuse: | ||
| type: component | ||
| module: ard.layout.gridfarm | ||
| object: GridFarmLanduse | ||
| promotes: ["*"] | ||
| kwargs: | ||
| modeling_options: | ||
| orbit: | ||
| type: component | ||
| module: ard.cost.wisdem_wrap | ||
| object: ORBIT | ||
| promotes: [ | ||
| "turbine_number", | ||
| "machine_rating", | ||
| "installation_capex", | ||
| ] | ||
| kwargs: | ||
| floating: true | ||
| tcc: | ||
| type: component | ||
| module: ard.cost.wisdem_wrap | ||
| object: TurbineCapitalCosts | ||
| promotes: [ | ||
| "turbine_number", | ||
| "machine_rating", | ||
| "tcc_per_kW", | ||
| "offset_tcc_per_kW", | ||
| ] | ||
| opex: | ||
| type: component | ||
| module: ard.cost.wisdem_wrap | ||
| object: OperatingExpenses | ||
| promotes: [ | ||
| "turbine_number", | ||
| "machine_rating", | ||
| "opex_per_kW" | ||
| ] | ||
| financese: | ||
| type: component | ||
| module: ard.cost.wisdem_wrap | ||
| object: PlantFinance | ||
| promotes: [ | ||
| "turbine_number", | ||
| "machine_rating", | ||
| "tcc_per_kW", | ||
| "offset_tcc_per_kW", | ||
| "opex_per_kW", | ||
| ] | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| type: group | ||
| systems: | ||
| layout2aep: | ||
| type: group | ||
| promotes: ["*"] | ||
| approx_totals: | ||
| method: "fd" | ||
| step: 1.0E-3 | ||
| form: "central" | ||
| step_calc: "rel_avg" | ||
| systems: | ||
| layout: | ||
| type: component | ||
| module: ard.layout.gridfarm | ||
| object: GridFarmLayout | ||
| promotes: ["*"] | ||
| kwargs: | ||
| modeling_options: | ||
| aepFLORIS: | ||
| type: component | ||
| module: ard.farm_aero.floris | ||
| object: FLORISAEP | ||
| promotes: ["x_turbines", "y_turbines", "AEP_farm"] | ||
| kwargs: | ||
| modeling_options: | ||
| case_title: "Offshore-monopile" | ||
| data_path: | ||
| landuse: | ||
| type: component | ||
| module: ard.layout.gridfarm | ||
| object: GridFarmLanduse | ||
| promotes: ["*"] | ||
| kwargs: | ||
| modeling_options: | ||
| collection: | ||
| type: component | ||
| module: ard.collection | ||
| object: OptiwindnetCollection | ||
| promotes: ["x_turbines", "y_turbines"] | ||
| kwargs: | ||
| modeling_options: | ||
| spacing_constraint: | ||
| type: component | ||
| module: ard.layout.spacing | ||
| object: TurbineSpacing | ||
| promotes: ["x_turbines", "y_turbines"] | ||
| kwargs: | ||
| modeling_options: | ||
| tcc: | ||
| type: component | ||
| module: ard.cost.wisdem_wrap | ||
| object: TurbineCapitalCosts | ||
| promotes: [ | ||
| "turbine_number", | ||
| "machine_rating", | ||
| "tcc_per_kW", | ||
| "offset_tcc_per_kW", | ||
| ] | ||
| orbit: | ||
| type: component | ||
| module: ard.cost.wisdem_wrap | ||
| object: ORBIT | ||
| promotes: [ | ||
| ["plant_turbine_spacing", "spacing_effective_primary"], | ||
| ["plant_row_spacing", "spacing_effective_secondary"], | ||
| # "installation_capex", | ||
| ] | ||
| kwargs: | ||
| floating: true | ||
| opex: | ||
| type: component | ||
| module: ard.cost.wisdem_wrap | ||
| object: OperatingExpenses | ||
| promotes: [ | ||
| "turbine_number", | ||
| "machine_rating", | ||
| "opex_per_kW" | ||
| ] | ||
| financese: | ||
| type: component | ||
| module: ard.cost.wisdem_wrap | ||
| object: PlantFinance | ||
| promotes: [ | ||
| "turbine_number", | ||
| "machine_rating", | ||
| "tcc_per_kW", | ||
| "offset_tcc_per_kW", | ||
| "opex_per_kW", | ||
| ] | ||
| connections: | ||
| - ["AEP_farm", "financese.plant_aep_in"] | ||
| - ["orbit.total_capex_kW", "financese.bos_per_kW"] |
77 changes: 77 additions & 0 deletions
77
ard/api/default_systems/ard_system_offshore_monopile_no_cable_design.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| type: group | ||
| connections: | ||
| - ["AEP_farm", "financese.plant_aep_in"] | ||
| - ["orbit.total_capex_kW", "financese.bos_per_kW"] # For offshore systems | ||
| systems: | ||
| layout2aep: | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Approximate semitotals?
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Done |
||
| type: group | ||
| promotes: ["*"] | ||
| approx_totals: | ||
| method: "fd" | ||
| step: 1.0E-3 | ||
| form: "central" | ||
| step_calc: "rel_avg" | ||
| systems: | ||
| layout: | ||
| type: component | ||
| module: ard.layout.gridfarm | ||
| object: GridFarmLayout | ||
| promotes: ["*"] | ||
| kwargs: | ||
| modeling_options: | ||
| aepFLORIS: | ||
| type: component | ||
| module: ard.farm_aero.floris | ||
| object: FLORISAEP | ||
| promotes: ["x_turbines", "y_turbines", "AEP_farm"] | ||
| kwargs: | ||
| modeling_options: | ||
| case_title: "default" | ||
| landuse: | ||
| type: component | ||
| module: ard.layout.gridfarm | ||
| object: GridFarmLanduse | ||
| promotes: ["*"] | ||
| kwargs: | ||
| modeling_options: | ||
| orbit: | ||
| type: component | ||
| module: ard.cost.wisdem_wrap | ||
| object: ORBIT | ||
| promotes: [ | ||
| ["plant_turbine_spacing", "spacing_effective_primary"], | ||
| ["plant_row_spacing", "spacing_effective_secondary"], | ||
| # "installation_capex", | ||
| ] | ||
| kwargs: | ||
| floating: false | ||
| tcc: | ||
| type: component | ||
| module: ard.cost.wisdem_wrap | ||
| object: TurbineCapitalCosts | ||
| promotes: [ | ||
| "turbine_number", | ||
| "machine_rating", | ||
| "tcc_per_kW", | ||
| "offset_tcc_per_kW", | ||
| ] | ||
| opex: | ||
| type: component | ||
| module: ard.cost.wisdem_wrap | ||
| object: OperatingExpenses | ||
| promotes: [ | ||
| "turbine_number", | ||
| "machine_rating", | ||
| "opex_per_kW" | ||
| ] | ||
| financese: | ||
| type: component | ||
| module: ard.cost.wisdem_wrap | ||
| object: PlantFinance | ||
| promotes: [ | ||
| "turbine_number", | ||
| "machine_rating", | ||
| "tcc_per_kW", | ||
| "offset_tcc_per_kW", | ||
| "opex_per_kW", | ||
| ] | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.