Commits · b2e49a0149206a8304e3b117ec2343ad6d07125f · LR-FPP-MDO / KADMOS

Mar 30, 2017

Merge branch 'master' into WingDesignCaseStudy_RCEscriptingUpdate · b2e49a01

imcovangent authored 8 years ago

# Conflicts:
#	pyKADMOS/scripts/WP6_TUD_WingDesign_XDSM_pdfs/FPG.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign_XDSM_pdfs/XDSM_unconverged-DOE_Gauss-Seidel.pdf
#	pyKADMOS/scripts/WP6_TUD_WingDesign_vispack/KADMOS_VisPack.html
#	pyKADMOS/scripts/WP6_TUD_WingDesign_vispack/supportFiles/circleLayout.html
#	pyKADMOS/scripts/WP6_TUD_WingDesign_vispack/supportFiles/include/AGILE_Background.png
#	pyKADMOS/scripts/WP6_TUD_WingDesign_vispack/supportFiles/include/AGILE_Icon.png
#	pyKADMOS/scripts/WP6_TUD_WingDesign_vispack/supportFiles/include/KADMOS_VisualizationPack_Icon.png
#	pyKADMOS/scripts/WP6_TUD_WingDesign_vispack/supportFiles/include/KADMOS_VisualizationPack_Logo.png
#	pyKADMOS/scripts/WP6_TUD_WingDesign_vispack/supportFiles/include/acknowledgements.html
#	pyKADMOS/scripts/WP6_TUD_WingDesign_vispack/supportFiles/json/graphs.json
#	pyKADMOS/scripts/WP6_TUD_WingDesign_vispack/supportFiles/serviceView.html
#	pyKADMOS/scripts/WP6_TUD_WingDesign_vispack/supportFiles/xdsm.html


Former-commit-id: 630ef60ff2aec47ea5c60ff394709c483125c63d

b2e49a01

$DASTUD\sup-imcovangent's avatar$
KE-Chain workshop - debugging. · 0db7f37b
DASTUD\sup-imcovangent authored 8 years ago
```
Former-commit-id: 583a4b9d48faa68675e466bcc9c0423929ebc136
```
0db7f37b
KE-Chain workshop - bug fix in create_dsm() · 84c7dacc
imcovangent authored 8 years ago
```
Former-commit-id: 1bd56c1d57e1750d1e93d89eae85390672fc3165
```
84c7dacc
KE-Chain workshop - bug fix merge functions · 1eb23623
imcovangent authored 8 years ago
```
Former-commit-id: 13a315f67530755c2775a6cc9cc3f813203506c0
```
1eb23623
Commit before change of branch. · 77b1f094
imcovangent authored 8 years ago
```
Former-commit-id: 3d2556efb69f1b52815fbf9347ca53a4d9e078fe
```
77b1f094

Mar 28, 2017
- Debugged RCE scripting of unconverged-DOE and converged-MDA methods · 4e70859f
  imcovangent authored 8 years ago
  
  Former-commit-id: 5f8a57d988b34145f66ba51483f2285847cf55c5
  4e70859f
- Merge branch 'cmdows_dev_0.4' · 4d309e13
  Lukas Müller authored 8 years ago
  
  Former-commit-id: ff5bee4e750bd88d89acb713cbaeefea92d825cb
  4d309e13
- Adjusted save_as_cmdows and load_from_cmdows for CMDOWS version 0.4 · 2687bb66
  Lukas Müller authored 8 years ago
  
  Former-commit-id: e9c2c1f9ea37252ca3afc75382f901d73a89bcc4
  2687bb66
- Merge branch 'master' into WingDesignCaseStudy_RCEscriptingUpdate · 728b4176
  imcovangent authored 8 years ago
  
  # Conflicts: # pyKADMOS/sample/graph.py Former-commit-id: 7452d3b705d076ec1ae9d4084a432e37a6c4cdc0
  728b4176
- Cleaned up scripts repository. · b0777677
  imcovangent authored 8 years ago
  
  Former-commit-id: ed59b83c2718401743057a84cb104519040ff139
  b0777677
- Created visualization package for AGILE DC1 clusters. · d02bd942
  imcovangent authored 8 years ago
  
  Debugged multiple graph methods. Former-commit-id: 9b270b7caae7ff906b194794c1a20fb4570f28f3
  d02bd942
