From 7f680776d1b18db8a6595414df797183bc85800d Mon Sep 17 00:00:00 2001
From: imcovangent <I.vanGent@tudelft.nl>
Date: Mon, 16 Apr 2018 16:59:08 +0200
Subject: [PATCH] Updated Sellar and TUD wing design scripts to include
interactive VISTOMS.
Former-commit-id: 1f5310ff04c013fe82a5f52360115f2c7b4dc13b
---
examples/scripts/sellar_problem.py | 10 +++++++++-
examples/scripts/tu_delft_wing_design.py | 9 +++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/examples/scripts/sellar_problem.py b/examples/scripts/sellar_problem.py
index 2aec097ae..427644060 100644
--- a/examples/scripts/sellar_problem.py
+++ b/examples/scripts/sellar_problem.py
@@ -3,6 +3,7 @@ import logging
from kadmos.graph import RepositoryConnectivityGraph, FundamentalProblemGraph
+from kadmos.graph.mixin_vistoms import vistoms_start
from kadmos.utilities.general import get_mdao_setup
@@ -24,10 +25,12 @@ mdao_definitions = ['unconverged-MDA-J', # 0
'MDF-J', # 11
'IDF', # 12
'CO'] # 13
+all_graphs = []
# Settings for scripting
mdao_definitions_loop_all = True # Option for looping through all MDAO definitions
mdao_definition_id = 12 # Option for selecting a MDAO definition (in case mdao_definitions_loop_all=False)
+start_interactive_vistoms = True # Option to start an interactive VISTOMS at the end
# Settings for saving
pdf_dir = 'sellar_problem/(X)DSM'
@@ -144,7 +147,7 @@ rcg.save('RCG', file_type='cmdows', destination_folder=cmdows_dir,
version='0.1',
pretty_print=True,
integrity=True)
-
+all_graphs.append(rcg)
logging.info('Scripting initial FPG...')
@@ -239,6 +242,7 @@ for mdao_definition in mdao_definitions:
version='0.1',
pretty_print=True,
integrity=True)
+ all_graphs.append(fpg)
# Get Mdao graphs
mdg = fpg.get_mdg(name='mdg Sellar problem')
@@ -264,5 +268,9 @@ for mdao_definition in mdao_definitions:
pretty_print=True,
integrity=True,
convention=True)
+ all_graphs.append((mdg, mpg))
logging.info('Done!')
+
+if start_interactive_vistoms:
+ vistoms_start(all_graphs, file_dir='sellar_problem/VISTOMS_interactive')
diff --git a/examples/scripts/tu_delft_wing_design.py b/examples/scripts/tu_delft_wing_design.py
index 1d5676d20..b571f72a5 100644
--- a/examples/scripts/tu_delft_wing_design.py
+++ b/examples/scripts/tu_delft_wing_design.py
@@ -5,6 +5,7 @@ import logging
from kadmos.graph import load, FundamentalProblemGraph
# Settings for logging
+from kadmos.graph.mixin_vistoms import vistoms_start
from kadmos.utilities.general import get_mdao_setup
logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.DEBUG)
@@ -25,10 +26,12 @@ mdao_definitions = ['unconverged-MDA-GS', # 0
'MDF-GS', # 10
'MDF-J', # 11
'IDF'] # 12
+all_graphs = []
# Settings for scripting
mdao_definitions_loop_all = True # Option for looping through all MDAO definitions
mdao_definition_id = 12 # Option for selecting a MDAO definition (in case mdao_definitions_loop_all=False)
+start_interactive_vistoms = True # Option to start an interactive VISTOMS at the end
# Settings for creating the CMDOWS files
create_rcg_cmdows = True # Option for creating the RCG CMDOWS file, set to False to save time
@@ -108,6 +111,7 @@ if create_rcg_cmdows:
destination_folder=cmdows_dir,
pretty_print=True,
integrity=False)
+all_graphs.append(rcg)
# On to the wrapping of the MDAO architectures
# Get iterator (all or single one)
@@ -313,6 +317,7 @@ for mdao_definition in mdao_definitions:
version='0.1',
pretty_print=True,
integrity=True)
+ all_graphs.append(fpg)
# Get Mdao graphs
mdg = fpg.get_mdg(name='mpg wing design')
@@ -337,5 +342,9 @@ for mdao_definition in mdao_definitions:
version='0.1',
pretty_print=True,
integrity=True)
+ all_graphs.append((mdg, mpg))
logging.info('Done!')
+
+if start_interactive_vistoms:
+ vistoms_start(all_graphs, file_dir='ssbj/VISTOMS_mda_interactive')
--
GitLab