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.

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

Eval funcs docs #240

Merged
merged 49 commits into from
Jul 24, 2023
Merged
Show file tree
Hide file tree
Changes from 38 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
20bf716
starting page on evalFuncs
gawng Apr 22, 2022
8984178
put eval funcs in yaml
gawng Jul 21, 2022
803d230
progress on evalfuncs
gawng Aug 5, 2022
7e19b85
updated eval funcs
gawng Aug 5, 2022
498c146
update cavitation
gawng Aug 5, 2022
5e2fe5c
Merge branch 'main' into evalFuncs-docs
sseraj Aug 7, 2022
08bb91a
fixed rootSetOption docstring
sseraj Aug 7, 2022
7d6ab19
added custom directive for cost functions list
sseraj Aug 7, 2022
a239a05
added more cost func docs
gawng Aug 8, 2022
8f398bc
fixed minor code comment typo in F90 file, progress on evalfuncs
gawng Nov 11, 2022
365feca
Merge branch 'main' into evalFuncs-docs
gawng Nov 11, 2022
e1c2990
more functions documented and another typo in fortran layer corrected
gawng Nov 11, 2022
940b89a
add cavitation docs based what anil said in his PR
Nov 20, 2022
ab73d00
Merge branch 'main' into evalFuncs-docs
gawng Nov 21, 2022
c7263f5
Merge branch 'main' into evalFuncs-docs
gawng Dec 12, 2022
50efd96
cost function definition
ArshSaja Dec 27, 2022
48bc452
Merge branch 'main' into evalFuncs-docs
sseraj Dec 28, 2022
f3b79cd
separation cost function definition
ArshSaja Dec 28, 2022
1d4634d
adding buffet citation
ArshSaja Jan 9, 2023
d5f2a2c
updated files in adjoint
ArshSaja Jan 9, 2023
1271e83
fix merge conflicts
Feb 20, 2023
cac3d55
updating tapenade files
ArshSaja Feb 20, 2023
b6b68f8
minor fix
ArshSaja Feb 20, 2023
5dc765a
minor fix abd black style fix
ArshSaja Feb 20, 2023
40149ab
Merge branch 'main' into evalFuncs-docs
eirikurj Feb 21, 2023
7c155f0
Merge branch 'main' into evalFuncs-docs
sseraj Mar 6, 2023
63e2417
Merge branch 'main' into evalFuncs-docs
gawng Mar 17, 2023
836dd0f
addressing comments and adding the new cost functions
ArshSaja Mar 17, 2023
118c522
minor edit
ArshSaja Mar 17, 2023
8edd323
Merge branch 'main' into evalFuncs-docs
gawng Apr 11, 2023
51cbc88
Merge branch 'mdolab:main' into evalFuncs-docs
gawng May 1, 2023
05e58d8
some updates to docs
gawng May 1, 2023
7c0cea4
missed accent mark
gawng May 1, 2023
a9d5ec8
Adding pressure force description
lamkina May 16, 2023
eb732f1
build error with sphinx
gawng May 22, 2023
96a30f7
change flow power desc
gawng May 22, 2023
0092327
Merge branch 'main' into evalFuncs-docs
gawng May 23, 2023
881949b
Merge branch 'main' into evalFuncs-docs
gawng May 24, 2023
40fd2ca
updated some docstrings
gawng May 24, 2023
9530e00
Merge branch 'main' into evalFuncs-docs
gawng May 24, 2023
883ca5f
some more rendering clean up
gawng May 24, 2023
e24db90
Merge branch 'main' into evalFuncs-docs
gawng Jul 7, 2023
62fb407
Merge branch 'main' into evalFuncs-docs
gawng Jul 10, 2023
cab9ffd
changes to cost functions docs
anilyil Jul 14, 2023
3e281bd
Merge branch 'main' into evalFuncs-docs
sseraj Jul 14, 2023
36ea5ea
minor edits
sseraj Jul 14, 2023
40b68b7
added descriptions for stability derivatives
sseraj Jul 14, 2023
a0539ca
minor fixes
anilyil Jul 24, 2023
1d12ad7
Merge remote-tracking branch 'mdolab/main' into evalFuncs-docs
anilyil Jul 24, 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 .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ src/adjoint/temp*
*.mod
doc/_build/*
doc/_static/doxydoc/*
doc/tmp.rst
doc/tmp*.rst
*.fmt
*.bak
src/build/adflow_project.dep
Expand Down
2 changes: 1 addition & 1 deletion adflow/pyADflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -5971,7 +5971,7 @@ def _getObjectivesAndDVs(self):
for key in iDV:
iDV[key] = iDV[key] - 1

# Extra DVs for the Boundary condition variables
# Extra DVs for the boundary condition variables
BCDV = ["pressure", "pressurestagnation", "temperaturestagnation", "thrust", "heat"]

# This is ADflow's internal mapping for cost functions
Expand Down
76 changes: 51 additions & 25 deletions doc/citations.bib
Original file line number Diff line number Diff line change
@@ -1,32 +1,58 @@
@incollection{Coder2017a,
author = {Coder, James G. and Pulliam, Thomas H. and Hue, David and Kenway, Gaetan K. W. and Sclafani, Anthony J.},
booktitle = {AIAA SciTech Forum},
doi = {10.2514/6.2017-0960},
month = {January},
publisher = {American Institute of Aeronautics and Astronautics},
title = {Contributions to the 6th {AIAA} {CFD} {Drag Prediction Workshop} Using Structured Grid Methods},
year = {2017}
author = {Coder, James G. and Pulliam, Thomas H. and Hue, David and Kenway, Gaetan K. W. and Sclafani, Anthony J.},
booktitle = {AIAA SciTech Forum},
doi = {10.2514/6.2017-0960},
month = {January},
publisher = {American Institute of Aeronautics and Astronautics},
title = {Contributions to the 6th {AIAA} {CFD} {Drag Prediction Workshop} Using Structured Grid Methods},
year = {2017}
}

@article{Garg2017a,
author = {Nitin Garg and Gaetan K. W. Kenway and Joaquim R. R. A. Martins and Yin Lu Young},
doi = {10.1016/j.jfluidstructs.2017.02.001},
journal = {Journal of Fluids and Structures},
month = {May},
pages = {15--39},
title = {High-fidelity Multipoint Hydrostructural Optimization of a {3-D} Hydrofoil},
volume = {71},
year = {2017}
author = {Nitin Garg and Gaetan K. W. Kenway and Joaquim R. R. A. Martins and Yin Lu Young},
doi = {10.1016/j.jfluidstructs.2017.02.001},
journal = {Journal of Fluids and Structures},
month = {May},
pages = {15--39},
title = {High-fidelity Multipoint Hydrostructural Optimization of a {3-D} Hydrofoil},
volume = {71},
year = {2017}
}

@article{Madsen2019a,
author = {Mads H. Aa. Madsen and Frederik Zahle and Niels N. S{\o}rensen and Joaquim R. R. A. Martins},
doi = {10.5194/wes-4-163-2019},
journal = {Wind Energy Science},
keywords = {ank},
month = {April},
pages = {163--192},
title = {Multipoint high-fidelity {CFD}-based aerodynamic shape optimization of a 10 {MW} wind turbine},
volume = {4},
year = {2019}
}
author = {Mads H. Aa. Madsen and Frederik Zahle and Niels N. S{\o}rensen and Joaquim R. R. A. Martins},
doi = {10.5194/wes-4-163-2019},
journal = {Wind Energy Science},
keywords = {ank},
month = {April},
pages = {163--192},
title = {Multipoint high-fidelity {CFD}-based aerodynamic shape optimization of a 10 {MW} wind turbine},
volume = {4},
year = {2019}
}

@article{Liao2021a,
author = {Yingqian Liao and Joaquim R. R. A. Martins and Yin Lu Young},
title = {3-{D} High-Fidelity Hydrostructural Optimization of Cavitation-Free Composite Lifting Surfaces},
doi = {10.1016/j.compstruct.2021.113937},
journal = {Composite Structures},
month = {July},
pages = {113937},
volume = {268},
year = {2021}
}

@article{Kenway2017b,
author = {Gaetan K. W. Kenway and Joaquim R. R. A. Martins},
title = {Buffet-Onset Constraint Formulation for Aerodynamic Shape Optimization},
doi = {10.2514/1.J055172},
journal = {AIAA Journal},
keywords = {xsede},
month = {June},
number = {6},
pages = {1930--1947},
volume = {55},
year = {2017}
}
}

12 changes: 6 additions & 6 deletions doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
import sys

sys.path.insert(0, os.path.abspath("../"))
sys.path.insert(0, os.path.abspath("./")) # to import custom Sphinx extension

from ext.costfunctionslist import TEMP_FILE

# build doxygen
read_the_docs_build = os.environ.get("READTHEDOCS", None) == "True"
Expand All @@ -23,16 +26,13 @@
# Built-in Sphinx extensions are already contained in the imported variable
# here we add external extensions, which must also be added to requirements.txt
# so that RTD can import and use them
extensions.extend(["numpydoc"])
extensions.extend(["numpydoc", "ext.costfunctionslist"])

# mock import for autodoc
autodoc_mock_imports = ["numpy", "mpi4py", "baseclasses"]

# bibtex sources
bibtex_bibfiles.extend(["citations.bib"])

# intersphinx
intersphinx_mapping = {
"mach-aero": ("https://mdolab-mach-aero.readthedocs-hosted.com/en/latest", None),
ewu63 marked this conversation as resolved.
Show resolved Hide resolved
"pygeo": ("https://mdolab-pygeo.readthedocs-hosted.com/en/latest", None),
}
# Ignore the temp file from the cost functions list extension
exclude_patterns.extend([TEMP_FILE])
21 changes: 21 additions & 0 deletions doc/costFunctions.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
.. _adflow_costFunctions:

Cost Functions
==============

ADflow works in three dimensions (x,y,z) and application of angles such as alpha and beta change the inflow angles, not the mesh itself.
So for example a high lift airfoil at 20 degrees has the same mesh as that same airfoil at 0 degrees.
Another example is a moth T-foil at a 10 degree beta (leeway) angle versus zero.

The relevant source code file for the evaluation of cost functions is ``surfaceIntegrations.F90``.
Cost functions are added to the ``adflowCostFunctions`` dictionary in ``pyADflow.py``.
The following list is in the same order as how it currently is in the source code.

.. costfunctionslist:: adflow.pyADflow.ADFLOW


References
==========

.. bibliography::
:style: unsrt
Loading