From eb8a3b2e6d22e26e6c5d87fec1d52882c61f2b02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20M=C3=BCller?= <l.muller@student.tudelft.nl>
Date: Tue, 11 Apr 2017 21:28:16 +0200
Subject: [PATCH] Work in progress on CMDOWS functions

Former-commit-id: 6d17cb7dff64445bd0e35a1b276639fdb5889581
---
 pyKADMOS/sample/graph.py                      |  54 +++++++++++-------
 pyKADMOS/sample/utilities.py                  |  33 ++++++++---
 pyKADMOS/scripts/loadtest.py                  |   9 +++
 pyKADMOS/scripts/sellarProblemRCE.py          |  10 ++--
 pyKADMOS/scripts/sellarProblemRCE/FPG.pdf     | Bin 26856 -> 26856 bytes
 pyKADMOS/scripts/sellarProblemRCE/FPG_IDF.xml |   4 +-
 .../scripts/sellarProblemRCE/FPG_MDF-GS.xml   |   4 +-
 .../scripts/sellarProblemRCE/FPG_MDF-J.xml    |   4 +-
 .../sellarProblemRCE/FPG_converged-DOE-GS.xml |   4 +-
 .../sellarProblemRCE/FPG_converged-DOE-J.xml  |   4 +-
 .../sellarProblemRCE/FPG_converged-MDA-GS.xml |   4 +-
 .../sellarProblemRCE/FPG_converged-MDA-J.xml  |   4 +-
 .../FPG_unconverged-DOE-GS.xml                |   4 +-
 .../FPG_unconverged-DOE-J.xml                 |   4 +-
 .../FPG_unconverged-MDA-GS.xml                |   4 +-
 .../FPG_unconverged-MDA-J.xml                 |   4 +-
 .../scripts/sellarProblemRCE/MDAO_IDF.pdf     | Bin 62322 -> 62322 bytes
 .../scripts/sellarProblemRCE/MDAO_IDF.xml     |   4 +-
 .../scripts/sellarProblemRCE/MDAO_MDF-GS.pdf  | Bin 62775 -> 62775 bytes
 .../scripts/sellarProblemRCE/MDAO_MDF-GS.xml  |   4 +-
 .../scripts/sellarProblemRCE/MDAO_MDF-J.pdf   | Bin 62619 -> 62619 bytes
 .../scripts/sellarProblemRCE/MDAO_MDF-J.xml   |   4 +-
 .../MDAO_converged-DOE-GS.pdf                 | Bin 56853 -> 56853 bytes
 .../MDAO_converged-DOE-GS.xml                 |   4 +-
 .../sellarProblemRCE/MDAO_converged-DOE-J.pdf | Bin 56690 -> 56690 bytes
 .../sellarProblemRCE/MDAO_converged-DOE-J.xml |   4 +-
 .../MDAO_converged-MDA-GS.pdf                 | Bin 61523 -> 61523 bytes
 .../MDAO_converged-MDA-GS.xml                 |   4 +-
 .../sellarProblemRCE/MDAO_converged-MDA-J.pdf | Bin 61314 -> 61314 bytes
 .../sellarProblemRCE/MDAO_converged-MDA-J.xml |   4 +-
 .../MDAO_unconverged-DOE-GS.pdf               | Bin 55717 -> 55717 bytes
 .../MDAO_unconverged-DOE-GS.xml               |   4 +-
 .../MDAO_unconverged-DOE-J.pdf                | Bin 55565 -> 55565 bytes
 .../MDAO_unconverged-DOE-J.xml                |   4 +-
 .../MDAO_unconverged-MDA-GS.pdf               | Bin 44907 -> 44907 bytes
 .../MDAO_unconverged-MDA-GS.xml               |   4 +-
 .../MDAO_unconverged-MDA-J.pdf                | Bin 44770 -> 44770 bytes
 .../MDAO_unconverged-MDA-J.xml                |   4 +-
 pyKADMOS/scripts/sellarProblemRCE/RCG.pdf     | Bin 27377 -> 27377 bytes
 pyKADMOS/scripts/sellarProblemRCE/RCG.xml     |   4 +-
 40 files changed, 118 insertions(+), 80 deletions(-)
 create mode 100644 pyKADMOS/scripts/loadtest.py

