diff --git a/pyKADMOS/sample/graph.py b/pyKADMOS/sample/graph.py index c08650ff4aa6fc072112cef33751ee1adb0b1607..863c9d21f559240304d48f5d8139f62572201215 100644 --- a/pyKADMOS/sample/graph.py +++ b/pyKADMOS/sample/graph.py @@ -9,7 +9,6 @@ import sys import itertools import filecmp import time -import ast import copy import shutil @@ -38,7 +37,7 @@ from pyKADMOS.sample.rce import RceWorkflow from pyKADMOS.sample.utilities import transform_data_into_strings, transform_string_into_format, extend_list_uniquely,\ export_as_json, move_and_open, make_camel_case, unmake_camel_case, get_list_entries, open_file, Child, ChildGroup,\ recursively_empty, format_string_for_d3js, get_unique_friendly_id, ChildSequence, remove_if_exists,\ - recursively_stringify + recursively_stringify, make_plural from pyKADMOS.sample.utilities import color_list, test_attr_cond, hex_to_rgb from pyKADMOS.sample import prompt_utilities as PRO @@ -3024,7 +3023,7 @@ class KadmosGraph(nx.DiGraph): if isinstance(graph, FundamentalProblemGraph) or isinstance(graph, MdaoDataGraph): if not graph.check(): if kadmos_check_critical: - raise AssertionError('The graph is not valid according to KADMOS.') + raise IOError('The graph is not valid according to KADMOS.') else: warnings.warn('The graph is not valid according to KADMOS.' 'The validity of the CMDOWS output is not guaranteed.', Warning) @@ -3156,7 +3155,7 @@ class KadmosGraph(nx.DiGraph): Child(cmdows_problem_role, 'parameterUID', graph_problem_role) for cmdows_problem_role_attr in cmdows_parameterDef[1]: if cmdows_problem_role_attr == 'samples': - # TODO: Make more feneric for all lists + # TODO: Make more generic for all lists # Create e.g. problemDefinition/problemRoles/parameters/designVariables/designVariable/samples cmdows_samples = Child(cmdows_problem_role, 'samples') if graph.node[graph_problem_role].get(cmdows_problem_role_attr) is not None: @@ -3224,7 +3223,7 @@ class KadmosGraph(nx.DiGraph): # Create architectureElements/parameters/... for architecture_roles_var in graph.ARCHITECTURE_ROLES_VARS: cmdows_parameter = Child(cmdows_parameters, - make_camel_case(architecture_roles_var, make_plural=True)) + make_camel_case(architecture_roles_var, make_plural_option=True)) graph_parameter_nodes = graph.find_all_nodes(attr_cond=['architecture_role', '==', architecture_roles_var]) for graph_parameter_node in graph_parameter_nodes: cmdows_parameter_node = Child(cmdows_parameter, make_camel_case(architecture_roles_var)) @@ -3262,7 +3261,7 @@ class KadmosGraph(nx.DiGraph): for architecture_roles_fun in architecture_roles_funs: nodes = graph.find_all_nodes(attr_cond=['architecture_role', '==', str(architecture_roles_fun)]) cmdows_analyses = Child(cmdows_executable_blocks, make_camel_case(architecture_roles_fun, - make_plural=True)) + make_plural_option=True)) for node in nodes: cmdows_analysis = Child(cmdows_analyses, make_camel_case(architecture_roles_fun)) Child(cmdows_analysis, 'relatedExecutableBlockUID', node) @@ -4148,7 +4147,7 @@ class KadmosGraph(nx.DiGraph): def load_from_cmdows(filename, source_folder=None, kadmos_check_critical=True): """ - Method to load a KadmosGraph object from a CMDOWS file. Right now can handle RCG and FPG. + Method to load a KadmosGraph object from a CMDOWS file. Can handle RCGs and FPGs right now. :param filename: name of the file to be opened :type filename: basestring @@ -4264,14 +4263,16 @@ def load_from_cmdows(filename, source_folder=None, kadmos_check_critical=True): else: arr = list() for cmdows_block in list(cmdows_blocks): - # TODO: Check if selection of node is unambiguous - graph.node[cmdows_block.text]['problem_role'] = role[:-5] + if graph.node.get(cmdows_block.text) == None: + # Add note if it does not exist yet + # TODO: Load architecture elements before problem definition + graph.add_node(cmdows_block.text, category='function') + graph.node[cmdows_block.text]['problem_role'] = role arr.append(cmdows_block.text) graph.graph['problem_formulation']['function_ordering'][role] = arr # Add attributes to the variable nodes - # TODO: Get array from somewhere else - variable_types = ['designVariables', 'objectiveVariables', 'constraintVariables', 'stateVariables'] + variable_types = [make_plural(role[0]) for role in graph.CMDOWS_ROLES_DEF] for variable_type in variable_types: cmdows_variables = cmdows_problem_roles.find('parameters/'+variable_type) if cmdows_variables is not None: @@ -4291,15 +4292,23 @@ def load_from_cmdows(filename, source_folder=None, kadmos_check_critical=True): cmdows_sample_data[int(cmdows_sample.get('position')) - 1] = float(cmdows_sample.text) graph.node[cmdows_parameter_uid][ graph.CMDOWS_ATTRIBUTE_DICT_INV[attribute.tag]] = cmdows_sample_data + # The following nodes and edges are only generated for MDGs if isinstance(graph, MdaoDataGraph): - # TODO: First set up architecture - #cmdows_architecture_parameters = cmdows.find('architectureElements/parameters') - #for cmdows_architecture_parameter in list(cmdows_architecture_parameters): - # for cmdows_single_architecture_parameter in list(cmdows_architecture_parameter): - # graph.node[cmdows_single_architecture_parameter.get('uID')] + for node, data in graph.nodes_iter(data=True): + print node + print data + # TODO: First set up architecture + cmdows_architecture_parameters = cmdows.find('architectureElements/parameters') + for cmdows_architecture_parameter in list(cmdows_architecture_parameters): + for cmdows_single_architecture_parameter in list(cmdows_architecture_parameter): + cmdows_uid = cmdows_single_architecture_parameter.get('uID') + graph.add_node(cmdows_block.text, + category='variable', + related_to_schema_node = cmdows_single_architecture_parameter.findtext('relatedParamterUID'), + label = cmdows_single_architecture_parameter.findtext('label')) # Create MDG edges cmdows_data_graph = cmdows.find('workflow/dataGraph') @@ -4318,10 +4327,12 @@ def load_from_cmdows(filename, source_folder=None, kadmos_check_critical=True): # print graph.node[node] # Check of graph - # TODO: Add kadmos_check_critical check - if isinstance(graph, FundamentalProblemGraph) or isinstance(graph, MdaoDataGraph): - if not graph.check(): - logger.warning('The graph created from the CMDOWS file is invalid.') + #if isinstance(graph, FundamentalProblemGraph) or isinstance(graph, MdaoDataGraph): + # if not graph.check(): + # if kadmos_check_critical: + # raise IOError('The graph created from the CMDOWS file is invalid.') + # else: + # logger.warning('The graph created from the CMDOWS file is invalid.') # Finish logger.info('CMDOWS file ' + path + ' loaded.') @@ -4348,7 +4359,7 @@ def cmdows_integrity_check(graph, MPG=None): timestamp = datetime.now() graph.save_as_cmdows('testfile1', 'test description', 'test author', '1.1', timestamp=timestamp, MPG=MPG, kadmos_check_critical=False, pretty_print=True) - check = load_from_cmdows('testfile1') + check = load_from_cmdows('testfile1', kadmos_check_critical=False) check.save_as_cmdows('testfile2', 'test description', 'test author', '1.1', timestamp=timestamp, kadmos_check_critical=False, pretty_print=True) # First try file wise comparison if filecmp.cmp('testfile1.xml', 'testfile2.xml'): @@ -4365,6 +4376,7 @@ def cmdows_integrity_check(graph, MPG=None): result_a = True else: result_a = False + logger.info('The following elements are not loaded: '+ str([x for x in list if x not in set(checklist)])) # Check if the file adheres to the schema try: diff --git a/pyKADMOS/sample/utilities.py b/pyKADMOS/sample/utilities.py index 075eac5d064e94469aee9d4a7660f120faac1a20..1c4c0a9db69b57fd0a888a64e547b71318289787 100644 --- a/pyKADMOS/sample/utilities.py +++ b/pyKADMOS/sample/utilities.py @@ -319,7 +319,27 @@ def extend_list_uniquely(original_list, extension_list): return list(set(original_list)) -def make_camel_case(string, make_plural=False): +def make_plural(string): + """ + Function to convert a string to its plural form. + + :param string: initial string + :type string: str + :return: plural string + :rtype: str + """ + + if string[-2:] == 'is': + # e.g. 'analysis' should become 'analyses' + string = string[:-2] + 'es' + else: + # e.g. 'variable' should become 'variables' + string += 's' + + return string + + +def make_camel_case(string, make_plural_option=False): """ Function to make a string camelCase. @@ -335,13 +355,8 @@ def make_camel_case(string, make_plural=False): words = word_regex_pattern.split(string) string = "".join(w.lower() if i is 0 else w.title() for i, w in enumerate(words)) - if make_plural: - if string[-2:] == 'is': - # e.g. 'analysis' should become 'analyses' - string = string[:-2] + 'es' - else: - # e.g. 'variable' should become 'variables' - string = string + 's' + if make_plural_option: + string = make_plural(string) return string @@ -535,7 +550,7 @@ def ChildGroup(graph, attr_name, attr_value, data_list): assert isinstance(data_list, list) # Element - element = Element(make_camel_case(attr_value, make_plural=True)) + element = Element(make_camel_case(attr_value, make_plural_option=True)) # Nodes nodes = graph.find_all_nodes(attr_cond=[attr_name, '==', attr_value]) diff --git a/pyKADMOS/scripts/loadtest.py b/pyKADMOS/scripts/loadtest.py new file mode 100644 index 0000000000000000000000000000000000000000..6c5be917023304a69faa7154083cf46fb75adaa6 --- /dev/null +++ b/pyKADMOS/scripts/loadtest.py @@ -0,0 +1,9 @@ +import os +import logging +logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.DEBUG) +from pyKADMOS.sample.graph import load_from_cmdows + +source_folder = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'sellarProblemRCE') +graph = load_from_cmdows('MDAO_IDF.xml', source_folder=source_folder) + +#print graph.find_all_nodes() \ No newline at end of file diff --git a/pyKADMOS/scripts/sellarProblemRCE.py b/pyKADMOS/scripts/sellarProblemRCE.py index 7bdbe8a26135d03fcc898069b71c21c20b0ae2ff..cd9c5ee77ce2edde1704cac7b5fb4163e0f1e3b8 100644 --- a/pyKADMOS/scripts/sellarProblemRCE.py +++ b/pyKADMOS/scripts/sellarProblemRCE.py @@ -30,15 +30,15 @@ import json import os import sys import logging -#logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.DEBUG) +logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.DEBUG) from pyKADMOS.sample.graph import FundamentalProblemGraph, load_from_cmdows, cmdows_integrity_check from pyKADMOS.sample.knowledgebase import KnowledgeBase from pyKADMOS.sample.utilities import get_mdao_setup # Script settings -loop_all = True # Loop through all mdao_definition -mdao_definition_id = 7 # If not loop_all = False, select the required MDAO architecture from mdao_definitions +loop_all = False # Loop through all mdao_definition +mdao_definition_id = 10 # If not loop_all = False, select the required MDAO architecture from mdao_definitions open_pdfs = False # Automatically open PDFs of the (X)DSMs while running the script pdfs_folder = 'sellarProblemRCE' # Subfolder to store the PDF in script_rce_workflows = True # Set to True to script the RCE workflows @@ -177,7 +177,7 @@ for mdao_definition in mdao_definitions: # Save graph FPG.save_as_cmdows('FPG_'+mdao_definition, 'Test FPG file', 'Imco van Gent', '0.1', destination_folder=pdfs_folder, pretty_print=True) - cmdows_integrity_check(FPG) + #cmdows_integrity_check(FPG) # Get graphs MPG = FPG.get_mpg(name='MPG Sellar problem') @@ -191,6 +191,8 @@ for mdao_definition in mdao_definitions: MDG.plot_graph(11, color_setting='default', fig_size=fig_size, show_now=False) # Save graph + print MPG.find_all_nodes() + print MPG.node['Gc'] MDG.save_as_cmdows('MDAO_'+mdao_definition, 'Test MDAO file', 'Imco van Gent', '0.1', MPG=MPG, destination_folder=pdfs_folder, pretty_print=True) #cmdows_integrity_check(MDG, MPG=MPG) diff --git a/pyKADMOS/scripts/sellarProblemRCE/FPG.pdf b/pyKADMOS/scripts/sellarProblemRCE/FPG.pdf index 53c4f2fb45e0ecc5a4202fe91a4a30873f46630e..e7b2d3a99f8ac0f9d914e3a0346520b194412f52 100644 Binary files a/pyKADMOS/scripts/sellarProblemRCE/FPG.pdf and b/pyKADMOS/scripts/sellarProblemRCE/FPG.pdf differ diff --git a/pyKADMOS/scripts/sellarProblemRCE/FPG_IDF.xml b/pyKADMOS/scripts/sellarProblemRCE/FPG_IDF.xml index 9042bedc37b1de324f0d7515e0931cb72cb90dc2..e57834c668b11ab5a30ee17187b3bc27b895a878 100644 --- a/pyKADMOS/scripts/sellarProblemRCE/FPG_IDF.xml +++ b/pyKADMOS/scripts/sellarProblemRCE/FPG_IDF.xml @@ -3,14 +3,14 @@ <header> <creator>Imco van Gent</creator> <description>Test FPG file</description> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:25:41.626000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> <updates> <update> <modification>KADMOS export of a fundamental problem graph (FPG).</modification> <creator>Imco van Gent</creator> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:25:41.626000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> </update> diff --git a/pyKADMOS/scripts/sellarProblemRCE/FPG_MDF-GS.xml b/pyKADMOS/scripts/sellarProblemRCE/FPG_MDF-GS.xml index d1b85cb695e8a0e39188e3ed84d2a591204242db..e511314b522a463cb0e648737e4ce27825f51ba2 100644 --- a/pyKADMOS/scripts/sellarProblemRCE/FPG_MDF-GS.xml +++ b/pyKADMOS/scripts/sellarProblemRCE/FPG_MDF-GS.xml @@ -3,14 +3,14 @@ <header> <creator>Imco van Gent</creator> <description>Test FPG file</description> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:04:27.985000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> <updates> <update> <modification>KADMOS export of a fundamental problem graph (FPG).</modification> <creator>Imco van Gent</creator> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:04:27.985000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> </update> diff --git a/pyKADMOS/scripts/sellarProblemRCE/FPG_MDF-J.xml b/pyKADMOS/scripts/sellarProblemRCE/FPG_MDF-J.xml index c54ef22babe1e1d68fd0db41c35b65936f61f4ce..94001bd263f9f04e7bac64254b51cd8ac3143cf0 100644 --- a/pyKADMOS/scripts/sellarProblemRCE/FPG_MDF-J.xml +++ b/pyKADMOS/scripts/sellarProblemRCE/FPG_MDF-J.xml @@ -3,14 +3,14 @@ <header> <creator>Imco van Gent</creator> <description>Test FPG file</description> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:04:27.985000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> <updates> <update> <modification>KADMOS export of a fundamental problem graph (FPG).</modification> <creator>Imco van Gent</creator> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:04:27.985000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> </update> diff --git a/pyKADMOS/scripts/sellarProblemRCE/FPG_converged-DOE-GS.xml b/pyKADMOS/scripts/sellarProblemRCE/FPG_converged-DOE-GS.xml index 8505b74676c9427a3ad2e52c65d68363680dcafe..ffbf9fb77b1e8df4e047d3ad6b0321f8a77c3ed7 100644 --- a/pyKADMOS/scripts/sellarProblemRCE/FPG_converged-DOE-GS.xml +++ b/pyKADMOS/scripts/sellarProblemRCE/FPG_converged-DOE-GS.xml @@ -3,14 +3,14 @@ <header> <creator>Imco van Gent</creator> <description>Test FPG file</description> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:21:00.776000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> <updates> <update> <modification>KADMOS export of a fundamental problem graph (FPG).</modification> <creator>Imco van Gent</creator> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:21:00.776000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> </update> diff --git a/pyKADMOS/scripts/sellarProblemRCE/FPG_converged-DOE-J.xml b/pyKADMOS/scripts/sellarProblemRCE/FPG_converged-DOE-J.xml index 4bab0fb243cade3bc39c662b62fb7fa9e97502f8..9d858fb19e189cec8d13360d08b0f63628a56105 100644 --- a/pyKADMOS/scripts/sellarProblemRCE/FPG_converged-DOE-J.xml +++ b/pyKADMOS/scripts/sellarProblemRCE/FPG_converged-DOE-J.xml @@ -3,14 +3,14 @@ <header> <creator>Imco van Gent</creator> <description>Test FPG file</description> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:21:00.776000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> <updates> <update> <modification>KADMOS export of a fundamental problem graph (FPG).</modification> <creator>Imco van Gent</creator> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:21:00.776000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> </update> diff --git a/pyKADMOS/scripts/sellarProblemRCE/FPG_converged-MDA-GS.xml b/pyKADMOS/scripts/sellarProblemRCE/FPG_converged-MDA-GS.xml index 73e8ade59b377ca2510730b09d9d36c1a4e03fc4..bdc494db39945987f816163586988376cb8799e0 100644 --- a/pyKADMOS/scripts/sellarProblemRCE/FPG_converged-MDA-GS.xml +++ b/pyKADMOS/scripts/sellarProblemRCE/FPG_converged-MDA-GS.xml @@ -3,14 +3,14 @@ <header> <creator>Imco van Gent</creator> <description>Test FPG file</description> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:21:00.776000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> <updates> <update> <modification>KADMOS export of a fundamental problem graph (FPG).</modification> <creator>Imco van Gent</creator> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:21:00.776000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> </update> diff --git a/pyKADMOS/scripts/sellarProblemRCE/FPG_converged-MDA-J.xml b/pyKADMOS/scripts/sellarProblemRCE/FPG_converged-MDA-J.xml index e01ede5f662c0c3a2ac10d9d799c8297a9b384d9..0f2a0904e770a4fde4af16b5d7a687c103560235 100644 --- a/pyKADMOS/scripts/sellarProblemRCE/FPG_converged-MDA-J.xml +++ b/pyKADMOS/scripts/sellarProblemRCE/FPG_converged-MDA-J.xml @@ -3,14 +3,14 @@ <header> <creator>Imco van Gent</creator> <description>Test FPG file</description> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:21:00.776000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> <updates> <update> <modification>KADMOS export of a fundamental problem graph (FPG).</modification> <creator>Imco van Gent</creator> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:21:00.776000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> </update> diff --git a/pyKADMOS/scripts/sellarProblemRCE/FPG_unconverged-DOE-GS.xml b/pyKADMOS/scripts/sellarProblemRCE/FPG_unconverged-DOE-GS.xml index 535fd2f5894e967d7ab2132fecc1acb4043ec0f6..bac71cd12ba5ed8d4e0608a1c86fa744639cd342 100644 --- a/pyKADMOS/scripts/sellarProblemRCE/FPG_unconverged-DOE-GS.xml +++ b/pyKADMOS/scripts/sellarProblemRCE/FPG_unconverged-DOE-GS.xml @@ -3,14 +3,14 @@ <header> <creator>Imco van Gent</creator> <description>Test FPG file</description> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:21:00.776000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> <updates> <update> <modification>KADMOS export of a fundamental problem graph (FPG).</modification> <creator>Imco van Gent</creator> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:21:00.776000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> </update> diff --git a/pyKADMOS/scripts/sellarProblemRCE/FPG_unconverged-DOE-J.xml b/pyKADMOS/scripts/sellarProblemRCE/FPG_unconverged-DOE-J.xml index 1cb7cf0161093b73fd78a09b27a3c331b548c4cb..b29ea8801721028a5a93a7924b9f0e7d1205fa98 100644 --- a/pyKADMOS/scripts/sellarProblemRCE/FPG_unconverged-DOE-J.xml +++ b/pyKADMOS/scripts/sellarProblemRCE/FPG_unconverged-DOE-J.xml @@ -3,14 +3,14 @@ <header> <creator>Imco van Gent</creator> <description>Test FPG file</description> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:21:00.776000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> <updates> <update> <modification>KADMOS export of a fundamental problem graph (FPG).</modification> <creator>Imco van Gent</creator> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:21:00.776000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> </update> diff --git a/pyKADMOS/scripts/sellarProblemRCE/FPG_unconverged-MDA-GS.xml b/pyKADMOS/scripts/sellarProblemRCE/FPG_unconverged-MDA-GS.xml index b6749da332e51968790f595b5a0df8985f6d700f..fb2d35f67c5dea4c25cba74c32bc3a6f5091f741 100644 --- a/pyKADMOS/scripts/sellarProblemRCE/FPG_unconverged-MDA-GS.xml +++ b/pyKADMOS/scripts/sellarProblemRCE/FPG_unconverged-MDA-GS.xml @@ -3,14 +3,14 @@ <header> <creator>Imco van Gent</creator> <description>Test FPG file</description> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:21:00.776000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> <updates> <update> <modification>KADMOS export of a fundamental problem graph (FPG).</modification> <creator>Imco van Gent</creator> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:21:00.776000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> </update> diff --git a/pyKADMOS/scripts/sellarProblemRCE/FPG_unconverged-MDA-J.xml b/pyKADMOS/scripts/sellarProblemRCE/FPG_unconverged-MDA-J.xml index a05a4a91945c34074dcb8e8ebda66bc333e5443c..096fdf97b422421822ed16ec845afce640ea14e6 100644 --- a/pyKADMOS/scripts/sellarProblemRCE/FPG_unconverged-MDA-J.xml +++ b/pyKADMOS/scripts/sellarProblemRCE/FPG_unconverged-MDA-J.xml @@ -3,14 +3,14 @@ <header> <creator>Imco van Gent</creator> <description>Test FPG file</description> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:21:00.776000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> <updates> <update> <modification>KADMOS export of a fundamental problem graph (FPG).</modification> <creator>Imco van Gent</creator> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:21:00.776000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> </update> diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_IDF.pdf b/pyKADMOS/scripts/sellarProblemRCE/MDAO_IDF.pdf index 553bab80161173c145ab213a95da5ca851781acb..fa859ee2694a5316a71a03c5f449af03757c44da 100644 Binary files a/pyKADMOS/scripts/sellarProblemRCE/MDAO_IDF.pdf and b/pyKADMOS/scripts/sellarProblemRCE/MDAO_IDF.pdf differ diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_IDF.xml b/pyKADMOS/scripts/sellarProblemRCE/MDAO_IDF.xml index c359e15bde230dd08ae668f723c31e529502c0f7..943ef494618747eba8e9f7f1c55cd99a47a9ba84 100644 --- a/pyKADMOS/scripts/sellarProblemRCE/MDAO_IDF.xml +++ b/pyKADMOS/scripts/sellarProblemRCE/MDAO_IDF.xml @@ -3,14 +3,14 @@ <header> <creator>Imco van Gent</creator> <description>Test MDAO file</description> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:25:41.626000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> <updates> <update> <modification>KADMOS Export of a mdao data graph (MDG) graph.</modification> <creator>Imco van Gent</creator> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:25:41.626000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> </update> diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_MDF-GS.pdf b/pyKADMOS/scripts/sellarProblemRCE/MDAO_MDF-GS.pdf index 7ef9cab599a4aec1053a917dd83050fc841f46e7..99aa85a9c0770efa7f749797152226e053c5e01b 100644 Binary files a/pyKADMOS/scripts/sellarProblemRCE/MDAO_MDF-GS.pdf and b/pyKADMOS/scripts/sellarProblemRCE/MDAO_MDF-GS.pdf differ diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_MDF-GS.xml b/pyKADMOS/scripts/sellarProblemRCE/MDAO_MDF-GS.xml index 2e333f25ea1f82a1f7eb02704a2b403cc963319f..d834ccf79e977b9f5d2b8a6e401b08005baed291 100644 --- a/pyKADMOS/scripts/sellarProblemRCE/MDAO_MDF-GS.xml +++ b/pyKADMOS/scripts/sellarProblemRCE/MDAO_MDF-GS.xml @@ -3,14 +3,14 @@ <header> <creator>Imco van Gent</creator> <description>Test MDAO file</description> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:04:27.985000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> <updates> <update> <modification>KADMOS Export of a mdao data graph (MDG) graph.</modification> <creator>Imco van Gent</creator> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:04:27.985000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> </update> diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_MDF-J.pdf b/pyKADMOS/scripts/sellarProblemRCE/MDAO_MDF-J.pdf index 1aedf0305e1f17da94e868ad299464349e029863..384bb636651ef8c049ada8a44af525e2f5275634 100644 Binary files a/pyKADMOS/scripts/sellarProblemRCE/MDAO_MDF-J.pdf and b/pyKADMOS/scripts/sellarProblemRCE/MDAO_MDF-J.pdf differ diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_MDF-J.xml b/pyKADMOS/scripts/sellarProblemRCE/MDAO_MDF-J.xml index 9aa6f36478392665afce13a8a77044abe21b9f0e..9702c592426a81b6de8b186d6a59e42d00478376 100644 --- a/pyKADMOS/scripts/sellarProblemRCE/MDAO_MDF-J.xml +++ b/pyKADMOS/scripts/sellarProblemRCE/MDAO_MDF-J.xml @@ -3,14 +3,14 @@ <header> <creator>Imco van Gent</creator> <description>Test MDAO file</description> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:04:27.985000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> <updates> <update> <modification>KADMOS Export of a mdao data graph (MDG) graph.</modification> <creator>Imco van Gent</creator> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:04:27.985000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> </update> diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-DOE-GS.pdf b/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-DOE-GS.pdf index 14a16593ce38739e39e84c3bbf9f3f97f63836a1..211023b429a566922a8fc67ffd26f92aa1633572 100644 Binary files a/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-DOE-GS.pdf and b/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-DOE-GS.pdf differ diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-DOE-GS.xml b/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-DOE-GS.xml index 4dd9109a5d8f43b06903c1e0d3c7b10350086034..b8b98e66814a7767b7bec6f5ba6978fd359c20d7 100644 --- a/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-DOE-GS.xml +++ b/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-DOE-GS.xml @@ -3,14 +3,14 @@ <header> <creator>Imco van Gent</creator> <description>Test MDAO file</description> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:21:00.776000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> <updates> <update> <modification>KADMOS Export of a mdao data graph (MDG) graph.</modification> <creator>Imco van Gent</creator> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:21:00.776000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> </update> diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-DOE-J.pdf b/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-DOE-J.pdf index 2f16d3cf6c196a03164c15c67d9165137191438c..2efd6bd7421abeb414ba538b14fba391c0c93b7c 100644 Binary files a/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-DOE-J.pdf and b/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-DOE-J.pdf differ diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-DOE-J.xml b/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-DOE-J.xml index 568e66259eda68940edc29eb6438243a6e5edc3d..1f07ba862d72ea447ed6233a714ad0817a840d25 100644 --- a/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-DOE-J.xml +++ b/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-DOE-J.xml @@ -3,14 +3,14 @@ <header> <creator>Imco van Gent</creator> <description>Test MDAO file</description> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:21:00.776000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> <updates> <update> <modification>KADMOS Export of a mdao data graph (MDG) graph.</modification> <creator>Imco van Gent</creator> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:21:00.776000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> </update> diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-MDA-GS.pdf b/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-MDA-GS.pdf index 9a3372a4c88b0ed46e01c85b75fa79edf775ce8b..8eea638e2fe4e25d8a45daf2ffb039ab226c7198 100644 Binary files a/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-MDA-GS.pdf and b/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-MDA-GS.pdf differ diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-MDA-GS.xml b/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-MDA-GS.xml index 2ff3ea0c03a73858e85d3e3397c47cab01def9be..a2bcf680a92ae974be8549f9f88166a0e3f4fd00 100644 --- a/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-MDA-GS.xml +++ b/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-MDA-GS.xml @@ -3,14 +3,14 @@ <header> <creator>Imco van Gent</creator> <description>Test MDAO file</description> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:04:27.985000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> <updates> <update> <modification>KADMOS Export of a mdao data graph (MDG) graph.</modification> <creator>Imco van Gent</creator> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:04:27.985000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> </update> diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-MDA-J.pdf b/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-MDA-J.pdf index 8c5487abd21a4fad948808d8cb2aa95853b1528a..02b9063541d0012eb5645633ce9fbfbf94a211f9 100644 Binary files a/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-MDA-J.pdf and b/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-MDA-J.pdf differ diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-MDA-J.xml b/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-MDA-J.xml index 41ee54205bc06cd0bb4d73e2abd6b672b4285e6c..e9059e26741332f7a585f477a23ba60f359c38f8 100644 --- a/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-MDA-J.xml +++ b/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-MDA-J.xml @@ -3,14 +3,14 @@ <header> <creator>Imco van Gent</creator> <description>Test MDAO file</description> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:21:00.776000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> <updates> <update> <modification>KADMOS Export of a mdao data graph (MDG) graph.</modification> <creator>Imco van Gent</creator> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:21:00.776000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> </update> diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-DOE-GS.pdf b/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-DOE-GS.pdf index 6d4db79863a6dc550241987af0939cfb61d9c51c..aaf5d3ea74dfe460071d3114d0aea26dd7279b16 100644 Binary files a/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-DOE-GS.pdf and b/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-DOE-GS.pdf differ diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-DOE-GS.xml b/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-DOE-GS.xml index 3928c2cc0998b9e47430ba663d6420e17f1c6258..dc60d222c35edda2f9052da145f4af05be334ddc 100644 --- a/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-DOE-GS.xml +++ b/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-DOE-GS.xml @@ -3,14 +3,14 @@ <header> <creator>Imco van Gent</creator> <description>Test MDAO file</description> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:21:00.776000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> <updates> <update> <modification>KADMOS Export of a mdao data graph (MDG) graph.</modification> <creator>Imco van Gent</creator> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:21:00.776000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> </update> diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-DOE-J.pdf b/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-DOE-J.pdf index 9d0f62cfe4a316ce0fa07bf68532eee25d11abda..9904a94f987a541c063609ed7de4091d241bd5cf 100644 Binary files a/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-DOE-J.pdf and b/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-DOE-J.pdf differ diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-DOE-J.xml b/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-DOE-J.xml index 3522c5df82171545788f77ea7e25a975b2c3e356..879a0d8ba905380b7fbf627bcdd4a4dc87b435ec 100644 --- a/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-DOE-J.xml +++ b/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-DOE-J.xml @@ -3,14 +3,14 @@ <header> <creator>Imco van Gent</creator> <description>Test MDAO file</description> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:21:00.776000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> <updates> <update> <modification>KADMOS Export of a mdao data graph (MDG) graph.</modification> <creator>Imco van Gent</creator> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:21:00.776000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> </update> diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-MDA-GS.pdf b/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-MDA-GS.pdf index ed1a03aec68a3d4e4915ded1013f673993d4732a..06738203a8bc0a49a857c4379fe879e956f37352 100644 Binary files a/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-MDA-GS.pdf and b/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-MDA-GS.pdf differ diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-MDA-GS.xml b/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-MDA-GS.xml index 7ffde32bdf0c01dbfda771a46b3691d2563c79ef..32fc9858802686a17b4bec084fe4c351572ce4d3 100644 --- a/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-MDA-GS.xml +++ b/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-MDA-GS.xml @@ -3,14 +3,14 @@ <header> <creator>Imco van Gent</creator> <description>Test MDAO file</description> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:21:00.776000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> <updates> <update> <modification>KADMOS Export of a mdao data graph (MDG) graph.</modification> <creator>Imco van Gent</creator> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:21:00.776000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> </update> diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-MDA-J.pdf b/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-MDA-J.pdf index 25a4433539b975bc3c4df07e2950677e21c4a577..8f5ab7118b7d0c736a3acfd52cedeb4a89173783 100644 Binary files a/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-MDA-J.pdf and b/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-MDA-J.pdf differ diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-MDA-J.xml b/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-MDA-J.xml index 7fc57cc072331cbbd8f0a45f0387b8562dc2e7c6..b01652336ebcc7088746cf4fdacbe6550fccc7f1 100644 --- a/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-MDA-J.xml +++ b/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-MDA-J.xml @@ -3,14 +3,14 @@ <header> <creator>Imco van Gent</creator> <description>Test MDAO file</description> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:21:00.776000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> <updates> <update> <modification>KADMOS Export of a mdao data graph (MDG) graph.</modification> <creator>Imco van Gent</creator> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:21:00.776000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> </update> diff --git a/pyKADMOS/scripts/sellarProblemRCE/RCG.pdf b/pyKADMOS/scripts/sellarProblemRCE/RCG.pdf index 2ca4ac2905e91e9b6a5acf24897070489e3f3e96..db510f36054431c60bcf632db22a34db52295e77 100644 Binary files a/pyKADMOS/scripts/sellarProblemRCE/RCG.pdf and b/pyKADMOS/scripts/sellarProblemRCE/RCG.pdf differ diff --git a/pyKADMOS/scripts/sellarProblemRCE/RCG.xml b/pyKADMOS/scripts/sellarProblemRCE/RCG.xml index a5173fefcf0a816a3dfec1956fda6bb7a3a1bcf1..c96c0cd93923e44e8ce8099009a17987b13e3cd3 100644 --- a/pyKADMOS/scripts/sellarProblemRCE/RCG.xml +++ b/pyKADMOS/scripts/sellarProblemRCE/RCG.xml @@ -3,14 +3,14 @@ <header> <creator>Imco van Gent</creator> <description>Test RCG file</description> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:25:41.626000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> <updates> <update> <modification>KADMOS export of a repository connectivity graph (RCG).</modification> <creator>Imco van Gent</creator> - <timestamp>2017-03-28T19:31:14.644000</timestamp> + <timestamp>2017-04-11T10:25:41.626000</timestamp> <fileVersion>0.1</fileVersion> <cmdowsVersion>0.4</cmdowsVersion> </update>