-
Notifications
You must be signed in to change notification settings - Fork 0
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
Becca scrutineering review #4
Open
rebeccamccabe
wants to merge
146
commits into
empty-for-review
Choose a base branch
from
becca-scrutineering-review
base: empty-for-review
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 145 commits
Commits
Show all changes
146 commits
Select commit
Hold shift + click to select a range
a986d48
Create README
degoeden c39dde5
Update README
KapilKhanal 70175e1
Update README
KapilKhanal 9f92898
no pwa
degoeden 5a406e7
Update README
degoeden de58005
MOOOOOOOOOOO!
degoeden 8b0725b
Create kd_ratio
oliviavitale35 0908d59
moved kd_ratio
degoeden 2d82938
disturbance coefficient integrated
degoeden e61b278
sensitivities done
degoeden 4ace172
corrected parameter comment
degoeden f678429
did i do it?
degoeden d4562a5
vgbjhnm ,
degoeden 4f289bd
I'm getting rid of this shortly
degoeden 76228f1
bjnm,
degoeden 90965ca
the model works again and doesn't take forever
degoeden b606797
soo
degoeden ab18bac
moo!
degoeden d66f56b
I started trying, but I forgot that LCOE is weird
degoeden 7102252
lcoe is still wierd
degoeden 9be7a2b
I changed LCOE, hopefully for the better
degoeden 8d55791
changed how L is defined
degoeden 87d42b1
TopelitzEngine added and folder to write out the files added
KapilKhanal efca7d1
ACA fixed
KapilKhanal 68d978e
38k seconds instead of 55k seconds using ACA
KapilKhanal e8d390f
Pareto curve
KapilKhanal c35d4c3
Pareto curve remade
KapilKhanal ddbdad4
ACA distance changed
KapilKhanal 44c4db4
new termination criteria
KapilKhanal 09a11fd
new termination criteria
KapilKhanal b9c3b0b
stuff changed ACa, greens caching
KapilKhanal 0d9ed75
stuff changed ACa, greens caching
KapilKhanal 7d2a0f5
new results
KapilKhanal 53b4f24
ready to run
degoeden a055f05
experiment results
KapilKhanal 1d74b0d
found optimal
KapilKhanal 19e25d2
uses one of the color blind colors now
degoeden acc8425
plots of layouts
degoeden 9e5309c
"pulling from cloud"
KapilKhanal 1262e3d
Update and rename domF_1.047_1_0_4__500_100_100.csv to domF_UMERC.csv
degoeden 15f1b99
renamed to avoid confusion
degoeden 456f4ec
forgot csv
degoeden 987b48f
new test layouts plotted, optimal geometry and pto on the way
degoeden e0a3a5c
all edits
degoeden da21a04
off diagonal radiation
degoeden dbe1521
"engine added"
KapilKhanal 5584fc0
updated results
KapilKhanal 72bb59f
ignore
degoeden 7d7c946
new pareto
degoeden cb49933
added comments
degoeden b093891
more comments
degoeden 7d749d1
code is caught up with array_modeling repo
degoeden 5b9f218
changed structure some
degoeden 1298919
realized I messed up the imports with my file rearangment
degoeden bd0b8c8
fixed imports in plotting code
degoeden 1d7793f
added Mathieu's fix that allows us to still use Kapil's fancy engine
degoeden af5601e
added the sea-lab-utils
degoeden e0efed8
the color blind can see our plots now
degoeden 9cef755
edited ignore
degoeden 87b28c6
removed .DS_Store thing
degoeden c32800b
Create LICENSE
degoeden e322325
no more __pycache__
degoeden 99fa20c
for some reason it wasn't working but now it is
degoeden d291c27
removed wavebot from available wecs so you don't need wecopttool to use
degoeden bd2fd93
added package requirements
degoeden cc57034
guard rails are on
degoeden 8d7ec41
ready to opt
degoeden 4e5320d
"sensitivities" for parameters
KapilKhanal ff4387a
Optimized
degoeden 66dc657
new designs aren't quite what I expected, saved as files with Feb24 d…
degoeden 8b2691b
note for econ sensitivities
oliviavitale35 a1e713b
big econ update
oliviavitale35 3e9aab4
updated econ mod to not factor out power, integrated with other mods,…
oliviavitale35 3a292df
sensitivity foor nomial setup. replace with optimal
KapilKhanal 13728be
update interest rate
oliviavitale35 15977e5
added econ parameters to sensitivity module
oliviavitale35 4fe82e2
added econ parameters to sensitivity module
oliviavitale35 201eb48
New pareto, tighter tol, not new econ though
degoeden 72819d7
code for new pareto
degoeden 66424b0
removed N as parameter
degoeden 4eacd43
needed to handle taking away N from the moo scripts as well
degoeden 95087f3
new results
degoeden a3d8052
new pareto with tighter tol and new econ
degoeden 6469f3f
parameters added for econ. now just need to update
KapilKhanal 3f208a8
Nate what is that len(p)>7 stuff?
KapilKhanal 1898367
added proper econ terms and values to sensitivity.py
oliviavitale35 05e465e
removed repeat data
degoeden a8b461d
'new' pareto
degoeden 81cbe46
new sensitivity
KapilKhanal 428facc
demo
KapilKhanal 53bd926
sensitivities
degoeden da687ea
sensitivity for n=100 pushed
KapilKhanal f378a46
Mesh convergence code added
KapilKhanal 516f427
preped for new seed number
degoeden 4a9f572
seed2 pareto front
degoeden 13a14d4
create q-factor post_process file
oliviavitale35 1f20b12
edited qfactor.py so that it plots all q factors along the pareto front
oliviavitale35 c5d40c4
ready for new optimization with help
degoeden b54c62c
"convergence code refined"
KapilKhanal 04e713e
need mesh convergence
degoeden 09966ea
deleted lots of useless csvs
degoeden c08c070
more mesh convergence for sample designs
KapilKhanal 74970af
convergence mesh 750 panels
KapilKhanal d76f04b
good meshes
degoeden 3fe0a38
results with new meshing
degoeden 34c90a6
ready to run final optimization
degoeden 72562a3
"new function for sensitivity and sampling"
KapilKhanal 08ae536
new pareto
degoeden 718057d
pull updates
KapilKhanal 09b0e0c
condition number is now optional, set check_conditon = Flase to skip …
degoeden fafccde
pushing sensitivity after convergencee
KapilKhanal a547198
qfactor data created for easy plotting
KapilKhanal 7f263a5
yaml thing
degoeden 558c3fe
yaml thing doesnt work for me
degoeden 4ae2dca
parallel implementation to speed up sensitivity
KapilKhanal 8300c1a
nominal run matches Balitsky Thesis again
degoeden 23d88f2
updated soo stuff
degoeden d99963e
experiments done
degoeden eb48628
experiment plots
degoeden 185f478
pdf pareto
degoeden 4857336
getting rid of some files
degoeden ffbd59a
trying to ignore the __init__ stuff
degoeden 702d328
now ignoring the __init__ stuff
degoeden 01d7bf8
Delete src/__init__.py
degoeden 1b08751
Delete src/modules/__init__.py
degoeden 0b59fdf
balitsky is now a pdf
degoeden 5add90b
new rand fig
degoeden 98b49c0
bigger font size for the nominal layouts
degoeden 66c020b
updated plotting for kd
oliviavitale35 f3fa074
nominal layout plots, now bold
degoeden 41c07b4
kd fields
degoeden 6fbbf32
min lcoe and space design plots
degoeden d8d2089
plot
KapilKhanal 29db5cc
better plots
degoeden 741681c
before scrutineering updattes.
KapilKhanal 3e33baf
regression and sensitivity code updated.
KapilKhanal 6f853a1
changed thee regression to only reegrress optimal lcoe with distance.
KapilKhanal 1c50e20
altered q-factor code to change the hydro coeffs and damping for the …
oliviavitale35 894238c
Update README
KapilKhanal 1e8abf5
Update and rename README to README.md
KapilKhanal bb62e7a
Update and rename README.md to README
KapilKhanal 83cfaef
Update README
KapilKhanal 8c2a059
nominal run is good again
degoeden 491208b
renamed the file that was causing Becca issues, needs a real name tho…
degoeden 591475e
update all files to match main for review, since the rebase didnt ful…
rebeccamccabe 6eedbe8
delete file that has been deleted on main, to fix rebase
rebeccamccabe 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 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,30 @@ | ||
*.pyc | ||
.vscode/* | ||
.DS_Store | ||
src/modules/__pycache__/* | ||
data/mesh_convergence/convergence.csv | ||
data/mesh_convergence/convergence.csv | ||
data/sensitivities/* | ||
src/__init__.py | ||
src/modules/__init__.py | ||
data/sensitivities/0 3.629951 | ||
1 0.100001 | ||
2 5.223716 | ||
3 17.742484 | ||
4 -16.034721 | ||
5 5.502716 | ||
6 14.803371 | ||
7 12.277340 | ||
8 5.836918 | ||
9 28.595590 | ||
10 0.051935 | ||
11 5.499162 | ||
Name: 232, dtype: float64_total_SI_convergece.csv | ||
data/sensitivities/first_3.6.csv | ||
data/sensitivities/first_sensitivity.csv | ||
data/sensitivities/second_3.6.csv | ||
data/sensitivities/second_sensitivity.csv | ||
data/sensitivities/total_3.6.csv | ||
data/sensitivities/total_sensitivity.csv | ||
data/sensitivities/200_first.csv | ||
src/post_pro/plots/* |
This file contains 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,3 @@ | ||
[submodule "sea-lab-utils"] | ||
path = sea-lab-utils | ||
url = https://github.com/symbiotic-engineering/sea-lab-utils.git |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains 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,53 @@ | ||
Multi-Objective Multidisciplinary Optimization of Wave Energy Converter Array Layout and Controls | ||
Authors: Kapil Khanal, Nate DeGoede, Olivia Vitale, Maha Haji, | ||
|
||
|
||
- Multidisciplinary formulation to optimize the configuration of the array of Wave energy converter is presented. | ||
- Optimal controls for each Wave energy converter within the layout. | ||
- Regression model for interpretation of the trade-off between objectives for optimal designs prompts additional analysis. | ||
- Post optimality global sensitivity analysis of a set of optimal designs reveals that the expected variance in optimal LCOE (minimized) is very sensitive to the variance in wave frequency $(\omega)$ and interest rate. | ||
|
||
|
||
|
||
PROJECT STRUCTURE | ||
|
||
├── __init__.py | ||
├─data <- All relevant data. | ||
├──── experiments <- Single objective experiments. | ||
│ ├─ grid.pdf,line.pdf,random.pdf | ||
│──── mesh_convergence <- data from mesh convergence | ||
│ ├─ convergence.csv | ||
│──── paretos <- dominant designs objective and dvs | ||
│ ├─ FinaldomDesign.csv , FinaldomObjective | ||
│──── sensitivities | ||
│ ├─ total.csv,first.csv,second.csv | ||
├── notebooks <- nominal run --not required | ||
├── src <- Main source code for MDO | ||
│ ├── modules <- Each python file is a disciplinary modules. | ||
│ ├── distances.py <- To find maximum and minimum spacing in array. | ||
│ ├── dynamics_contrrols.py <- Calculate motion and power of the WEC. | ||
│ ├── econ.py <- Calculates Capex / Opex and LCOE model. | ||
│ ├── hydro_terms.py <- Get all the hydro terms. (A,B,F,C,M) | ||
│ ├── model_nWECs.py <- Utility functions to call the multidisciplinary analysis (MDA) | ||
│ ├── wec_array_initialization.py <- Utility function to get array of bodies and their neighbors if required. | ||
│ ├── optimization_interfaces | ||
│ ├── multi_objective_opt.py <- Calls the optimizer for multi Objectives [J1,J2] | ||
│ ├── single_objective_opt.py <- Calls the optimizer for single Objective at a time. | ||
│ ├── post_pro | ||
│ ├── plots | ||
│ ├── *.pdf <- contains all the figures. | ||
│ ├── mesh_convergence.py <- Performs mesh convergence for the design | ||
│ ├── pareto_analysis.py <- Ad-hoc regression model for pareto design analysis | ||
│ ├── plot_design.py <- plots any designs | ||
│ ├── plot_pareto.py <- plots the pareto designs. | ||
│ ├── plot_qfactor.py <- plots the qfactor for pareto designs | ||
│ ├── plot_sensitivity.py <- plots the sensitivity of the design to the parameters | ||
│ ├── q.py <- Calculates thee q-factor | ||
│ ├── sensitivity.py <- Calculates the sensitivity upto second order. | ||
│ ├── wave_field.py <- plots the wave_field for optimal designs | ||
├─ requirement.txt <- All the pacakges. | ||
├─ environment.yml <- All the pacakges. | ||
|
||
|
||
|
||
Note: Run code from src folder. |
This file contains 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,3 @@ | ||
"[ 9.98266494e+00 1.11091538e-01 5.95331100e+00 4.69333468e+02 | ||
-3.29995515e+02 5.91959873e+00 4.86152564e+02 1.77256214e+02 | ||
6.12891918e+00 3.51729113e+01 1.84925492e+02 6.02316413e+00]",[0.23373015] |
Binary file not shown.
This file contains 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,3 @@ | ||
"[ 9.84347267e+00 1.00423880e-01 6.16863211e+00 2.75571473e+02 | ||
-3.57408897e+02 6.01377418e+00 -3.14856237e+02 -2.73417677e+02 | ||
6.06350830e+00 -5.42394882e+01 -2.85793040e+02 6.29323481e+00]",[0.20782667] |
Binary file not shown.
This file contains 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,3 @@ | ||
"[ 9.98351142e+00 1.01277004e-01 6.12722078e+00 4.28642363e+02 | ||
-3.98138335e+02 6.26818100e+00 -2.09242767e+02 2.68234131e+02 | ||
5.96784344e+00 -3.39767380e+02 2.09554519e+02 6.16570801e+00]",[0.22149867] |
Binary file not shown.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
make this a markdown file (.md) instead of plain text for readability. Add other information (ie funding acknowledgement) - see https://confluence.cornell.edu/display/sealab/Publishing+Code