- Two bug fixes in the graph package: list creation in merge functions and... · 0e25b422
  imcovangent authored 8 years ago
  
  Two bug fixes in the graph package: list creation in merge functions and visualisation package without function order given (put coordinator in top left corner). Former-commit-id: da6567b3ebf0c1f57920c2e5d6a5531ed5dc180c
  0e25b422
- Merge branch 'master' of https://bitbucket.org/imcovangent/kadmos · 8224111e
  imcovangent authored 8 years ago
  
  Former-commit-id: f4d8538b3301eebee189ec6869347413be07abad
  8224111e
- KE-Chain workshop preparations · aea38552
  imcovangent authored 8 years ago
  
  Former-commit-id: d016bd4b6d26fc98ec4364c74f12980f7a7a6e5b
  aea38552
Mar 27, 2017

Bug fix save_as_cmdows function · c681ff04
Lukas Müller authored 8 years ago
```
Former-commit-id: 78e93892af9c81d4ce1c09392782db764f35f6a4
```
c681ff04
Merge branch 'master' of https://bitbucket.org/imcovangent/kadmos · 7a9ed309
Lukas Müller authored 8 years ago
```
Former-commit-id: 389f25cd41b55b247fcb178104715e11e2ff2cf4
```
7a9ed309
Bug fixed sellar problem after merge (added KB_dir_path to KnowledgeBase creation) · 41cb349f
Lukas Müller authored 8 years ago
```
Former-commit-id: 8bf794778c4c7398d21795adb9daf74021e2079a
```
41cb349f
KE-Chain integration - added Boolean output to kechain_check() method. · b6c515c2
imcovangent authored 8 years ago
```
Former-commit-id: dda6ea3079653a170c8d68797a5863048d60ae32
```
b6c515c2
Merge branch 'master' of https://bitbucket.org/imcovangent/kadmos · c598a5c7
imcovangent authored 8 years ago
```
Former-commit-id: 109b8870820084cceef8db64513919eb9621196a
```
c598a5c7
KE-chain integration - added kechain_check() for FPG. · 6e66b9b6
imcovangent authored 8 years ago
```
Former-commit-id: faba17f92f1d8c15edf34a7ccc1f36669701bae3
```
6e66b9b6

Merge branch 'cmdows_dev_lukas' · dcf197ad

Lukas Müller authored 8 years ago

# Conflicts:
#	pyKADMOS/sample/graph.py
#	pyKADMOS/scripts/sellarProblemRCE/FPG_converged-MDA-J.xml
#	pyKADMOS/scripts/sellarProblemRCE/MDAO_IDF.xml
#	pyKADMOS/scripts/sellarProblemRCE/MDAO_MDF-GS.xml
#	pyKADMOS/scripts/sellarProblemRCE/MDAO_MDF-J.xml
#	pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-DOE-GS.xml
#	pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-DOE-J.xml
#	pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-MDA-GS.xml
#	pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-MDA-J.xml
#	pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-DOE-GS.xml
#	pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-DOE-J.xml
#	pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-MDA-GS.xml
#	pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-MDA-J.xml
#	pyKADMOS/scripts/sellarProblemRCE/RCG.xml


Former-commit-id: 16ebdb30a8237353a80b9fbde34f57c404a90310

dcf197ad

RCE scripting - update - testing of current possible architectures for wing design case · 1beccaaa
imcovangent authored 8 years ago
```
Former-commit-id: ebee4ab99da573f4b0ef21d0c30a4d4612be0e3a
```
1beccaaa
Added the PyCharms .idea folders to .gitignore again · 6a7c1753
Lukas Müller authored 8 years ago
```
Former-commit-id: 842532aceaecb956f8f569bb26b197addd005f84
```
6a7c1753

Mar 25, 2017
- Cleaned up save_as_cmdows and load_from_cmdows code slightly · 7f10c92a
  Lukas Müller authored 8 years ago
  
  Former-commit-id: ccf218dab24d46f6ca9fa479043c6000b75fef95
  7f10c92a
Mar 24, 2017
- Added "architectureElements/executableBlocks/...Analyses/..." to save_as_cmdows · afd962eb
  Lukas Müller authored 8 years ago
  
  Former-commit-id: b3eb2d43880a17d75db69c44162fec9b657e1abf
  afd962eb
- RCE scripting - update - debugged DOE strategy and tested on wing design case · 94fb1c0e
  imcovangent authored 8 years ago
  
  Former-commit-id: 4f7cd82f9bd0aec428a0547c02bb5b3f8d465e8b
  94fb1c0e
