Skip to content
Snippets Groups Projects
  1. Mar 27, 2017
  2. Mar 24, 2017
  3. Mar 23, 2017
    • imcovangent's avatar
      Bug fixes and addition of index replacement in add_to_visualization_package() function · de382473
      imcovangent authored
      Former-commit-id: dddb361142d337d9b660f8a9e426f1d4ff580d08
      de382473
    • imcovangent's avatar
      Commit for branch change · 52353d33
      imcovangent authored
      Former-commit-id: 6c2417e013ab81bb69c1b859349051e625eb0abc
      52353d33
    • imcovangent's avatar
      Merge branch 'master' into WingDesignCaseStudy_RCEscriptingUpdate · fb3d6e05
      imcovangent authored
      # 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
    • imcovangent's avatar
      update after merge check · 05dcf608
      imcovangent authored
      Former-commit-id: 9839910e6e0978acb6edfa209623c458bad585f1
      05dcf608
    • imcovangent's avatar
      Merge branch 'master' of https://bitbucket.org/imcovangent/kadmos · 4580f7b4
      imcovangent authored
      Former-commit-id: 5dc35a4d1971b7063101f4de7ea6cb5ef78d1daa
      4580f7b4
    • imcovangent's avatar
      adjusted gitignore · 77bf899f
      imcovangent authored
      Former-commit-id: 26483c5710550a9263e9111d3b4f37d116900072
      77bf899f
    • aMakus's avatar
      push after merge · cc98d431
      aMakus authored
      Former-commit-id: c272f6778962e5c232f067a5e8983d3100ed7518
      cc98d431
    • aMakus's avatar
      Merge branch 'KB_mapping__Andreas' · 173de785
      aMakus authored
      # 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
    • aMakus's avatar
      Merge remote-tracking branch 'origin/KB_mapping__Andreas' into KB_mapping__Andreas · d19d8d7f
      aMakus authored
      # 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
    • aMakus's avatar
      pre-merge · 9723153a
      aMakus authored
      Former-commit-id: 234a7d90d16407e1d27e514e4c847ca98269fd76
      9723153a
    • imcovangent's avatar
      commit before branch change · f69cef14
      imcovangent authored
      Former-commit-id: 164e89f4e350a5c4646fd06e568aebe787b33eda
      f69cef14
    • imcovangent's avatar
      Merge branch 'master' into WingDesignCaseStudy_RCEscriptingUpdate · 9f50ed6b
      imcovangent authored
      # Conflicts:
      #	pyKADMOS/scripts/sellarProblemRCE/FPG.xml
      #	pyKADMOS/scripts/sellarProblemRCE/MPG_converged-MDA-GS.xml
      #	pyKADMOS/scripts/sellarProblemRCE/RCG.xml
      
      
      Former-commit-id: cc82faccd4a323e2782cc0255742fb4a7faa2e59
      9f50ed6b
  4. Mar 22, 2017
  5. Mar 21, 2017
  6. Mar 20, 2017
  7. Mar 19, 2017
    • imcovangent's avatar
      Update - updated wing design script to incorporate new visualisation package. · 17a5ce68
      imcovangent authored
      Former-commit-id: 48a24864e0144a3b4edeef38824406e2f2ae50e1
      17a5ce68
    • imcovangent's avatar
      Merge branch 'master' into WingDesignCaseStudy_RCEscriptingUpdate · 53c071f5
      imcovangent authored
      # Conflicts:
      #	pyKADMOS/scripts/DC1_MDA_FPG_2017-03-14--09:45:11/supportFiles/circleLayout.html
      #	pyKADMOS/scripts/DC1_MDA_FPG_2017-03-14--09:45:11/supportFiles/json/catschema_roleLev.json
      #	pyKADMOS/scripts/DC1_MDA_FPG_2017-03-14--09:45:11/supportFiles/xdsm.html
      #	pyKADMOS/scripts/DC1_MDA_FPG_2017-03-15--11:04:45/KADMOS_VisPack.html
      #	pyKADMOS/scripts/DC1_MDA_FPG_2017-03-15--11:04:45/supportFiles/circleLayout.html
      #	pyKADMOS/scripts/DC1_MDA_FPG_2017-03-15--11:04:45/supportFiles/include/AGILE_Background.png
      #	pyKADMOS/scripts/DC1_MDA_FPG_2017-03-15--11:04:45/supportFiles/include/AGILE_Icon.png
      #	pyKADMOS/scripts/DC1_MDA_FPG_2017-03-15--11:04:45/supportFiles/include/KADMOS_VisualizationPack_Logo.png
      #	pyKADMOS/scripts/DC1_MDA_FPG_2017-03-15--11:04:45/supportFiles/include/acknowledgements.html
      #	pyKADMOS/scripts/DC1_MDA_FPG_2017-03-15--11:04:45/supportFiles/json/catschema_funLev.json
      #	pyKADMOS/scripts/DC1_MDA_FPG_2017-03-15--11:04:45/supportFiles/json/serviceView.json
      #	pyKADMOS/scripts/DC1_MDA_FPG_2017-03-15--11:04:45/supportFiles/serviceView.html
      #	pyKADMOS/scripts/DC1_MDA_FPG_2017-03-15--11:04:45/supportFiles/xdsm.html
      #	pyKADMOS/scripts/DC1_MDA_FPG_2017-03-15--11:04:45/supportFiles/xdsm.js
      #	pyKADMOS/scripts/WP6_TUDWingDesign_work.py
      #	pyKADMOS/scripts/WP6_TUD_WingDesign2_FPG_vispack/supportFiles/json/xdsm.json
      #	pyKADMOS/scripts/WP6_TUD_WingDesign2_RCG_vispack/supportFiles/json/xdsm.json
      #	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_XDSM_unconverged-MDA-GS_vispack/supportFiles/json/xdsm.json
      #	pyKADMOS/scripts/WP6_TUD_WingDesign2_XDSM_unconverged-MDA-J_vispack/supportFiles/json/catschema_roleLev.json
      #	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/circleLayout.html
      #	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_funLev_01.json
      #	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_funLev_02.json
      #	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_funLev_04.json
      #	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_nodeLev_01.json
      #	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_nodeLev_04.json
      #	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_nodeLev_10.json
      #	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_roleLev_05.json
      #	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_sysLev_01.json
      #	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_sysLev_03.json
      #	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/catschema_sysLev_05.json
      #	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/circleLayout_01.json
      #	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/circleLayout_03.json
      #	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/circleLayout_06.json
      #	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/schema_01.json
      #	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/schema_02.json
      #	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/schema_10.json
      #	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/serviceView_01.json
      #	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/serviceView_02.json
      #	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/json/serviceView_03.json
      #	pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/xdsm.html
      #	pyKADMOS/scripts/script_DC1_MDA.py
      
      
      Former-commit-id: 3d9139ed0c91ebb1322e685aa8ec7704eaef7556
      53c071f5
    • imcovangent's avatar
      Updated visualisation package export to meet Benedikt’s developments · 686a890f
      imcovangent authored
      Former-commit-id: 118d94cd9447f9d9777edb0e0f28ffa0a6e199d2
      686a890f
  8. Mar 17, 2017
  9. Mar 14, 2017
    • imcovangent's avatar
      Commit be branching · 853418a1
      imcovangent authored
      Former-commit-id: 0fdeb0b1bf3ab7e2157a75b2b70192dd23c0d60f
      853418a1
    • aMakus's avatar
      demo_version · 2474daa3
      aMakus authored
      Former-commit-id: 3a7d50a97697251adcce186c6080e683f9c1c6c6
      2474daa3
  10. Mar 13, 2017
  11. Mar 10, 2017
  12. Mar 08, 2017
  13. Mar 07, 2017
Loading