diff --git a/examples/scripts/sellar_problem.py b/examples/scripts/sellar_problem.py
index d7d4df7160983849bfaf626c60f7045b4b9fb0fe..e478ff3e88d5f793fefbd0ca6fdf29e10a61081c 100644
--- a/examples/scripts/sellar_problem.py
+++ b/examples/scripts/sellar_problem.py
@@ -3,6 +3,8 @@ import logging
from collections import OrderedDict
+import networkx as nx
+
from kadmos.graph import RepositoryConnectivityGraph, FundamentalProblemGraph, load
from kadmos.utilities.general import get_mdao_setup
@@ -235,6 +237,17 @@ for mdao_definition in mdao_definitions:
# Get Mdao graphs
mpg = fpg.get_mpg(name='mpg Sellar problem')
+ cycles = nx.simple_cycles(mpg)
+ print 'Cycles:'
+ for cycle in cycles:
+ print cycle
+ iterative_nodes, process_info, nested_functions = mpg.get_nested_process_ordering()
+ print 'Ordering:'
+ print iterative_nodes
+ print process_info
+ print nested_functions
+ print ''
+
mdg = fpg.get_mdg(name='mdg Sellar problem')
mdg.graph['name'] = 'XDSM - ' + mdao_definition
mdg.graph['description'] = 'Solution strategy to solve the Sellar problem using the strategy: ' \
diff --git a/examples/scripts/sellar_problem/(X)DSM/FPG_IDF.pdf b/examples/scripts/sellar_problem/(X)DSM/FPG_IDF.pdf
index dbee6c690f0d05785ba0d04bff99c3f2239fc32c..901cc77ec6479c68bb0de49bf69849c1c9cf9d55 100644
Binary files a/examples/scripts/sellar_problem/(X)DSM/FPG_IDF.pdf and b/examples/scripts/sellar_problem/(X)DSM/FPG_IDF.pdf differ
diff --git a/examples/scripts/sellar_problem/(X)DSM/FPG_MDF-GS.pdf b/examples/scripts/sellar_problem/(X)DSM/FPG_MDF-GS.pdf
index 5f1f7b2d5b9eb05c743ad3f38ed5e8b044e2e5f0..61aed6c058d49aa0bc08162bb8c227ea11383a40 100644
Binary files a/examples/scripts/sellar_problem/(X)DSM/FPG_MDF-GS.pdf and b/examples/scripts/sellar_problem/(X)DSM/FPG_MDF-GS.pdf differ
diff --git a/examples/scripts/sellar_problem/(X)DSM/FPG_MDF-J.pdf b/examples/scripts/sellar_problem/(X)DSM/FPG_MDF-J.pdf
index 187b64d6caa4bf8c6ab484d116bd050f51951b0b..4d49497d99f36c424b5cdb2b3da1e669097d91e8 100644
Binary files a/examples/scripts/sellar_problem/(X)DSM/FPG_MDF-J.pdf and b/examples/scripts/sellar_problem/(X)DSM/FPG_MDF-J.pdf differ
diff --git a/examples/scripts/sellar_problem/(X)DSM/FPG_converged-DOE-GS.pdf b/examples/scripts/sellar_problem/(X)DSM/FPG_converged-DOE-GS.pdf
index 9074bef0a11d7bad2153a8c80c0e97afab453a2c..6b4813e252bb496cdc46117c0d69b05cbf249599 100644
Binary files a/examples/scripts/sellar_problem/(X)DSM/FPG_converged-DOE-GS.pdf and b/examples/scripts/sellar_problem/(X)DSM/FPG_converged-DOE-GS.pdf differ
diff --git a/examples/scripts/sellar_problem/(X)DSM/FPG_converged-DOE-J.pdf b/examples/scripts/sellar_problem/(X)DSM/FPG_converged-DOE-J.pdf
index 285f3c78d971fc55042c6b3b7a9f383e77a7c446..65b7b2d6fa17d521a54ad60618665023fcf20c16 100644
Binary files a/examples/scripts/sellar_problem/(X)DSM/FPG_converged-DOE-J.pdf and b/examples/scripts/sellar_problem/(X)DSM/FPG_converged-DOE-J.pdf differ
diff --git a/examples/scripts/sellar_problem/(X)DSM/FPG_converged-MDA-GS.pdf b/examples/scripts/sellar_problem/(X)DSM/FPG_converged-MDA-GS.pdf
index e2b9587b3f40a2d232db92702beb6574dec714f8..120c9ff11e122e448dff8fbf68546e8bd221c2b7 100644
Binary files a/examples/scripts/sellar_problem/(X)DSM/FPG_converged-MDA-GS.pdf and b/examples/scripts/sellar_problem/(X)DSM/FPG_converged-MDA-GS.pdf differ
diff --git a/examples/scripts/sellar_problem/(X)DSM/FPG_converged-MDA-J.pdf b/examples/scripts/sellar_problem/(X)DSM/FPG_converged-MDA-J.pdf
index 79c6fbe895d25d604254c75c0c4a67479a18660a..fd5842f306f6a1fc6d15b9a57b6f506c8fa6ffb2 100644
Binary files a/examples/scripts/sellar_problem/(X)DSM/FPG_converged-MDA-J.pdf and b/examples/scripts/sellar_problem/(X)DSM/FPG_converged-MDA-J.pdf differ
diff --git a/examples/scripts/sellar_problem/(X)DSM/FPG_unconverged-DOE-GS.pdf b/examples/scripts/sellar_problem/(X)DSM/FPG_unconverged-DOE-GS.pdf
index 671b5375e458ede1329f6e2a49b6e2ea7c473d1c..7bc3ca2034cfd13a775ff7ffd0fbdd4338a0cb69 100644
Binary files a/examples/scripts/sellar_problem/(X)DSM/FPG_unconverged-DOE-GS.pdf and b/examples/scripts/sellar_problem/(X)DSM/FPG_unconverged-DOE-GS.pdf differ
diff --git a/examples/scripts/sellar_problem/(X)DSM/FPG_unconverged-DOE-J.pdf b/examples/scripts/sellar_problem/(X)DSM/FPG_unconverged-DOE-J.pdf
index 018dbac531a3fbff2c5bacf64461b810b7ec4d42..8bdf8109d15adfcadb68b420bb3c9b10fb326400 100644
Binary files a/examples/scripts/sellar_problem/(X)DSM/FPG_unconverged-DOE-J.pdf and b/examples/scripts/sellar_problem/(X)DSM/FPG_unconverged-DOE-J.pdf differ
diff --git a/examples/scripts/sellar_problem/(X)DSM/FPG_unconverged-MDA-GS.pdf b/examples/scripts/sellar_problem/(X)DSM/FPG_unconverged-MDA-GS.pdf
index db333f1e7613d4639d235cb90683c3bd5b560bd4..5194ef031b841efafa6f7ba629ffb474bff4bbbf 100644
Binary files a/examples/scripts/sellar_problem/(X)DSM/FPG_unconverged-MDA-GS.pdf and b/examples/scripts/sellar_problem/(X)DSM/FPG_unconverged-MDA-GS.pdf differ
diff --git a/examples/scripts/sellar_problem/(X)DSM/FPG_unconverged-MDA-J.pdf b/examples/scripts/sellar_problem/(X)DSM/FPG_unconverged-MDA-J.pdf
index 3734279159b54aceed433843be37e74a5ba474c3..0c20ceb62c66651238ad087ad096cc5f9214b377 100644
Binary files a/examples/scripts/sellar_problem/(X)DSM/FPG_unconverged-MDA-J.pdf and b/examples/scripts/sellar_problem/(X)DSM/FPG_unconverged-MDA-J.pdf differ
diff --git a/examples/scripts/sellar_problem/(X)DSM/MDAO_IDF.pdf b/examples/scripts/sellar_problem/(X)DSM/MDAO_IDF.pdf
index d1050272238f219e7f61ed3c695cb8d0505ffa87..2eea58c95933a1d8bf1052f47f6a259177a6728f 100644
Binary files a/examples/scripts/sellar_problem/(X)DSM/MDAO_IDF.pdf and b/examples/scripts/sellar_problem/(X)DSM/MDAO_IDF.pdf differ
diff --git a/examples/scripts/sellar_problem/(X)DSM/MDAO_MDF-GS.pdf b/examples/scripts/sellar_problem/(X)DSM/MDAO_MDF-GS.pdf
index 60efe0cc3bfbc7175cc70fab0eedfa71b23e691e..9b0fd102fd25ad3abd84dc0c8fba49ed695b7574 100644
Binary files a/examples/scripts/sellar_problem/(X)DSM/MDAO_MDF-GS.pdf and b/examples/scripts/sellar_problem/(X)DSM/MDAO_MDF-GS.pdf differ
diff --git a/examples/scripts/sellar_problem/(X)DSM/MDAO_MDF-J.pdf b/examples/scripts/sellar_problem/(X)DSM/MDAO_MDF-J.pdf
index 77397b85da4cc08bb12cffa79567e2e7e4d90a40..ef86b81e0db7043cd9a2e129f38f48b4bf47b1b2 100644
Binary files a/examples/scripts/sellar_problem/(X)DSM/MDAO_MDF-J.pdf and b/examples/scripts/sellar_problem/(X)DSM/MDAO_MDF-J.pdf differ
diff --git a/examples/scripts/sellar_problem/(X)DSM/MDAO_converged-DOE-GS.pdf b/examples/scripts/sellar_problem/(X)DSM/MDAO_converged-DOE-GS.pdf
index db512fbbb0e377b4a8811080f0294665b5db1e8e..ea25a7a1fa5f404a8ef3df0cb6e722e4df188002 100644
Binary files a/examples/scripts/sellar_problem/(X)DSM/MDAO_converged-DOE-GS.pdf and b/examples/scripts/sellar_problem/(X)DSM/MDAO_converged-DOE-GS.pdf differ
diff --git a/examples/scripts/sellar_problem/(X)DSM/MDAO_converged-DOE-J.pdf b/examples/scripts/sellar_problem/(X)DSM/MDAO_converged-DOE-J.pdf
index 0c1ed4910e0639b870f4f002c77a6aea7f8b4f3c..5306a06d7dc5ddac542eaa501885e55fc50b5ec9 100644
Binary files a/examples/scripts/sellar_problem/(X)DSM/MDAO_converged-DOE-J.pdf and b/examples/scripts/sellar_problem/(X)DSM/MDAO_converged-DOE-J.pdf differ
diff --git a/examples/scripts/sellar_problem/(X)DSM/MDAO_converged-MDA-GS.pdf b/examples/scripts/sellar_problem/(X)DSM/MDAO_converged-MDA-GS.pdf
index e46860b2c0a75d87d7f09563afafa6e357f285c3..3a64933ccfa7e0ba438238a68dc6e8a61347490f 100644
Binary files a/examples/scripts/sellar_problem/(X)DSM/MDAO_converged-MDA-GS.pdf and b/examples/scripts/sellar_problem/(X)DSM/MDAO_converged-MDA-GS.pdf differ
diff --git a/examples/scripts/sellar_problem/(X)DSM/MDAO_converged-MDA-J.pdf b/examples/scripts/sellar_problem/(X)DSM/MDAO_converged-MDA-J.pdf
index 6ff8fa738adba8d3c923edba5e032bc92bd86b54..cdaf6086a7fe675a4f6a9d5fbf6b5aee301887ae 100644
Binary files a/examples/scripts/sellar_problem/(X)DSM/MDAO_converged-MDA-J.pdf and b/examples/scripts/sellar_problem/(X)DSM/MDAO_converged-MDA-J.pdf differ
diff --git a/examples/scripts/sellar_problem/(X)DSM/MDAO_unconverged-DOE-GS.pdf b/examples/scripts/sellar_problem/(X)DSM/MDAO_unconverged-DOE-GS.pdf
index e8299dd33cb1dbf523debd3b31ef1fda4674c08a..8d2456182636fe41437b6f6a6ce28492b56fa637 100644
Binary files a/examples/scripts/sellar_problem/(X)DSM/MDAO_unconverged-DOE-GS.pdf and b/examples/scripts/sellar_problem/(X)DSM/MDAO_unconverged-DOE-GS.pdf differ
diff --git a/examples/scripts/sellar_problem/(X)DSM/MDAO_unconverged-DOE-J.pdf b/examples/scripts/sellar_problem/(X)DSM/MDAO_unconverged-DOE-J.pdf
index 994096e9ff9fd82f82413e01058fd9ead9a0bc7a..40d340f0f058f6682f4e53300acc6d6d110b5d9f 100644
Binary files a/examples/scripts/sellar_problem/(X)DSM/MDAO_unconverged-DOE-J.pdf and b/examples/scripts/sellar_problem/(X)DSM/MDAO_unconverged-DOE-J.pdf differ
diff --git a/examples/scripts/sellar_problem/(X)DSM/MDAO_unconverged-MDA-GS.pdf b/examples/scripts/sellar_problem/(X)DSM/MDAO_unconverged-MDA-GS.pdf
index ae7998a550fe9e8878bc0086d5e4daa3e316c57a..83f0b07a885cfcc9504825dfb4cfdf9abf96faf9 100644
Binary files a/examples/scripts/sellar_problem/(X)DSM/MDAO_unconverged-MDA-GS.pdf and b/examples/scripts/sellar_problem/(X)DSM/MDAO_unconverged-MDA-GS.pdf differ
diff --git a/examples/scripts/sellar_problem/(X)DSM/MDAO_unconverged-MDA-J.pdf b/examples/scripts/sellar_problem/(X)DSM/MDAO_unconverged-MDA-J.pdf
index d9bd5a7d0c6aebd99c175e1c79713a67256efbb2..b32debf0d056b47363c75de06ecd85eea0931cd3 100644
Binary files a/examples/scripts/sellar_problem/(X)DSM/MDAO_unconverged-MDA-J.pdf and b/examples/scripts/sellar_problem/(X)DSM/MDAO_unconverged-MDA-J.pdf differ
diff --git a/examples/scripts/sellar_problem/(X)DSM/RCG.pdf b/examples/scripts/sellar_problem/(X)DSM/RCG.pdf
index cfe6f13384e512b65459f50c537309fc8028b7ea..2fa93084ca9b0a76e60d6ae59e97225a24395624 100644
Binary files a/examples/scripts/sellar_problem/(X)DSM/RCG.pdf and b/examples/scripts/sellar_problem/(X)DSM/RCG.pdf differ
diff --git a/examples/scripts/sellar_problem/CMDOWS/FPG_IDF.xml b/examples/scripts/sellar_problem/CMDOWS/FPG_IDF.xml
index 425549edf2381f1b64dfe3897533609b0aa9fec1..efc36f17ea6d420fe2a0235d76978a3e95b1ac55 100644
--- a/examples/scripts/sellar_problem/CMDOWS/FPG_IDF.xml
+++ b/examples/scripts/sellar_problem/CMDOWS/FPG_IDF.xml
@@ -3,14 +3,14 @@
<header>
<creator>Imco van Gent</creator>
<description>FPG CMDOWS file of the well-known Sellar problem</description>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
<updates>
<update>
<modification>KADMOS export of a fundamental problem graph (FPG).</modification>
<creator>Imco van Gent</creator>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
</update>
diff --git a/examples/scripts/sellar_problem/CMDOWS/FPG_MDF-GS.xml b/examples/scripts/sellar_problem/CMDOWS/FPG_MDF-GS.xml
index 43e1b980c89e26aea23539031b3fb0087d083b18..8a2f55ae8d06d2e4b217ed536fa958a63e397209 100644
--- a/examples/scripts/sellar_problem/CMDOWS/FPG_MDF-GS.xml
+++ b/examples/scripts/sellar_problem/CMDOWS/FPG_MDF-GS.xml
@@ -3,14 +3,14 @@
<header>
<creator>Imco van Gent</creator>
<description>FPG CMDOWS file of the well-known Sellar problem</description>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
<updates>
<update>
<modification>KADMOS export of a fundamental problem graph (FPG).</modification>
<creator>Imco van Gent</creator>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
</update>
diff --git a/examples/scripts/sellar_problem/CMDOWS/FPG_MDF-J.xml b/examples/scripts/sellar_problem/CMDOWS/FPG_MDF-J.xml
index 28c3d5038156779ee533f07d8fbad5def21b990a..8478a5f63150ae7af06c9a505b1349b0bdcc4e20 100644
--- a/examples/scripts/sellar_problem/CMDOWS/FPG_MDF-J.xml
+++ b/examples/scripts/sellar_problem/CMDOWS/FPG_MDF-J.xml
@@ -3,14 +3,14 @@
<header>
<creator>Imco van Gent</creator>
<description>FPG CMDOWS file of the well-known Sellar problem</description>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
<updates>
<update>
<modification>KADMOS export of a fundamental problem graph (FPG).</modification>
<creator>Imco van Gent</creator>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
</update>
diff --git a/examples/scripts/sellar_problem/CMDOWS/FPG_converged-DOE-GS.xml b/examples/scripts/sellar_problem/CMDOWS/FPG_converged-DOE-GS.xml
index ac00f3e9846d6c965f9c73276dac98387190f8e1..31a240202e773bdce6a1cbdb7c74c4af2874c383 100644
--- a/examples/scripts/sellar_problem/CMDOWS/FPG_converged-DOE-GS.xml
+++ b/examples/scripts/sellar_problem/CMDOWS/FPG_converged-DOE-GS.xml
@@ -3,14 +3,14 @@
<header>
<creator>Imco van Gent</creator>
<description>FPG CMDOWS file of the well-known Sellar problem</description>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
<updates>
<update>
<modification>KADMOS export of a fundamental problem graph (FPG).</modification>
<creator>Imco van Gent</creator>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
</update>
diff --git a/examples/scripts/sellar_problem/CMDOWS/FPG_converged-DOE-J.xml b/examples/scripts/sellar_problem/CMDOWS/FPG_converged-DOE-J.xml
index 41b55702ca6f7894fd7daae28abbf96aea168d9a..5ae6f21b2d06dd66932cc59427e51554f2abdeec 100644
--- a/examples/scripts/sellar_problem/CMDOWS/FPG_converged-DOE-J.xml
+++ b/examples/scripts/sellar_problem/CMDOWS/FPG_converged-DOE-J.xml
@@ -3,14 +3,14 @@
<header>
<creator>Imco van Gent</creator>
<description>FPG CMDOWS file of the well-known Sellar problem</description>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
<updates>
<update>
<modification>KADMOS export of a fundamental problem graph (FPG).</modification>
<creator>Imco van Gent</creator>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
</update>
diff --git a/examples/scripts/sellar_problem/CMDOWS/FPG_converged-MDA-GS.xml b/examples/scripts/sellar_problem/CMDOWS/FPG_converged-MDA-GS.xml
index dc4c2dcc1d3e84e5e7ec5e2b4c800591d121478f..6c9ad1c13b78f13fe4a8be40a6808c35339c49c5 100644
--- a/examples/scripts/sellar_problem/CMDOWS/FPG_converged-MDA-GS.xml
+++ b/examples/scripts/sellar_problem/CMDOWS/FPG_converged-MDA-GS.xml
@@ -3,14 +3,14 @@
<header>
<creator>Imco van Gent</creator>
<description>FPG CMDOWS file of the well-known Sellar problem</description>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
<updates>
<update>
<modification>KADMOS export of a fundamental problem graph (FPG).</modification>
<creator>Imco van Gent</creator>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
</update>
diff --git a/examples/scripts/sellar_problem/CMDOWS/FPG_converged-MDA-J.xml b/examples/scripts/sellar_problem/CMDOWS/FPG_converged-MDA-J.xml
index de5c7a430eb9351bbd05e33b561a1cc99cda12ee..71628827bf7458094cb87ead014bf3fc42bca0e7 100644
--- a/examples/scripts/sellar_problem/CMDOWS/FPG_converged-MDA-J.xml
+++ b/examples/scripts/sellar_problem/CMDOWS/FPG_converged-MDA-J.xml
@@ -3,14 +3,14 @@
<header>
<creator>Imco van Gent</creator>
<description>FPG CMDOWS file of the well-known Sellar problem</description>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
<updates>
<update>
<modification>KADMOS export of a fundamental problem graph (FPG).</modification>
<creator>Imco van Gent</creator>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
</update>
diff --git a/examples/scripts/sellar_problem/CMDOWS/FPG_unconverged-DOE-GS.xml b/examples/scripts/sellar_problem/CMDOWS/FPG_unconverged-DOE-GS.xml
index 8f66f6aebc512df4e566a406bbac5b6d735eaeee..b604e9ee00f03356f553c5e32f931f6a5b88221e 100644
--- a/examples/scripts/sellar_problem/CMDOWS/FPG_unconverged-DOE-GS.xml
+++ b/examples/scripts/sellar_problem/CMDOWS/FPG_unconverged-DOE-GS.xml
@@ -3,14 +3,14 @@
<header>
<creator>Imco van Gent</creator>
<description>FPG CMDOWS file of the well-known Sellar problem</description>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
<updates>
<update>
<modification>KADMOS export of a fundamental problem graph (FPG).</modification>
<creator>Imco van Gent</creator>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
</update>
diff --git a/examples/scripts/sellar_problem/CMDOWS/FPG_unconverged-DOE-J.xml b/examples/scripts/sellar_problem/CMDOWS/FPG_unconverged-DOE-J.xml
index 9ebb3ada57914af3d2199be264dac2d88abfd2b2..7a2f890c40dd03a481e60f55d2d7fc6a421ee4ad 100644
--- a/examples/scripts/sellar_problem/CMDOWS/FPG_unconverged-DOE-J.xml
+++ b/examples/scripts/sellar_problem/CMDOWS/FPG_unconverged-DOE-J.xml
@@ -3,14 +3,14 @@
<header>
<creator>Imco van Gent</creator>
<description>FPG CMDOWS file of the well-known Sellar problem</description>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
<updates>
<update>
<modification>KADMOS export of a fundamental problem graph (FPG).</modification>
<creator>Imco van Gent</creator>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
</update>
diff --git a/examples/scripts/sellar_problem/CMDOWS/FPG_unconverged-MDA-GS.xml b/examples/scripts/sellar_problem/CMDOWS/FPG_unconverged-MDA-GS.xml
index c2e3dbb981fa6544704068cbe4c9969df7e984cb..ffbe4ff54e248578d2aa4e4cf6ee1c2e37950bb8 100644
--- a/examples/scripts/sellar_problem/CMDOWS/FPG_unconverged-MDA-GS.xml
+++ b/examples/scripts/sellar_problem/CMDOWS/FPG_unconverged-MDA-GS.xml
@@ -3,14 +3,14 @@
<header>
<creator>Imco van Gent</creator>
<description>FPG CMDOWS file of the well-known Sellar problem</description>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
<updates>
<update>
<modification>KADMOS export of a fundamental problem graph (FPG).</modification>
<creator>Imco van Gent</creator>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
</update>
diff --git a/examples/scripts/sellar_problem/CMDOWS/FPG_unconverged-MDA-J.xml b/examples/scripts/sellar_problem/CMDOWS/FPG_unconverged-MDA-J.xml
index c020f1a9afe806644c5c8161c28b00d8339ed7d6..04f6f7399cd1b69e3280f38d3d615d5f02495f62 100644
--- a/examples/scripts/sellar_problem/CMDOWS/FPG_unconverged-MDA-J.xml
+++ b/examples/scripts/sellar_problem/CMDOWS/FPG_unconverged-MDA-J.xml
@@ -3,14 +3,14 @@
<header>
<creator>Imco van Gent</creator>
<description>FPG CMDOWS file of the well-known Sellar problem</description>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
<updates>
<update>
<modification>KADMOS export of a fundamental problem graph (FPG).</modification>
<creator>Imco van Gent</creator>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
</update>
diff --git a/examples/scripts/sellar_problem/CMDOWS/Mdao_IDF.xml b/examples/scripts/sellar_problem/CMDOWS/Mdao_IDF.xml
index 212a32880154b0d552f20533230d5b06c6c54b59..0a41cda84b67764bfb872132484dbf1261ca4906 100644
--- a/examples/scripts/sellar_problem/CMDOWS/Mdao_IDF.xml
+++ b/examples/scripts/sellar_problem/CMDOWS/Mdao_IDF.xml
@@ -3,14 +3,14 @@
<header>
<creator>Imco van Gent</creator>
<description>Mdao CMDOWS file of the well-known Sellar problem</description>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
<updates>
<update>
<modification>KADMOS export of a mdao data graph (MDG).</modification>
<creator>Imco van Gent</creator>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
</update>
diff --git a/examples/scripts/sellar_problem/CMDOWS/Mdao_MDF-GS.xml b/examples/scripts/sellar_problem/CMDOWS/Mdao_MDF-GS.xml
index 9e1bccafb427910c8b0641debda0cdebad630252..0977b28fdd23edfa18a1615dc09246baac6478bc 100644
--- a/examples/scripts/sellar_problem/CMDOWS/Mdao_MDF-GS.xml
+++ b/examples/scripts/sellar_problem/CMDOWS/Mdao_MDF-GS.xml
@@ -3,14 +3,14 @@
<header>
<creator>Imco van Gent</creator>
<description>Mdao CMDOWS file of the well-known Sellar problem</description>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
<updates>
<update>
<modification>KADMOS export of a mdao data graph (MDG).</modification>
<creator>Imco van Gent</creator>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
</update>
diff --git a/examples/scripts/sellar_problem/CMDOWS/Mdao_MDF-J.xml b/examples/scripts/sellar_problem/CMDOWS/Mdao_MDF-J.xml
index e8deb1266ed0c0395728eee4eca8dfe4d3330bbe..0f19e45908db0087e5ee5f4ccc49c265ab91a567 100644
--- a/examples/scripts/sellar_problem/CMDOWS/Mdao_MDF-J.xml
+++ b/examples/scripts/sellar_problem/CMDOWS/Mdao_MDF-J.xml
@@ -3,14 +3,14 @@
<header>
<creator>Imco van Gent</creator>
<description>Mdao CMDOWS file of the well-known Sellar problem</description>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
<updates>
<update>
<modification>KADMOS export of a mdao data graph (MDG).</modification>
<creator>Imco van Gent</creator>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
</update>
diff --git a/examples/scripts/sellar_problem/CMDOWS/Mdao_converged-DOE-GS.xml b/examples/scripts/sellar_problem/CMDOWS/Mdao_converged-DOE-GS.xml
index d2fd3abb808397197acf3395589eb57c19e595d2..44d5adeeec854aaaa9e87442a7cd972ca86be7f7 100644
--- a/examples/scripts/sellar_problem/CMDOWS/Mdao_converged-DOE-GS.xml
+++ b/examples/scripts/sellar_problem/CMDOWS/Mdao_converged-DOE-GS.xml
@@ -3,14 +3,14 @@
<header>
<creator>Imco van Gent</creator>
<description>Mdao CMDOWS file of the well-known Sellar problem</description>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
<updates>
<update>
<modification>KADMOS export of a mdao data graph (MDG).</modification>
<creator>Imco van Gent</creator>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
</update>
diff --git a/examples/scripts/sellar_problem/CMDOWS/Mdao_converged-DOE-J.xml b/examples/scripts/sellar_problem/CMDOWS/Mdao_converged-DOE-J.xml
index 275c4084c31f712b31ff63eea69395f36ad6a3a6..72561a3ac74e00b3fa76027bc5a2226faeccaf7c 100644
--- a/examples/scripts/sellar_problem/CMDOWS/Mdao_converged-DOE-J.xml
+++ b/examples/scripts/sellar_problem/CMDOWS/Mdao_converged-DOE-J.xml
@@ -3,14 +3,14 @@
<header>
<creator>Imco van Gent</creator>
<description>Mdao CMDOWS file of the well-known Sellar problem</description>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
<updates>
<update>
<modification>KADMOS export of a mdao data graph (MDG).</modification>
<creator>Imco van Gent</creator>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
</update>
diff --git a/examples/scripts/sellar_problem/CMDOWS/Mdao_converged-MDA-GS.xml b/examples/scripts/sellar_problem/CMDOWS/Mdao_converged-MDA-GS.xml
index b429b242eb8d7bcc6055a7a0c46a76ecca48cd2c..53b7094625044a2a559c790c68fe16da71b650bd 100644
--- a/examples/scripts/sellar_problem/CMDOWS/Mdao_converged-MDA-GS.xml
+++ b/examples/scripts/sellar_problem/CMDOWS/Mdao_converged-MDA-GS.xml
@@ -3,14 +3,14 @@
<header>
<creator>Imco van Gent</creator>
<description>Mdao CMDOWS file of the well-known Sellar problem</description>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
<updates>
<update>
<modification>KADMOS export of a mdao data graph (MDG).</modification>
<creator>Imco van Gent</creator>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
</update>
diff --git a/examples/scripts/sellar_problem/CMDOWS/Mdao_converged-MDA-J.xml b/examples/scripts/sellar_problem/CMDOWS/Mdao_converged-MDA-J.xml
index 805af63cacb1d1c31932574123cabf8d74835215..7ec03726b8de494a67389605519ee8e259f21f61 100644
--- a/examples/scripts/sellar_problem/CMDOWS/Mdao_converged-MDA-J.xml
+++ b/examples/scripts/sellar_problem/CMDOWS/Mdao_converged-MDA-J.xml
@@ -3,14 +3,14 @@
<header>
<creator>Imco van Gent</creator>
<description>Mdao CMDOWS file of the well-known Sellar problem</description>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
<updates>
<update>
<modification>KADMOS export of a mdao data graph (MDG).</modification>
<creator>Imco van Gent</creator>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
</update>
diff --git a/examples/scripts/sellar_problem/CMDOWS/Mdao_unconverged-DOE-GS.xml b/examples/scripts/sellar_problem/CMDOWS/Mdao_unconverged-DOE-GS.xml
index a72c1fb496a329a858d4a5833b8c429d5c6baabd..817054ef9caac1cb2d7d70ed51824d398f9e63f2 100644
--- a/examples/scripts/sellar_problem/CMDOWS/Mdao_unconverged-DOE-GS.xml
+++ b/examples/scripts/sellar_problem/CMDOWS/Mdao_unconverged-DOE-GS.xml
@@ -3,14 +3,14 @@
<header>
<creator>Imco van Gent</creator>
<description>Mdao CMDOWS file of the well-known Sellar problem</description>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
<updates>
<update>
<modification>KADMOS export of a mdao data graph (MDG).</modification>
<creator>Imco van Gent</creator>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
</update>
diff --git a/examples/scripts/sellar_problem/CMDOWS/Mdao_unconverged-DOE-J.xml b/examples/scripts/sellar_problem/CMDOWS/Mdao_unconverged-DOE-J.xml
index 03dbd4fa080f554e7d089014dc37703ef5332e5b..3f9a1c0b1899f12fef2e853904ee8b99c9ca07fc 100644
--- a/examples/scripts/sellar_problem/CMDOWS/Mdao_unconverged-DOE-J.xml
+++ b/examples/scripts/sellar_problem/CMDOWS/Mdao_unconverged-DOE-J.xml
@@ -3,14 +3,14 @@
<header>
<creator>Imco van Gent</creator>
<description>Mdao CMDOWS file of the well-known Sellar problem</description>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
<updates>
<update>
<modification>KADMOS export of a mdao data graph (MDG).</modification>
<creator>Imco van Gent</creator>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
</update>
diff --git a/examples/scripts/sellar_problem/CMDOWS/Mdao_unconverged-MDA-GS.xml b/examples/scripts/sellar_problem/CMDOWS/Mdao_unconverged-MDA-GS.xml
index 1701af7eab7302be20ed8bee1df3c47be9e84738..11ceaabc5cef27668afefa1b557879bf2e77e015 100644
--- a/examples/scripts/sellar_problem/CMDOWS/Mdao_unconverged-MDA-GS.xml
+++ b/examples/scripts/sellar_problem/CMDOWS/Mdao_unconverged-MDA-GS.xml
@@ -3,14 +3,14 @@
<header>
<creator>Imco van Gent</creator>
<description>Mdao CMDOWS file of the well-known Sellar problem</description>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
<updates>
<update>
<modification>KADMOS export of a mdao data graph (MDG).</modification>
<creator>Imco van Gent</creator>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
</update>
diff --git a/examples/scripts/sellar_problem/CMDOWS/Mdao_unconverged-MDA-J.xml b/examples/scripts/sellar_problem/CMDOWS/Mdao_unconverged-MDA-J.xml
index 736a57170d39d9a36b617afc17a2ddcaf9a08865..ef0092a3269b6c5cfc1e2395dbcc32c11d4a4bb6 100644
--- a/examples/scripts/sellar_problem/CMDOWS/Mdao_unconverged-MDA-J.xml
+++ b/examples/scripts/sellar_problem/CMDOWS/Mdao_unconverged-MDA-J.xml
@@ -3,14 +3,14 @@
<header>
<creator>Imco van Gent</creator>
<description>Mdao CMDOWS file of the well-known Sellar problem</description>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
<updates>
<update>
<modification>KADMOS export of a mdao data graph (MDG).</modification>
<creator>Imco van Gent</creator>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
</update>
diff --git a/examples/scripts/sellar_problem/CMDOWS/RCG.xml b/examples/scripts/sellar_problem/CMDOWS/RCG.xml
index 255c2d0f377f23cd1c478d9bcfb5200644e0307d..13787a8dff385264a9d514411aa319645bdfadc7 100644
--- a/examples/scripts/sellar_problem/CMDOWS/RCG.xml
+++ b/examples/scripts/sellar_problem/CMDOWS/RCG.xml
@@ -3,14 +3,14 @@
<header>
<creator>Imco van Gent</creator>
<description>RCG CMDOWS file of the well-known Sellar problem</description>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
<updates>
<update>
<modification>KADMOS export of a repository connectivity graph (RCG).</modification>
<creator>Imco van Gent</creator>
- <timestamp>2017-12-05T16:31:03.280861</timestamp>
+ <timestamp>2017-12-06T23:04:25.043306</timestamp>
<fileVersion>0.1</fileVersion>
<cmdowsVersion>0.7</cmdowsVersion>
</update>
diff --git a/examples/scripts/sellar_problem/KDMS/FPG_converged-MDA-GS.kdms b/examples/scripts/sellar_problem/KDMS/FPG_converged-MDA-GS.kdms
index 65ca9bc7bf1421094a3d87ed6f967a785f4a0829..7bf641b507d83e9ab746d5b686e373bd0fb71486 100644
Binary files a/examples/scripts/sellar_problem/KDMS/FPG_converged-MDA-GS.kdms and b/examples/scripts/sellar_problem/KDMS/FPG_converged-MDA-GS.kdms differ
diff --git a/examples/scripts/sellar_problem/KDMS/FPG_converged-MDA-J.kdms b/examples/scripts/sellar_problem/KDMS/FPG_converged-MDA-J.kdms
index 7aa92a7b049bf2abdff1136b39b20e05c13bf5f4..0a276a963812d703ad9efd503d964122b17daa0d 100644
Binary files a/examples/scripts/sellar_problem/KDMS/FPG_converged-MDA-J.kdms and b/examples/scripts/sellar_problem/KDMS/FPG_converged-MDA-J.kdms differ
diff --git a/examples/scripts/sellar_problem/KDMS/FPG_unconverged-DOE-GS.kdms b/examples/scripts/sellar_problem/KDMS/FPG_unconverged-DOE-GS.kdms
index 424b911274add565fa1f508b060af92e9c7df977..991e7ea9e0447fc0bd369ac6ee2e717b4c9213a0 100644
Binary files a/examples/scripts/sellar_problem/KDMS/FPG_unconverged-DOE-GS.kdms and b/examples/scripts/sellar_problem/KDMS/FPG_unconverged-DOE-GS.kdms differ
diff --git a/examples/scripts/sellar_problem/KDMS/FPG_unconverged-DOE-J.kdms b/examples/scripts/sellar_problem/KDMS/FPG_unconverged-DOE-J.kdms
index f9e80a424ec9a93981b0f609824143ac2b64c963..2b5d6db8fa6914028433a2cef7635dcd992b82ed 100644
Binary files a/examples/scripts/sellar_problem/KDMS/FPG_unconverged-DOE-J.kdms and b/examples/scripts/sellar_problem/KDMS/FPG_unconverged-DOE-J.kdms differ
diff --git a/examples/scripts/sellar_problem/KDMS/Mdao_IDF_mpg.kdms b/examples/scripts/sellar_problem/KDMS/Mdao_IDF_mpg.kdms
index 4c0cab513051ddc522c710214ee5b3b4b6361ba8..9edc496668adceeef251c3e24e2d6c183c187134 100644
Binary files a/examples/scripts/sellar_problem/KDMS/Mdao_IDF_mpg.kdms and b/examples/scripts/sellar_problem/KDMS/Mdao_IDF_mpg.kdms differ
diff --git a/examples/scripts/sellar_problem/KDMS/Mdao_MDF-GS_mpg.kdms b/examples/scripts/sellar_problem/KDMS/Mdao_MDF-GS_mpg.kdms
index f7e0bef96ab60d12bbc949fabf380000dd00ad06..07e0749cdfec3bb808e68d56aaef465b6cc24cf1 100644
Binary files a/examples/scripts/sellar_problem/KDMS/Mdao_MDF-GS_mpg.kdms and b/examples/scripts/sellar_problem/KDMS/Mdao_MDF-GS_mpg.kdms differ
diff --git a/examples/scripts/sellar_problem/KDMS/Mdao_MDF-J_mpg.kdms b/examples/scripts/sellar_problem/KDMS/Mdao_MDF-J_mpg.kdms
index fcb3d67b1cdfdcec6f8202b5981124789e205824..7104a7da4c09e97423880a383b49ce60552f6d68 100644
Binary files a/examples/scripts/sellar_problem/KDMS/Mdao_MDF-J_mpg.kdms and b/examples/scripts/sellar_problem/KDMS/Mdao_MDF-J_mpg.kdms differ
diff --git a/examples/scripts/sellar_problem/KDMS/Mdao_converged-DOE-GS.kdms b/examples/scripts/sellar_problem/KDMS/Mdao_converged-DOE-GS.kdms
index 6521c6c9f7531e1b0c9969446ec62e9f6c25515c..8b38960c4c3d232ce75078a225a440ddd11053ac 100644
Binary files a/examples/scripts/sellar_problem/KDMS/Mdao_converged-DOE-GS.kdms and b/examples/scripts/sellar_problem/KDMS/Mdao_converged-DOE-GS.kdms differ
diff --git a/examples/scripts/sellar_problem/KDMS/Mdao_converged-DOE-GS_mpg.kdms b/examples/scripts/sellar_problem/KDMS/Mdao_converged-DOE-GS_mpg.kdms
index 10fede1e2d7798288ce42a0537b112781825eb96..056292c54c9f0bd3fa531043153cde67dd4676ac 100644
Binary files a/examples/scripts/sellar_problem/KDMS/Mdao_converged-DOE-GS_mpg.kdms and b/examples/scripts/sellar_problem/KDMS/Mdao_converged-DOE-GS_mpg.kdms differ
diff --git a/examples/scripts/sellar_problem/KDMS/Mdao_converged-DOE-J_mpg.kdms b/examples/scripts/sellar_problem/KDMS/Mdao_converged-DOE-J_mpg.kdms
index 418def2a70be57eda4099c2a3aaf8bbe881ac546..68a1c9ba62a439b223e3ea11d839b9d90bd8dbba 100644
Binary files a/examples/scripts/sellar_problem/KDMS/Mdao_converged-DOE-J_mpg.kdms and b/examples/scripts/sellar_problem/KDMS/Mdao_converged-DOE-J_mpg.kdms differ
diff --git a/examples/scripts/sellar_problem/KDMS/Mdao_converged-MDA-GS_mpg.kdms b/examples/scripts/sellar_problem/KDMS/Mdao_converged-MDA-GS_mpg.kdms
index 62a58888d3af5d38c38890118657a8d890eab091..49250226a85bf7dc790e65a87f36a4e520b919e6 100644
Binary files a/examples/scripts/sellar_problem/KDMS/Mdao_converged-MDA-GS_mpg.kdms and b/examples/scripts/sellar_problem/KDMS/Mdao_converged-MDA-GS_mpg.kdms differ
diff --git a/examples/scripts/sellar_problem/KDMS/Mdao_converged-MDA-J.kdms b/examples/scripts/sellar_problem/KDMS/Mdao_converged-MDA-J.kdms
index 8aab5302efe21a535f8ff789ef5878b2cf14298f..d612a2c53b89a9f5919aff9de234e8c19bf0a90a 100644
Binary files a/examples/scripts/sellar_problem/KDMS/Mdao_converged-MDA-J.kdms and b/examples/scripts/sellar_problem/KDMS/Mdao_converged-MDA-J.kdms differ
diff --git a/examples/scripts/sellar_problem/KDMS/Mdao_converged-MDA-J_mpg.kdms b/examples/scripts/sellar_problem/KDMS/Mdao_converged-MDA-J_mpg.kdms
index b0865081ab6d58e47553d8559f76bb568b5e0dcb..061fe35a4312282d80ff3bb0410759dea69530f0 100644
Binary files a/examples/scripts/sellar_problem/KDMS/Mdao_converged-MDA-J_mpg.kdms and b/examples/scripts/sellar_problem/KDMS/Mdao_converged-MDA-J_mpg.kdms differ
diff --git a/examples/scripts/sellar_problem/KDMS/Mdao_unconverged-DOE-GS.kdms b/examples/scripts/sellar_problem/KDMS/Mdao_unconverged-DOE-GS.kdms
index 84b5effc8ce7d691ed1b0d422449013043475a9c..dfd7f7d1c50d5707025dbba79116269eef4339f7 100644
Binary files a/examples/scripts/sellar_problem/KDMS/Mdao_unconverged-DOE-GS.kdms and b/examples/scripts/sellar_problem/KDMS/Mdao_unconverged-DOE-GS.kdms differ
diff --git a/examples/scripts/sellar_problem/KDMS/Mdao_unconverged-DOE-GS_mpg.kdms b/examples/scripts/sellar_problem/KDMS/Mdao_unconverged-DOE-GS_mpg.kdms
index 78eb5e0af4482a65bf5a59fc6161856837e75922..18f8d0bb1cd37f1ac789f7776b1de8df0afc6fa5 100644
Binary files a/examples/scripts/sellar_problem/KDMS/Mdao_unconverged-DOE-GS_mpg.kdms and b/examples/scripts/sellar_problem/KDMS/Mdao_unconverged-DOE-GS_mpg.kdms differ
diff --git a/examples/scripts/sellar_problem/KDMS/Mdao_unconverged-DOE-J.kdms b/examples/scripts/sellar_problem/KDMS/Mdao_unconverged-DOE-J.kdms
index fa2b11a785f104aa5632cbc1cf293773f7e664ec..b17650fd3594862337bdc7fad65a8e227a3f11ef 100644
Binary files a/examples/scripts/sellar_problem/KDMS/Mdao_unconverged-DOE-J.kdms and b/examples/scripts/sellar_problem/KDMS/Mdao_unconverged-DOE-J.kdms differ
diff --git a/examples/scripts/sellar_problem/KDMS/Mdao_unconverged-DOE-J_mpg.kdms b/examples/scripts/sellar_problem/KDMS/Mdao_unconverged-DOE-J_mpg.kdms
index 65ec7e7c5e2d913f82d49480ace9df71215c6af6..84ddf81fc6cb2d36527981f2dddd5d688da0f06c 100644
Binary files a/examples/scripts/sellar_problem/KDMS/Mdao_unconverged-DOE-J_mpg.kdms and b/examples/scripts/sellar_problem/KDMS/Mdao_unconverged-DOE-J_mpg.kdms differ
diff --git a/examples/scripts/sellar_problem/KDMS/Mdao_unconverged-MDA-GS_mpg.kdms b/examples/scripts/sellar_problem/KDMS/Mdao_unconverged-MDA-GS_mpg.kdms
index f37854890f419fd59f7fa1c09b8938e4cf37595e..fcca3ec99162c42cf2a4caf036464a8f134f93d7 100644
Binary files a/examples/scripts/sellar_problem/KDMS/Mdao_unconverged-MDA-GS_mpg.kdms and b/examples/scripts/sellar_problem/KDMS/Mdao_unconverged-MDA-GS_mpg.kdms differ
diff --git a/examples/scripts/sellar_problem/KDMS/Mdao_unconverged-MDA-J_mpg.kdms b/examples/scripts/sellar_problem/KDMS/Mdao_unconverged-MDA-J_mpg.kdms
index 59969fafe01ab8e5cb66c1da489ac3546f8067da..b84b62cabac864f0427f4d2bb888f6f9ee41b138 100644
Binary files a/examples/scripts/sellar_problem/KDMS/Mdao_unconverged-MDA-J_mpg.kdms and b/examples/scripts/sellar_problem/KDMS/Mdao_unconverged-MDA-J_mpg.kdms differ
diff --git a/kadmos/graph/graph_kadmos.py b/kadmos/graph/graph_kadmos.py
index 90de20c769625ad2643a48ec3b1dc1432e2ff265..b15cc8b4afee9042771de269d586c49964839c14 100644
--- a/kadmos/graph/graph_kadmos.py
+++ b/kadmos/graph/graph_kadmos.py
@@ -586,7 +586,7 @@ class KadmosGraph(nx.DiGraph, EquationMixin, VistomsMixin):
logger.info('Creating the (X)DSM file ' + file_path + '.pdf...')
graph = self.deepcopy()
if mpg is not None:
- graph_mpg = mpg.cleancopy()
+ graph_mpg = mpg.deepcopy()
# Check
test = (graph.find_all_nodes(category='variable', subcategory='all problematic variables') or
diff --git a/kadmos/graph/graph_process.py b/kadmos/graph/graph_process.py
index 7c950f49727bb21d2d928a8dbc313ad166f8aef4..688a994150429723ae74c44fee0a7b94d76ed11e 100644
--- a/kadmos/graph/graph_process.py
+++ b/kadmos/graph/graph_process.py
@@ -20,18 +20,6 @@ class ProcessGraph(KadmosGraph, MdaoMixin):
def __init__(self, *args, **kwargs):
super(ProcessGraph, self).__init__(*args, **kwargs)
- def cleancopy(self):
- """Method to make a clean copy of a graph.
-
- This method can be used to avoid deep-copy problems in graph manipulation algorithms.
- The graph class is kept.
-
- :return: clean-copy of the graph
- :rtype: ProcessGraph
- """
-
- return ProcessGraph(self)
-
# ---------------------------------------------------------------------------------------------------------------- #
# CREATE METHODS #
# ---------------------------------------------------------------------------------------------------------------- #
@@ -115,18 +103,6 @@ class MdaoProcessGraph(ProcessGraph):
self.graph['function_ordering'] = mg_function_ordering
del self.graph['fpg']
- def cleancopy(self):
- """Method to make a clean copy of a graph.
-
- This method can be used to avoid deep-copy problems in graph manipulation algorithms.
- The graph class is kept.
-
- :return: clean-copy of the graph
- :rtype: MdaoProcessGraph
- """
-
- return MdaoProcessGraph(self)
-
# ---------------------------------------------------------------------------------------------------------------- #
# CHECKING METHODS #
# ---------------------------------------------------------------------------------------------------------------- #
@@ -558,8 +534,111 @@ class MdaoProcessGraph(ProcessGraph):
# Local variables
coor_str = self.COORDINATOR_STRING
- # Make cleancopy of the graph
- graph = self.cleancopy()
+ # Make a view copy of the graph
+ graph = self.deepcopy()
+
+ # Determine the iterative nodes present in the graph (coordinator, optimizer, doe, converger)
+ iterative_nodes = graph.find_all_nodes(attr_cond=['architecture_role', 'in',
+ graph.ARCHITECTURE_CATS['all iterative blocks']])
+
+ # Get the precoup and preiter functions and remove them
+ ignored_funcs = graph.find_all_nodes(attr_cond=['architecture_role', 'in',
+ graph.ARCHITECTURE_CATS['all pre-iter analyses']])
+
+ # Use the MPG to find the architecture of iterative nodes (nested, parallel, etc)
+ mpg_cycles = nx.simple_cycles(nx.DiGraph(graph))
+ ini_cycles = []
+ top_level_iterators = set()
+ for node_list in mpg_cycles:
+ # Find the cycles that have the Coordinator object in them
+ if coor_str in node_list:
+ assert graph.node[coor_str]['diagonal_position'] == 0, "Position of coordinator is expected at 0."
+ ini_cycles.append(node_list)
+ # Find the top-level iterators (these are iterators that are in a cycle with the Coordinator)
+ if coor_str in node_list and set(node_list).intersection(set(iterative_nodes)):
+ tli = list(set(node_list).intersection(set(iterative_nodes)))
+ top_level_iterators.update(tli)
+ # If an iterators is not top level, then it should be nested somehow
+ nested_iterators = set(iterative_nodes).difference(top_level_iterators)
+
+ # As the top-level and nested iterators have been found, we can now use a new loop to identify which nodes
+ # belong to each other. So how the nested iterators belong to top-level iterators and which nodes are part of
+ # the nested iterators.
+ process_iter_nesting = dict()
+ process_func_nesting = dict()
+ mpg_cycles = nx.simple_cycles(nx.DiGraph(graph))
+ for node_list in mpg_cycles:
+ nested_iter = set(node_list).intersection(nested_iterators)
+ top_iter = set(node_list).intersection(top_level_iterators)
+ if nested_iter and top_iter:
+ assert len(top_iter) == 1, 'Only one top-level iterator can be in a cycle.'
+ assert len(nested_iter) == 1, 'Only one nested iterator can be in a cycle (for now).'
+ if list(top_iter)[0] in process_iter_nesting and list(nested_iter)[0] not in \
+ process_iter_nesting[list(top_iter)[0]]:
+ process_iter_nesting[list(top_iter)[0]].append(list(nested_iter)[0])
+ else:
+ process_iter_nesting[list(top_iter)[0]] = [list(nested_iter)[0]]
+ # Add the functions on these cycles to the top-level iterator
+ function_nodes = node_list
+ function_nodes.remove(list(top_iter)[0])
+ function_nodes.remove(list(nested_iter)[0])
+ function_nodes = remove_if_exists(function_nodes, ignored_funcs)
+ if list(top_iter)[0] in process_func_nesting:
+ process_func_nesting[list(top_iter)[0]].update(function_nodes)
+ else:
+ process_func_nesting[list(top_iter)[0]] = set(function_nodes)
+
+ # For the internal cycles of the nested loop, add the functions that are part of the nested iterator to
+ # a dict
+ elif nested_iter and not top_iter:
+ assert len(nested_iter) == 1, 'Only one nested iterator can be in a cycle (for now).'
+ function_nodes = node_list
+ function_nodes.remove(list(nested_iter)[0])
+ function_nodes = remove_if_exists(function_nodes, ignored_funcs)
+ if list(nested_iter)[0] in process_func_nesting:
+ process_func_nesting[list(nested_iter)[0]].update(function_nodes)
+ else:
+ process_func_nesting[list(nested_iter)[0]] = set(function_nodes)
+ # For the top-level iterators, also add the functions associated with the iterator
+ elif not nested_iter and top_iter:
+ assert len(top_iter) == 1, 'Only one nested iterator can be in a cycle (for now).'
+ function_nodes = node_list
+ function_nodes.remove(list(top_iter)[0])
+ function_nodes = remove_if_exists(function_nodes, ignored_funcs)
+ if coor_str in function_nodes:
+ function_nodes.remove(coor_str)
+ if list(top_iter)[0] in process_func_nesting:
+ process_func_nesting[list(top_iter)[0]].update(function_nodes)
+ else:
+ process_func_nesting[list(top_iter)[0]] = set(function_nodes)
+
+ # Make functions sets into lists
+ for key, item in process_func_nesting.iteritems():
+ process_func_nesting[key] = list(item)
+
+ # Create final dictionary with process info
+ process_info = dict(iter_nesting=process_iter_nesting, function_grouping=process_func_nesting)
+
+ # Determine all the functions that are nested into a nested iterator
+ nested_functions = []
+ for top_iter, nested_iters in process_info['iter_nesting'].iteritems():
+ for nested_iter in nested_iters:
+ nested_functions.extend(process_info['function_grouping'][nested_iter])
+
+ return iterative_nodes, process_info, nested_functions
+
+ def get_nested_process_ordering2(self):
+ """Method to determine the nesting of iterative elements in the process graph.
+
+ :return: tuple with iterative_nodes, process_info dictionary, and nested_functions list
+ :rtype: tuple
+ """
+
+ # Local variables
+ coor_str = self.COORDINATOR_STRING
+
+ # Make a view copy of the graph
+ graph = self.deepcopy()
# Determine the iterative nodes present in the graph (coordinator, optimizer, doe, converger)
iterative_nodes = graph.find_all_nodes(attr_cond=['architecture_role', 'in',