- Resolved issues with the CMDOWS schema file. Now save_as_cmdows is fully... · 5b09494c
  Lukas Müller authored 8 years ago
  
  Resolved issues with the CMDOWS schema file. Now save_as_cmdows is fully working and inline with the CMDWOS defintion. Moreover load_as_cmdows works for RCGs and FPGs Former-commit-id: ae1eb771c00445e8336692486fd02fba0adeb956
  5b09494c
- commit before merge · 8e6f6784
  imcovangent authored 8 years ago
  
  Former-commit-id: 60b99ae8a9bb8752a414f1a6ec5b71a80ad78588
  8e6f6784
Mar 23, 2017

Improved save_as_cmdows and cmdows_integretiy_check functions. Still issues... · c9fb4b86

Lukas Müller authored 8 years ago

Improved save_as_cmdows and cmdows_integretiy_check functions. Still issues with saving the MDG/MPG graphs for IDF and MDF (therefore no merge to master yet).


Former-commit-id: 69b5f55ef687c6cfad2da773fda7f9a6078ba9a0

c9fb4b86

Bug fixes and addition of index replacement in add_to_visualization_package() function · de382473
imcovangent authored 8 years ago
```
Former-commit-id: dddb361142d337d9b660f8a9e426f1d4ff580d08
```
de382473
Commit for branch change · 52353d33
imcovangent authored 8 years ago
```
Former-commit-id: 6c2417e013ab81bb69c1b859349051e625eb0abc
```
52353d33

Merge branch 'master' into WingDesignCaseStudy_RCEscriptingUpdate · fb3d6e05

imcovangent authored 8 years ago

# 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

fb3d6e05

update after merge check · 05dcf608
imcovangent authored 8 years ago
```
Former-commit-id: 9839910e6e0978acb6edfa209623c458bad585f1
```
05dcf608
Merge branch 'master' of https://bitbucket.org/imcovangent/kadmos · 4580f7b4
imcovangent authored 8 years ago
```
Former-commit-id: 5dc35a4d1971b7063101f4de7ea6cb5ef78d1daa
```
4580f7b4
adjusted gitignore · 77bf899f
imcovangent authored 8 years ago
```
Former-commit-id: 26483c5710550a9263e9111d3b4f37d116900072
```
77bf899f
push after merge · cc98d431
aMakus authored 8 years ago
```
Former-commit-id: c272f6778962e5c232f067a5e8983d3100ed7518
```
cc98d431

Merge branch 'KB_mapping__Andreas' · 173de785

aMakus authored 8 years ago

# Conflicts:
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/CNSTRNT-input.xml
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/EMWET-input.xml
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/GACA-info.json
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/GACA-input.xml
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/GACA-output.xml
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/HANGAR-output.xml
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/MTOW-input.xml
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/MTOW-output.xml
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/OBJ-input.xml
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/Q3D-input.xml
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/Q3D-output.xml
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/SCAM-input.xml
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/SCAM-output.xml
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/SMFA-input.xml
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/SMFA-output.xml
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/TUDWingDesign-base.xml
#	pyKADMOS/KNOWLEDGE_BASE/KB_WP6_TUDWingDesign/add_uids.py
#	pyKADMOS/sample/XMLutilities.py
#	pyKADMOS/sample/graph.py
#	pyKADMOS/sample/initiation.py
#	pyKADMOS/scripts/AGILE_EY01_DEMO.py
#	pyKADMOS/scripts/Andreas_development_scripts/KB_init_test.py
#	pyKADMOS/scripts/Andreas_development_scripts/performance_test_iter_product_2.py
#	pyKADMOS/scripts/exampleGraphsD3js.py


Former-commit-id: cc1ab8cc0417dc9edebfae6b74e745bfdf5a4992

173de785

Merge remote-tracking branch 'origin/KB_mapping__Andreas' into KB_mapping__Andreas · d19d8d7f

aMakus authored 8 years ago

# Conflicts:
#	pyKADMOS/sample/initiation.py
#	pyKADMOS/scripts/Andreas_development_scripts/KB_init_test.py
#	pyKADMOS/scripts/Andreas_development_scripts/KB_mapping_test.py


Former-commit-id: d6351fe96356376f8c28058eb3aa34d7873482a8

d19d8d7f

pre-merge · 9723153a

aMakus authored 8 years ago

Former-commit-id: 234a7d90d16407e1d27e514e4c847ca98269fd76

9723153a

commit before branch change · f69cef14
imcovangent authored 8 years ago
```
Former-commit-id: 164e89f4e350a5c4646fd06e568aebe787b33eda
```
f69cef14