Skip to content
Snippets Groups Projects
Commit 64f549c0 authored by Lukas Müller's avatar Lukas Müller
Browse files

Merge remote-tracking branch 'origin/dev_vistoms' into dev_math

# Conflicts:
#	examples/scripts/sellar_problem/(X)DSM/FPG_IDF.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_MDF-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_MDF-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_converged-DOE-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_converged-DOE-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_converged-MDA-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_converged-MDA-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_unconverged-DOE-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_unconverged-DOE-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_unconverged-MDA-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/FPG_unconverged-MDA-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/MDAO_IDF.pdf
#	examples/scripts/sellar_problem/(X)DSM/MDAO_MDF-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/MDAO_MDF-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/MDAO_converged-DOE-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/MDAO_converged-DOE-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/MDAO_converged-MDA-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/MDAO_converged-MDA-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/MDAO_unconverged-DOE-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/MDAO_unconverged-DOE-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/MDAO_unconverged-MDA-GS.pdf
#	examples/scripts/sellar_problem/(X)DSM/MDAO_unconverged-MDA-J.pdf
#	examples/scripts/sellar_problem/(X)DSM/RCG.pdf
#	examples/scripts/sellar_problem/CMDOWS/FPG_IDF.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_MDF-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_MDF-J.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_converged-DOE-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_converged-DOE-J.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_converged-MDA-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_converged-MDA-J.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_unconverged-DOE-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_unconverged-DOE-J.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_unconverged-MDA-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/FPG_unconverged-MDA-J.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_IDF.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_MDF-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_MDF-J.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_converged-DOE-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_converged-DOE-J.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_converged-MDA-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_converged-MDA-J.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_unconverged-DOE-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_unconverged-DOE-J.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_unconverged-MDA-GS.xml
#	examples/scripts/sellar_problem/CMDOWS/Mdao_unconverged-MDA-J.xml
#	examples/scripts/sellar_problem/CMDOWS/RCG.xml
#	examples/scripts/sellar_problem/KDMS/FPG_IDF.kdms
#	examples/scripts/sellar_problem/KDMS/FPG_MDF-GS.kdms
#	examples/scripts/sellar_problem/KDMS/FPG_MDF-J.kdms
#	examples/scripts/sellar_problem/KDMS/FPG_converged-DOE-GS.kdms
#	examples/scripts/sellar_problem/KDMS/FPG_converged-DOE-J.kdms
#	examples/scripts/sellar_problem/KDMS/FPG_converged-MDA-GS.kdms
#	examples/scripts/sellar_problem/KDMS/FPG_converged-MDA-J.kdms
#	examples/scripts/sellar_problem/KDMS/FPG_unconverged-DOE-GS.kdms
#	examples/scripts/sellar_problem/KDMS/FPG_unconverged-DOE-J.kdms
#	examples/scripts/sellar_problem/KDMS/FPG_unconverged-MDA-GS.kdms
#	examples/scripts/sellar_problem/KDMS/FPG_unconverged-MDA-J.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_IDF.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_IDF_mpg.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_MDF-GS.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_MDF-GS_mpg.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_MDF-J.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_MDF-J_mpg.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_converged-DOE-GS.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_converged-DOE-GS_mpg.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_converged-DOE-J.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_converged-DOE-J_mpg.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_converged-MDA-GS.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_converged-MDA-GS_mpg.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_converged-MDA-J.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_converged-MDA-J_mpg.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_unconverged-DOE-GS.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_unconverged-DOE-GS_mpg.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_unconverged-DOE-J.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_unconverged-DOE-J_mpg.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_unconverged-MDA-GS.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_unconverged-MDA-GS_mpg.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_unconverged-MDA-J.kdms
#	examples/scripts/sellar_problem/KDMS/Mdao_unconverged-MDA-J_mpg.kdms
#	examples/scripts/sellar_problem/KDMS/RCG.kdms
#	examples/scripts/sellar_problem/RCE/sellar_problem_IDF.wf
#	examples/scripts/sellar_problem/RCE/sellar_problem_MDF-GS.wf
#	examples/scripts/sellar_problem/RCE/sellar_problem_MDF-J.wf
#	examples/scripts/sellar_problem/RCE/sellar_problem_converged-DOE-GS.wf
#	examples/scripts/sellar_problem/RCE/sellar_problem_converged-DOE-J.wf
#	examples/scripts/sellar_problem/RCE/sellar_problem_converged-MDA-GS.wf
#	examples/scripts/sellar_problem/RCE/sellar_problem_converged-MDA-J.wf
#	examples/scripts/sellar_problem/RCE/sellar_problem_unconverged-DOE-GS.wf
#	examples/scripts/sellar_problem/RCE/sellar_problem_unconverged-DOE-J.wf
#	examples/scripts/sellar_problem/RCE/sellar_problem_unconverged-MDA-GS.wf
#	examples/scripts/sellar_problem/RCE/sellar_problem_unconverged-MDA-J.wf
#	examples/scripts/tu_delft_wing_design/(X)DSM/FPG_unconverged-MDA-GS.pdf
#	examples/scripts/tu_delft_wing_design/(X)DSM/FPG_unconverged-MDA-J.pdf
#	examples/scripts/tu_delft_wing_design/(X)DSM/XDSM_unconverged-MDA-GS.pdf
#	examples/scripts/tu_delft_wing_design/(X)DSM/XDSM_unconverged-MDA-J.pdf
#	examples/scripts/tu_delft_wing_design/CMDOWS/FPG_unconverged-MDA-GS.xml
#	examples/scripts/tu_delft_wing_design/CMDOWS/FPG_unconverged-MDA-J.xml
#	examples/scripts/tu_delft_wing_design/CMDOWS/MDAO_unconverged-MDA-GS.xml
#	examples/scripts/tu_delft_wing_design/CMDOWS/MDAO_unconverged-MDA-J.xml
#	examples/scripts/tu_delft_wing_design/CMDOWS/RCG.xml
#	examples/scripts/tu_delft_wing_design/KDMS/FPG_unconverged-MDA-GS.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/FPG_unconverged-MDA-J.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/Mdao_unconverged-MDA-GS.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/Mdao_unconverged-MDA-GS_mpg.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/Mdao_unconverged-MDA-J.kdms
#	examples/scripts/tu_delft_wing_design/KDMS/Mdao_unconverged-MDA-J_mpg.kdms
#	kadmos/graph/graph_kadmos.py


Former-commit-id: b7044168c8fb3bd1e6547a1ce52deddb55f05c5b
parents bc983da5 79476f43
No related branches found
No related tags found
No related merge requests found
Pipeline #192687 canceled
Showing
with 21 additions and 4 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment