From 84b0351742da931156a128e618d5377400e01f1f Mon Sep 17 00:00:00 2001 From: relf Date: Thu, 5 Dec 2019 11:32:01 +0100 Subject: [PATCH] update XDSMjs following bugfix --- mdf.json | 316 ------------------------------------------------- xdsm.json.sav | 315 ------------------------------------------------ xdsm.json.sav2 | 123 ------------------- 3 files changed, 754 deletions(-) delete mode 100644 mdf.json delete mode 100644 xdsm.json.sav delete mode 100644 xdsm.json.sav2 diff --git a/mdf.json b/mdf.json deleted file mode 100644 index 94f3b2b..0000000 --- a/mdf.json +++ /dev/null @@ -1,316 +0,0 @@ -{ - "nodes": [ - { - "type": "optimization", - "id": "Opt", - "name": "SLSQP" - }, - { - "type": "mda", - "id": "Dis1", - "name": "MDAGaussSeidel" - }, - { - "type": "analysis", - "id": "Dis2", - "name": "Propulsion" - }, - { - "type": "analysis", - "id": "Dis3", - "name": "Aerodynamics" - }, - { - "type": "analysis", - "id": "Dis4", - "name": "Mission" - }, - { - "type": "analysis", - "id": "Dis5", - "name": "Structure" - } - ], - "edges": [ - { - "to": "Opt", - "from": "_U_", - "name": "x_1^(0), x_2^(0), x_3^(0), x_shared^(0)" - }, - { - "to": "_U_", - "from": "Opt", - "name": "y_4^*" - }, - { - "to": "Dis1", - "from": "Opt", - "name": "x_2, x_shared, x_3, x_1" - }, - { - "to": "Opt", - "from": "Dis1", - "name": "y_4" - }, - { - "to": "Dis2", - "from": "Opt", - "name": "x_shared, x_3" - }, - { - "to": "Dis3", - "from": "Opt", - "name": "x_2, x_shared" - }, - { - "to": "Dis4", - "from": "Opt", - "name": "x_shared" - }, - { - "to": "Opt", - "from": "Dis4", - "name": "y_4" - }, - { - "to": "Dis5", - "from": "Opt", - "name": "x_shared, x_1" - }, - { - "to": "_U_", - "from": "Dis2", - "name": "y_31^*, y_32^*, y_3^*, y_34^*, g_3^*" - }, - { - "to": "_U_", - "from": "Dis3", - "name": "y_21^*, y_24^*, y_23^*, y_2^*, g_2^*" - }, - { - "to": "Opt", - "from": "Dis4", - "name": "y_4" - }, - { - "to": "_U_", - "from": "Dis5", - "name": "y_12^*, y_11^*, g_1^*, y_1^*, y_14^*" - }, - { - "to": "Dis2", - "from": "Dis1", - "name": "y_34, g_1, y_4, y_3, y_2, g_3, g_2, y_12, y_11, y_1, y_14, y_31, y_24, y_32, y_23, y_21" - }, - { - "to": "Dis1", - "from": "Dis2", - "name": "y_31, y_32, y_3, y_34, g_3" - }, - { - "to": "Dis3", - "from": "Dis1", - "name": "y_34, g_1, y_4, y_3, y_2, g_3, g_2, y_12, y_11, y_1, y_14, y_31, y_24, y_32, y_23, y_21" - }, - { - "to": "Dis1", - "from": "Dis3", - "name": "y_21, y_24, g_2, y_2, y_23" - }, - { - "to": "Dis4", - "from": "Dis1", - "name": "y_34, g_1, y_4, y_3, y_2, g_3, g_2, y_12, y_11, y_1, y_14, y_31, y_24, y_32, y_23, y_21" - }, - { - "to": "Dis1", - "from": "Dis4", - "name": "y_4" - }, - { - "to": "Dis5", - "from": "Dis1", - "name": "y_34, g_1, y_4, y_3, y_2, g_3, g_2, y_12, y_11, y_1, y_14, y_31, y_24, y_32, y_23, y_21" - }, - { - "to": "Dis1", - "from": "Dis5", - "name": "y_12, y_11, g_1, y_1, y_14" - }, - { - "to": "Dis1", - "from": "Dis2", - "name": "y_31, y_32, y_3, y_34, g_3" - }, - { - "to": "Dis2", - "from": "Dis1", - "name": "y_34, g_1, y_4, y_3, y_2, g_3, g_2, y_12, y_11, y_1, y_14, y_31, y_24, y_32, y_23, y_21" - }, - { - "to": "Dis3", - "from": "Dis2", - "name": "y_31, y_32, y_3, y_34, g_3" - }, - { - "to": "Dis2", - "from": "Dis3", - "name": "y_21, y_24, g_2, y_2, y_23" - }, - { - "to": "Dis4", - "from": "Dis2", - "name": "y_31, y_32, y_3, y_34, g_3" - }, - { - "to": "Dis2", - "from": "Dis4", - "name": "y_4" - }, - { - "to": "Dis5", - "from": "Dis2", - "name": "y_31, y_32, y_3, y_34, g_3" - }, - { - "to": "Dis2", - "from": "Dis5", - "name": "y_12, y_11, g_1, y_1, y_14" - }, - { - "to": "Dis1", - "from": "Dis3", - "name": "y_21, y_24, g_2, y_2, y_23" - }, - { - "to": "Dis3", - "from": "Dis1", - "name": "y_34, g_1, y_4, y_3, y_2, g_3, g_2, y_12, y_11, y_1, y_14, y_31, y_24, y_32, y_23, y_21" - }, - { - "to": "Dis2", - "from": "Dis3", - "name": "y_21, y_24, g_2, y_2, y_23" - }, - { - "to": "Dis3", - "from": "Dis2", - "name": "y_31, y_32, y_3, y_34, g_3" - }, - { - "to": "Dis4", - "from": "Dis3", - "name": "y_21, y_24, g_2, y_2, y_23" - }, - { - "to": "Dis3", - "from": "Dis4", - "name": "y_4" - }, - { - "to": "Dis5", - "from": "Dis3", - "name": "y_21, y_24, g_2, y_2, y_23" - }, - { - "to": "Dis3", - "from": "Dis5", - "name": "y_12, y_11, g_1, y_1, y_14" - }, - { - "to": "Dis1", - "from": "Dis4", - "name": "y_4" - }, - { - "to": "Dis4", - "from": "Dis1", - "name": "y_34, g_1, y_4, y_3, y_2, g_3, g_2, y_12, y_11, y_1, y_14, y_31, y_24, y_32, y_23, y_21" - }, - { - "to": "Dis2", - "from": "Dis4", - "name": "y_4" - }, - { - "to": "Dis4", - "from": "Dis2", - "name": "y_31, y_32, y_3, y_34, g_3" - }, - { - "to": "Dis3", - "from": "Dis4", - "name": "y_4" - }, - { - "to": "Dis4", - "from": "Dis3", - "name": "y_21, y_24, g_2, y_2, y_23" - }, - { - "to": "Dis5", - "from": "Dis4", - "name": "y_4" - }, - { - "to": "Dis4", - "from": "Dis5", - "name": "y_12, y_11, g_1, y_1, y_14" - }, - { - "to": "Dis1", - "from": "Dis5", - "name": "y_12, y_11, g_1, y_1, y_14" - }, - { - "to": "Dis5", - "from": "Dis1", - "name": "y_34, g_1, y_4, y_3, y_2, g_3, g_2, y_12, y_11, y_1, y_14, y_31, y_24, y_32, y_23, y_21" - }, - { - "to": "Dis2", - "from": "Dis5", - "name": "y_12, y_11, g_1, y_1, y_14" - }, - { - "to": "Dis5", - "from": "Dis2", - "name": "y_31, y_32, y_3, y_34, g_3" - }, - { - "to": "Dis3", - "from": "Dis5", - "name": "y_12, y_11, g_1, y_1, y_14" - }, - { - "to": "Dis5", - "from": "Dis3", - "name": "y_21, y_24, g_2, y_2, y_23" - }, - { - "to": "Dis4", - "from": "Dis5", - "name": "y_12, y_11, g_1, y_1, y_14" - }, - { - "to": "Dis5", - "from": "Dis4", - "name": "y_4" - } - ], - "workflow": [ - "_U_", - [ - "Opt", - [ - "Dis1", - [ - "Dis2", - "Dis3", - "Dis4", - "Dis5" - ] - ] - ] - ] -} \ No newline at end of file diff --git a/xdsm.json.sav b/xdsm.json.sav deleted file mode 100644 index c9cb9a2..0000000 --- a/xdsm.json.sav +++ /dev/null @@ -1,315 +0,0 @@ -{ - "subopt-i": { - "nodes": [ - { - "type": "optimization", - "id": "Opt", - "name": "DisciplineOptimization_i" - }, - { - "type": "analysis", - "id": "Dis1", - "name": "Analysis_i" - }, - { - "type": "function", - "id": "Dis2", - "name": "SystemFunctions" - }, - { - "type": "function", - "id": "Dis3", - "name": "DisciplineFunctions" - }, - { - "type": "function", - "id": "Dis4", - "name": "DisciplineVarDerivatives_i" - } - ], - "edges": [ - { - "to": "Opt", - "from": "_U_", - "name": "x_i" - }, - { - "to": "_U_", - "from": "Opt", - "name": "x_i^*, y_i^*" - }, - { - "to": "Dis1", - "from": "Opt", - "name": "x_i" - }, - { - "to": "Opt", - "from": "Dis1", - "name": "y_i" - }, - { - "to": "Dis2", - "from": "Dis1", - "name": "x_i, y_i" - }, - { - "to": "Dis3", - "from": "Dis1", - "name": "x_i, y_i" - }, - { - "to": "Dis4", - "from": "Dis1", - "name": "x_i, y_i" - }, - { - "to": "Opt", - "from": "Dis2", - "name": "f_0, c_0" - }, - { - "to": "Opt", - "from": "Dis3", - "name": "f_i, c_i" - }, - { - "to": "Opt", - "from": "Dis4", - "name": "df_xi, dc_xi" - }, - { - "to": "Dis1", - "from": "_U_", - "name": "yest_j" - }, - { - "to": "Dis2", - "from": "_U_", - "name": "yest_j" - }, - { - "to": "Dis3", - "from": "_U_", - "name": "yest_j" - }, - { - "to": "Dis4", - "from": "_U_", - "name": "yest_j" - }, - { - "to": "_U_", - "from": "Dis2", - "name": "f_0, c_0" - }, - { - "to": "_U_", - "from": "Dis3", - "name": "f_i, c_i" - } - ], - "workflow": [ - "_U_", - [ - "Opt", - [ - "Dis1", - { - "parallel": [ - "Dis2", - "Dis3", - "Dis4" - ] - } - ] - ] - ], - "optpb": "Minimize (f0)0 + (df/dxi)Dxi\nwith respect to Dxi\nsubject to (c0)0 + (dc0/dxi)Dxi >= 0\n (ci)0 + (dci/dxi)Dxi >= 0\n Dxi_L <= Dxi <= Dxi_U " - }, - "root": { - "nodes": [ - { - "type": "mda", - "id": "Dis1", - "name": "ConvergenceCheck" - }, - { - "type": "mda", - "id": "Mda", - "name": "MDA" - }, - { - "type": "optimization", - "id": "Opt", - "name": "SystemOptimization" - }, - { - "type": "sub-optimization_multi", - "id": "Mdo", - "name": "DisciplineOptimization_i", - "subxdsm": "subopt-i" - }, - { - "type": "function", - "id": "Dis2", - "name": "SystemFunctions" - }, - { - "type": "function", - "id": "Dis4", - "name": "DisciplineFunctions" - }, - { - "type": "function", - "id": "Dis3", - "name": "SharedVarDerivatives" - }, - { - "type": "analysis_multi", - "id": "Dis5", - "name": "Analysis_i" - } - ], - "edges": [ - { - "to": "Dis1", - "from": "_U_", - "name": "x^(0)" - }, - { - "to": "_U_", - "from": "Dis1", - "name": "NoData" - }, - { - "to": "Mda", - "from": "_U_", - "name": "yest^(0)" - }, - { - "to": "Dis5", - "from": "Mda", - "name": "yest_j" - }, - { - "to": "Dis5", - "from": "Mda", - "name": "yest_j" - }, - { - "to": "Dis5", - "from": "Mda", - "name": "yest_j" - }, - { - "to": "Mda", - "from": "Dis5", - "name": "y_i" - }, - { - "to": "Opt", - "from": "_U_", - "name": "x_0^(0)" - }, - { - "to": "Mdo", - "from": "_U_", - "name": "x_i^(0)" - }, - { - "to": "_U_", - "from": "Opt", - "name": "x_0^*" - }, - { - "to": "_U_", - "from": "Mdo", - "name": "x_i^*, y_i^*" - }, - { - "to": "Dis1", - "from": "Opt", - "name": "x_0" - }, - { - "to": "Dis1", - "from": "Opt", - "name": "x_0" - }, - { - "to": "Opt", - "from": "Dis3", - "name": "df_x0, dc_x0" - }, - { - "to": "Dis3", - "from": "Opt", - "name": "x_0" - }, - { - "to": "Mdo", - "from": "Opt", - "name": "x_0" - }, - { - "to": "Opt", - "from": "Mdo", - "name": "f_0, c_0, f_i, c_i" - }, - { - "to": "Opt", - "from": "Dis2", - "name": "f_0, c_0" - }, - { - "to": "Opt", - "from": "Dis4", - "name": "f_i, c_i" - }, - { - "to": "Dis1", - "from": "Mdo", - "name": "x_i" - }, - { - "to": "Dis2", - "from": "Opt", - "name": "x_0" - }, - { - "to": "Dis4", - "from": "Opt", - "name": "x_0" - }, - { - "to": "Mdo", - "from": "Mda", - "name": "yest_j" - } - ], - "workflow": [ - "_U_", - [ - "Dis1", - [ - "Mda", - [ - "Dis5" - ], - "Mdo", - "Opt", - { - "parallel": [ - "Dis3", - "Dis2", - "Dis4" - ] - }, - "Opt" - ] - ] - ], - "optpb": "Minimize (f0*)0 + (df0*/dx0)Dx0 \nwith respect to Dx0\nsubject to (c0*)0 + (dc0*/dx0)Dx0 >= 0\n (ci*)0 + (dci*/dx0)Dx0 >= 0\n Dx0_L <= Dx0 <= Dx0_U" - } -} \ No newline at end of file diff --git a/xdsm.json.sav2 b/xdsm.json.sav2 deleted file mode 100644 index ee896da..0000000 --- a/xdsm.json.sav2 +++ /dev/null @@ -1,123 +0,0 @@ -{"root": -{ - "edges": [ - { - "to": "ground", - "from": "Driver", - "name": [ - "V" - ] - }, - { - "to": "_U_", - "from": "ground", - "name": [ - "V^*" - ] - }, - { - "to": "_U_", - "from": "Driver", - "name": [ - "V^*" - ] - }, - { - "to": "Driver", - "from": "_U_", - "name": [ - "V^(0)" - ] - }, - { - "to": "source", - "from": "Driver", - "name": [ - "I" - ] - }, - { - "to": "_U_", - "from": "source", - "name": [ - "I^*" - ] - }, - { - "to": "_U_", - "from": "Driver", - "name": [ - "I^*" - ] - }, - { - "to": "Driver", - "from": "_U_", - "name": [ - "I^(0)" - ] - }, - { - "to": "Driver", - "from": "circuit", - "name": [ - "I" - ] - }, - { - "to": "_U_", - "from": "circuit", - "name": [ - "I^*" - ] - }, - { - "to": "circuit", - "from": "ground", - "name": [ - "V" - ] - }, - { - "to": "circuit", - "from": "source", - "name": [ - "I" - ] - } - ], - "nodes": [ - { - "type": "optimization", - "id": "Driver", - "name": "Driver" - }, - { - "type": "function", - "id": "ground", - "name": "ground" - }, - { - "type": "function", - "id": "source", - "name": "source" - }, - { - "type": "function", - "id": "circuit", - "name": "circuit" - } - ], - "workflow": [ - "_U_", - [ - "Driver", - [ - "ground", - "source", - "circuit" - ] - ] - ] -} -} \ No newline at end of file