Skip to content
Snippets Groups Projects
Commit fb3d6e05 authored by imcovangent's avatar imcovangent
Browse files

Merge branch 'master' into WingDesignCaseStudy_RCEscriptingUpdate

# Conflicts:
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_XDSM_pdfs/XDSM_converged-MDA_Gauss-Seidel.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_XDSM_pdfs/XDSM_converged-MDA_Jacobi.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_XDSM_pdfs/XDSM_unconverged-DOE_Gauss-Seidel.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_XDSM_pdfs/XDSM_unconverged-MDA_Gauss-Seidel.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_XDSM_pdfs/XDSM_unconverged-MDA_Jacobi.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_funLev_03.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_funLev_04.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_funLev_05.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_funLev_06.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_funLev_07.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_funLev_08.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_funLev_09.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_nodeLev_03.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_nodeLev_04.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_nodeLev_05.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_nodeLev_06.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_nodeLev_07.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_nodeLev_08.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_nodeLev_09.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_roleLev_07.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_roleLev_09.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_sysLev_03.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_sysLev_04.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_sysLev_05.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_sysLev_06.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_sysLev_07.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_sysLev_08.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_sysLev_09.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/circleLayout_03.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/circleLayout_04.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/circleLayout_05.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/circleLayout_06.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/circleLayout_07.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/circleLayout_08.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/circleLayout_09.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/graphs.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/schema_03.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/schema_04.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/schema_05.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/schema_06.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/schema_07.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/schema_08.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/schema_09.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/serviceView_03.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/serviceView_04.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/serviceView_05.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/serviceView_06.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/serviceView_07.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/serviceView_08.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/serviceView_09.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/xdsm_03.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/xdsm_04.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/xdsm_05.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/xdsm_06.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/xdsm_07.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/xdsm_08.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/xdsm_09.json


Former-commit-id: facf1c738cbb099e3775626a1f1e5cd60340d8d1
parents f69cef14 05dcf608
No related branches found
Tags v0.8.0
No related merge requests found
Pipeline #192573 canceled
Showing
with 6027 additions and 876 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