diff --git a/pyKADMOS/sample/graph.py b/pyKADMOS/sample/graph.py
index c08650ff4..863c9d21f 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 075eac5d0..1c4c0a9db 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 000000000..6c5be9170
--- /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 7bdbe8a26..cd9c5ee77 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
GIT binary patch
delta 108
zcmaEHk@3Yv#tjuI943Z_h6YBaCX*Xdq~V;+i&LI4JG+@0JGodG8yPtonK?QeI9nLH
b7#JJ5nOQiy7@4{`nb|4W5K=PvOoj{q&cYqE

delta 108
zcmaEHk@3Yv#tjuI9L7c#hL*;L#*-UTq~V;+i&LI4I~zNhSy)&)yBZn07+aV*x)`~d
bIU2cIT9~-GIGVY*8rUh=5K=PvOoj{q;mRH$

diff --git a/pyKADMOS/scripts/sellarProblemRCE/FPG_IDF.xml b/pyKADMOS/scripts/sellarProblemRCE/FPG_IDF.xml
index 9042bedc3..e57834c66 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 d1b85cb69..e511314b5 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 c54ef22ba..94001bd26 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 8505b7467..ffbf9fb77 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 4bab0fb24..9d858fb19 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 73e8ade59..bdc494db3 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 e01ede5f6..0f2a0904e 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 535fd2f58..bac71cd12 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 1cb7cf016..b29ea8801 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 b6749da33..fb2d35f67 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 a05a4a919..096fdf97b 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
GIT binary patch
delta 132
zcmezLjQP_u<_(A5a+nwz8X6dxnoK_RRvOOP{PwLHYrK=Qp|OjZi>0NjiJ_^fvyp|7
yg`0(utGSDXle4S2v6-EM4M8Qb3U+o}#U+VFB^5=fX<TN81_q{Fs;aL3Zd?G{;w5eX

delta 132
zcmezLjQP_u<_(A5au^#~7+M+|8BRX+RvOOP{PwLHYrKV{k(r5+lbMT)qmh%PrK_=%
yiIb6ug}ITdp|hibldGMA4M8Qb3U+o}#U+VFB^5=fX<TN81_q{Fs;aL3Zd?H5B_)Ia

diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_IDF.xml b/pyKADMOS/scripts/sellarProblemRCE/MDAO_IDF.xml
index c359e15bd..943ef4946 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
GIT binary patch
delta 110
zcmdn~ih27h<_+!dIZX@=4Gj!TOwA`xcrS(EZQlG|mDSnI)zaD3(ZImb!pzyx)Y!?*
c$jR8!$<Wfm+0o6!(9OtB!G@5M$<kkC0A^VqEC2ui

delta 110
zcmdn~ih27h<_+!dIgO1h3@wd~3=JkvcrS(EZQlG|mDSnO+0oF*z`)$a+{MYn!o}3g
c+|Ah7%+k!o+1b#-+0npG!G@5M$<kkC09(W!<^TWy

diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_MDF-GS.xml b/pyKADMOS/scripts/sellarProblemRCE/MDAO_MDF-GS.xml
index 2e333f25e..d834ccf79 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
GIT binary patch
delta 131
zcmbRJl6m$^<_)jk>6jQA8X6dw8W?CB7^xc=sB3cR`{t*(B$lKqXt-Dz85o)yz?Ezk
yf3M2wY+_>R;%sbg>S$r$Y~<|ZWN2Yv;$rM-X=3SUZsulcVW(h2NXg{-FERjTULuhI

delta 131
zcmbRJl6m$^<_)jk=@=VX7+M+|8JcJt7^xc=sB3cR`{t*(B$lKqXt-Dz85o)yz?Ezk
xf3M2w>}2L*Y3O2P;OuN+Y;Ixb>||`=YG~=|3S>DO85o<|DcBHFGP(YX3;=w1BGmu@

diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_MDF-J.xml b/pyKADMOS/scripts/sellarProblemRCE/MDAO_MDF-J.xml
index 9aa6f3647..9702c5924 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
GIT binary patch
delta 108
zcmbQbhk5EA<_%kKaF`ex8X6cG8cp7NLmJN6{NTnl7H304b2CFnM`J@n3u7ZAS62%+
cBXegr3sYx917kN6V;4IG8$wDZ|GX;$02o&vA^-pY

delta 108
zcmbQbhk5EA<_%kKa2Oj|7+M+|noiz(LmJN6{NTnl7H3OGGh;&&LpK*gGZPmBXCp&H
cM{{#yR|{8HXID2@7YjQD8$wDZ|GX;$064oJ;s5{u

diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-DOE-GS.xml b/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-DOE-GS.xml
index 4dd9109a5..b8b98e668 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
GIT binary patch
delta 134
zcmeygi}}+o<_$tOI86)<4GoM8jm#%Y-;hG^Hrw5}$`bG9YHDa?Vq$1yU|?)&=4R<;
zX>Ms^Y2<3@Xzpy{;%aQCU_($ztb&~#S8+*VQAtHnY8scRsfnpEm#V6(zZ(|-3~M8N

delta 134
zcmeygi}}+o<_$tOIE{@g3@wcfO)Vx%-;hG^Hrw5}$`WsB;cV(=WM=GS;_6~(Z0uy{
zYGL8x=;CT*W@KP!WNKumU_($ztb&~#S8+*VQAtHnY8scRsfnpEm#V6(zZ(|-D}N)l

diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-DOE-J.xml b/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-DOE-J.xml
index 568e66259..1f07ba862 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
GIT binary patch
delta 134
zcmccofcf$R<_(Kqahez!8X6dwn3_yp^GXWA+kF0&Dr>xxvzdvRg@u!&g|nNflcTwT
zv9YP8o3pW{qqCc<qnn|ff(=0>u?lu}T*W1cMI{wQscBqh21W*ET&k+B{%%|V-A*Nn

delta 134
zcmccofcf$R<_(KqaT*(07+M+|8JJF9^GXWA+kF0&Dr>xpfw7sRp@E^Zfu)<Jp@F%h
zn}MaXrGcY`i?OkbfvJU^f(=0>u?lu}T*W1cMI{wQscBqh21W*ET&k+B{%%|Vv8yDy

diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-MDA-GS.xml b/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-MDA-GS.xml
index 2ff3ea0c0..a2bcf680a 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
GIT binary patch
delta 134
zcmZp=&)jsMdBdfboF;~bh6YB4#s-sbzm!7oHvfC6${KI%WNhN-=xSkUWMXP&WMbiL
z>SXEcY;NFcXy9t;<Yr{2U_($ztb&~#S8+*VQAtHnY8scRrKP1gm#V6(zZ(|-p0FhC

delta 134
zcmZp=&)jsMdBdfboW@2LhL*-g21b)_zm!7oHvfC6${KHC<YsJSZtCc4YUFBYY+&hV
z;pFJ->gs6VYVP7@YGPogU_($ztb&~#S8+*VQAtHnY8scRrKP1gm#V6(zZ(|-w8$kh

diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-MDA-J.xml b/pyKADMOS/scripts/sellarProblemRCE/MDAO_converged-MDA-J.xml
index 41ee54205..e9059e267 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
GIT binary patch
delta 110
zcmZ3wnR)4E<_)e_I86)<4GoM8jSMFHU6DfYHWyyG%HnKk>TKa=VB+fH=IrQfY~W~U
cVPausVQyh;Y3^oXZeU@jU_(gB<j$Ki0O>#;4gdfE

delta 110
zcmZ3wnR)4E<_)e_IE{@g3@wcfP0T0zU6DfYHWyyG%Hr(e=<I54VQ%4S?q=y?;p*gO
c>}Y7_XyWSXYUE~Y=4@!EU_(gB<j$Ki02pB(5&!@I

diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-DOE-GS.xml b/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-DOE-GS.xml
index 3928c2cc0..dc60d222c 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
GIT binary patch
delta 131
zcmeC(#N4}ydBfVvIwppOh6YB4Mn>8OM(PFz>Y7~ozWFIGi6yBD8ZK5w28QMaa3z~>
xUcSoWZ0c-cYG7>UX6#~QX>4L?ZsKO*W@KSx?CK089G%VW6l@47nf&pF3;<CDBOL$$

delta 131
zcmeC(#N4}ydBfVvI>ts8hL*;LriR)EM(PFz>Y7~ozWFIGi6yBD8ZK5w28QMaa3z~>
yUcSoWY+`C`VQTJb=4xVKWNKkyVQK7aZsO$ZYUFHW;p%4SYNudBNXg`nH)H^0VIz3}

diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-DOE-J.xml b/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-DOE-J.xml
index 3522c5df8..879a0d8ba 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
GIT binary patch
delta 131
zcmaETkLmS2rVY`nbW98l4GoM84K1_{jMNPb)HS*Eee+XX5=&AQG+eBV3=GW;;7T^P
yuWDs+cCv7BvoLXWb96B=a&&VwbaXRtGBUStF?2R_bTxBzwNtPmq-3)HdKmzfz9Uiq

delta 131
zcmaETkLmS2rVY`nbc~HG3@wcfO^me-jMNPb)HS*Eee+XX5=&AQG+eBV3=GW;;7T^P
yuWDs+c6Kp#a&>Ywb#yi~GB9v6Gcj>-aWOGBG<UXeGc<HEv{SGlq-3)HdKmzW%Oc1C

diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-MDA-GS.xml b/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-MDA-GS.xml
index 7ffde32bd..32fc98588 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
GIT binary patch
delta 134
zcmaEKm+8@6rVW=?a+(+#8X6cG8k$bNy;2In+x%~3D@(kSvzxh@lcBM*rK6jrvw^Xt
zqotFRlbNB5k&%Uqp|P2rf(=0>u?lu}T*W1cMI{wQscBp$#%6}bT&k+B{%%|V<=G{0

delta 134
zcmaEKm+8@6rVW=?avB?17+M+|8e2}jy;2In+x%~3D@(kkiGh>3g_)y)xtW=Zv$K(_
yg`<m^g)2~lk&Bt7iLsr64M8Qb3U+o}#U+VFB^5=fX<R18W`@RGs;aL3Zd?H0+a*Q-

diff --git a/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-MDA-J.xml b/pyKADMOS/scripts/sellarProblemRCE/MDAO_unconverged-MDA-J.xml
index 7fc57cc07..b01652336 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
GIT binary patch
delta 134
zcmex(mGR?M#tn^WoF;~bh6YBaCWe!{(xec)&1=)1GRGS@yIGi7I+`0<nmd^q8Je0J
zI$0RHnmIX{TNoR<nVQ-u*br0_t6*oxRa}x-R8motn#N^hW^7@=rK;-c@5TiHDv=|j

delta 134
zcmex(mGR?M#tn^WoW@2LhL*;LhL)4N(xec)&1=)1GRM0(8#p?-nwz<}88{iam>M`6
zI$1aw7@Im9TUt81S{mCa*br0_t6*oxRa}x-R8motn#N^hW^7@=rK;-c@5TiHVV)#i

diff --git a/pyKADMOS/scripts/sellarProblemRCE/RCG.xml b/pyKADMOS/scripts/sellarProblemRCE/RCG.xml
index a5173fefc..c96c0cd93 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>
-- 
GitLab