Skip to content
Snippets Groups Projects
Commit f69cef14 authored by imcovangent's avatar imcovangent
Browse files

commit before branch change 

Former-commit-id: 164e89f4e350a5c4646fd06e568aebe787b33eda
parent 9f50ed6b
No related branches found
No related tags found
No related merge requests found
Pipeline #192571 canceled
Stage: build
Stage: test
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 692 additions and 670 deletions
pyKADMOS/sample/graph.py
+ 23
− 25
View file @ f69cef14
......@@ -1594,7 +1594,7 @@ class KadmosGraph(nx.DiGraph):
# Make a first new node
idx = 1
new_node = self.copy_node_with_suffix(node, '/variableInstance' + str(idx), '^{vi' + str(idx) + '}',
is_variable_instance=True)
variable_instance=idx, related_to_schema_node=node)
for func in function_order:
if func in target_funcs:
self.add_edge(new_node, func)
......@@ -1606,7 +1606,7 @@ class KadmosGraph(nx.DiGraph):
if idx == 1:
idx += 1
new_node = self.copy_node_with_suffix(node, '/variableInstance'+str(idx), '^{vi'+str(idx)+'}',
is_variable_instance=True)
variable_instance=idx, related_to_schema_node=node)
idx += 1
self.add_edge(func, new_node)
self.remove_edge(func, node)
......@@ -1625,12 +1625,15 @@ class KadmosGraph(nx.DiGraph):
print_nodes = nodes[0:max_nodes]
else:
print_nodes = nodes
for node in nodes:
for node in print_nodes:
print 'Node: ' + str(node)
if len(nodes) > max_nodes:
print '...and ' + str(len(nodes)-max_nodes) + ' additional nodes.'
else:
print 'None'
print ''
 
def split_all_variables(self, print_in_log=False):
"""
Method to simply split all problematic variables that can be split using the split_variables()
......@@ -7128,23 +7131,23 @@ class MdaoDataGraph(KadmosGraph):
opfs_unsorted = [(opf, rce_graph.node[opf]['diagonal_position']) for opf in opfs]
opfs_sorted = [item[0] for item in sorted(opfs_unsorted, key=itemgetter(1))]
 
print 'CHECK&$%'
print 'precoup:'
print precoup_sorted
print 'preiter:'
print preiter_sorted
print 'postiter:'
print postiter_sorted
print 'coups:'
print coups_sorted
print 'iofs:'
print iofs_sorted
print 'opfs:'
print opfs_sorted
print 'iterative analysis:'
print iterative_nodes
print process_info
print nested_functions
# print 'CHECK&$%'
# print 'precoup:'
# print precoup_sorted
# print 'preiter:'
# print preiter_sorted
# print 'postiter:'
# print postiter_sorted
# print 'coups:'
# print coups_sorted
# print 'iofs:'
# print iofs_sorted
# print 'opfs:'
# print opfs_sorted
# print 'iterative analysis:'
# print iterative_nodes
# print process_info
# print nested_functions
 
# Appendices for iter node names:
first_iter_name_app = '-start_values'
......@@ -7778,9 +7781,6 @@ class MdaoDataGraph(KadmosGraph):
if self.DOE_STRING in iterative_nodes:
nodes_of_interest.remove(coor_lab + '-in')
for node_of_interest in nodes_of_interest:
print 'CHECK^&^'
print node_of_interest
print rce_graph.inspect_node(node_of_interest)
# Check incoming edges
node_in_degree = rce_graph.in_degree(node_of_interest)
indegree_limit = 1 if node_of_interest != self.CONSCONS_STRING else 2
......@@ -8045,8 +8045,6 @@ class MdaoDataGraph(KadmosGraph):
for edge in all_edges:
# For connections between input providers and XML PyMergers the input of the XML PyMerger should be made
# constant
print 'CHECK EDGE!'
print edge
if rce_graph.node[edge[0]]['rce_role'] == self.RCE_ROLES_FUNS[0] and \
rce_graph.node[edge[1]]['rce_role'] == self.RCE_ROLES_FUNS[3]: # Input Pr. or XML PyMerger
if 'rce_specific' in edge:
......
pyKADMOS/scripts/RCE_workingdirectory/.metadata/.log
+ 23
− 0
View file @ f69cef14
......@@ -7333,3 +7333,26 @@ java.io.FileNotFoundException: Z:\Users\imcovangent\Documents\PhD\Software\KADMO
at org.eclipse.core.internal.resources.SaveManager.save(SaveManager.java:1109)
at org.eclipse.core.internal.resources.DelayedSnapshotJob.run(DelayedSnapshotJob.java:51)
at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
!SESSION 2017-03-23 15:24:01.355 -----------------------------------------------
eclipse.buildId=unknown
java.version=1.8.0_121
java.vendor=Oracle Corporation
BootLoader constants: OS=win32, ARCH=x86, WS=win32, NL=en
Command-line arguments: -os win32 -ws win32 -arch x86 -clean
!ENTRY org.eclipse.core.resources 4 568 2017-03-23 15:30:46.699
!MESSAGE Could not write metadata for '/AGILE_DC1_MDA'.
!STACK 0
java.io.FileNotFoundException: Z:\Users\imcovangent\Documents\PhD\Software\KADMOS\pyKADMOS\scripts\RCE_workingdirectory\.metadata\.plugins\org.eclipse.core.resources\.projects\AGILE_DC1_MDA\.markers.snap (The system cannot find the path specified)
at java.io.FileOutputStream.open0(Native Method)
at java.io.FileOutputStream.open(Unknown Source)
at java.io.FileOutputStream.<init>(Unknown Source)
at java.io.FileOutputStream.<init>(Unknown Source)
at org.eclipse.core.internal.localstore.SafeChunkyOutputStream.<init>(SafeChunkyOutputStream.java:45)
at org.eclipse.core.internal.localstore.SafeChunkyOutputStream.<init>(SafeChunkyOutputStream.java:41)
at org.eclipse.core.internal.resources.SaveManager.visitAndSnap(SaveManager.java:1685)
at org.eclipse.core.internal.resources.SaveManager.visitAndSnap(SaveManager.java:1768)
at org.eclipse.core.internal.resources.SaveManager.save(SaveManager.java:1167)
at org.eclipse.core.internal.resources.SaveManager.save(SaveManager.java:1109)
at org.eclipse.core.internal.resources.DelayedSnapshotJob.run(DelayedSnapshotJob.java:51)
at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)
pyKADMOS/scripts/RCE_workingdirectory/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
+ 59
− 55
View file @ f69cef14
......@@ -34,11 +34,12 @@
<part id="0"/>
<part id="1"/>
<part id="2"/>
<part id="3"/>
</presentation>
</folder>
</info>
</editorArea>
<editor focus="true" id="de.rcenvironment.rce.gui.workflow.editor.WorkflowEditor" name="test_all_tools.wf" partName="test_all_tools.wf" path="Z:/Users/imcovangent/Documents/PhD/Software/KADMOS/pyKADMOS/scripts/RCE_workingdirectory/TUD_case_study/test_all_tools.wf" title="test_all_tools.wf" tooltip="TUD_case_study/test_all_tools.wf" workbook="DefaultEditorWorkbook">
<editor id="de.rcenvironment.rce.gui.workflow.editor.WorkflowEditor" name="test_all_tools.wf" partName="test_all_tools.wf" path="Z:/Users/imcovangent/Documents/PhD/Software/KADMOS/pyKADMOS/scripts/RCE_workingdirectory/TUD_case_study/test_all_tools.wf" title="test_all_tools.wf" tooltip="TUD_case_study/test_all_tools.wf" workbook="DefaultEditorWorkbook">
<input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/TUD_case_study/test_all_tools.wf"/>
</editor>
<editor id="de.rcenvironment.rce.gui.workflow.editor.WorkflowEditor" name="sellarProblem_IDF.wf" partName="sellarProblem_IDF.wf" path="Z:/Users/imcovangent/Documents/PhD/Software/KADMOS/pyKADMOS/scripts/RCE_workingdirectory/scriptedWorkflowsSellar/sellarProblem_IDF.wf" title="sellarProblem_IDF.wf" tooltip="scriptedWorkflowsSellar/sellarProblem_IDF.wf" workbook="DefaultEditorWorkbook">
......@@ -47,6 +48,9 @@
<editor id="de.rcenvironment.rce.gui.workflow.editor.WorkflowEditor" name="converge_MTOM.wf" partName="converge_MTOM.wf" path="Z:/Users/imcovangent/Documents/PhD/Software/KADMOS/pyKADMOS/scripts/RCE_workingdirectory/TUD_case_study/converge_MTOM.wf" title="converge_MTOM.wf" tooltip="TUD_case_study/converge_MTOM.wf" workbook="DefaultEditorWorkbook">
<input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/TUD_case_study/converge_MTOM.wf"/>
</editor>
<editor activePart="true" focus="true" id="de.rcenvironment.rce.gui.workflow.editor.WorkflowEditor" name="TUDwingDesign_unconverged-DOE-GS.wf" partName="TUDwingDesign_unconverged-DOE-GS.wf" path="Z:/Users/imcovangent/Documents/PhD/Software/KADMOS/pyKADMOS/scripts/RCE_workingdirectory/scriptedTUDwingDesign/TUDwingDesign_unconverged-DOE-GS.wf" title="TUDwingDesign_unconverged-DOE-GS.wf" tooltip="scriptedTUDwingDesign/TUDwingDesign_unconverged-DOE-GS.wf" workbook="DefaultEditorWorkbook">
<input factoryID="org.eclipse.ui.part.FileEditorInputFactory" path="/scriptedTUDwingDesign/TUDwingDesign_unconverged-DOE-GS.wf"/>
</editor>
</editors>
<views>
<view id="org.eclipse.ui.views.PropertySheet" partName="Properties">
......@@ -68,7 +72,7 @@
<viewState CommonNavigator.LINKING_ENABLED="0" org.eclipse.ui.navigator.resources.workingSets.showTopLevelWorkingSets="1"/>
</view>
</views>
<perspectives activePerspective="de.rcenvironment.core">
<perspectives activePart="de.rcenvironment.rce.gui.workflow.editor.WorkflowEditor" activePerspective="de.rcenvironment.core">
<perspective editorAreaTrimState="2" editorAreaVisible="1" fixed="0" version="0.016">
<descriptor class="de.rcenvironment.core.start.gui.Perspective" id="de.rcenvironment.core" label="RCE"/>
<alwaysOnActionSet id="org.eclipse.ui.cheatsheets.actionSet"/>
......@@ -133,7 +137,6 @@
<navigationHistory>
<editors>
<editor factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="de.rcenvironment.rce.gui.workflow.editor.WorkflowEditor" path="/TUD_case_study/converge_MTOM.wf"/>
<editor factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="de.rcenvironment.rce.gui.workflow.editor.WorkflowEditor" path="/scriptedTUDwingDesign/TUDwingDesign_unconverged-MDA-J.wf"/>
<editor factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="de.rcenvironment.rce.gui.workflow.editor.WorkflowEditor" path="/TUD_case_study/test_all_tools.wf"/>
<editor factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="de.rcenvironment.rce.gui.workflow.editor.WorkflowEditor" path="/scriptedTUDwingDesign/TUDwingDesign_unconverged-MDA-GS.wf"/>
<editor factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="de.rcenvironment.rce.gui.workflow.editor.WorkflowEditor" path="/scriptedTUDwingDesign/TUDwingDesign_unconverged-MDA-J.wf"/>
......@@ -152,75 +155,76 @@
<editor factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="de.rcenvironment.rce.gui.workflow.editor.WorkflowEditor" path="/scriptedTUDwingDesign/TUDwingDesign_converged-MDA-J.wf"/>
<editor factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="de.rcenvironment.core.gui.workflow.editor.WorkflowRunEditor" path="/External Files/Users/IMCOVA~1/AppData/Local/Temp/rce-temp/default-1490025126699/2/c9a894cc-ac0d-472b-ae33-cfe272b12414.wfr"/>
<editor factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="de.rcenvironment.rce.gui.workflow.editor.WorkflowEditor" path="/scriptedTUDwingDesign/TUDwingDesign_unconverged-DOE-GS.wf"/>
<editor factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="de.rcenvironment.rce.gui.workflow.editor.WorkflowEditor" path="/scriptedTUDwingDesign/TUDwingDesign_unconverged-DOE-GS.wf"/>
</editors>
<item historyLabel="TUDwingDesign_unconverged-MDA-J.wf" index="1"/>
<item historyLabel="converge_MTOM.wf" index="0"/>
<item historyLabel="test_all_tools.wf" index="2"/>
<item historyLabel="TUDwingDesign_unconverged-MDA-GS.wf" index="3"/>
<item historyLabel="TUDwingDesign_unconverged-MDA-J.wf" index="4"/>
<item historyLabel="TUDwingDesign_unconverged-MDA-GS.wf" index="3"/>
<item historyLabel="test_all_tools.wf" index="2"/>
<item historyLabel="sellarProblem_converged-MDA-GS.wf" index="5"/>
<item historyLabel="test_all_tools.wf" index="2"/>
<item historyLabel="sellarProblem_IDF.wf" index="6"/>
<item historyLabel="TUDwingDesign_converged-MDA-GS.wf" index="7"/>
<item historyLabel="sellarProblem_IDF.wf" index="6"/>
<item historyLabel="TUDwingDesign_converged-MDA-GS.wf" index="7"/>
<item historyLabel="Workflow Viewer" index="8"/>
<item historyLabel="TUDwingDesign_converged-MDA-GS.wf" index="7"/>
<item historyLabel="test_all_tools.wf" index="9"/>
<item historyLabel="TUDwingDesign_converged-MDA-GS.wf" index="7"/>
<item historyLabel="Workflow Viewer" index="10"/>
<item historyLabel="CNSTRNT-merged_2modes_-1_err.log" index="11">
<item historyLabel="test_all_tools.wf" index="1"/>
<item historyLabel="TUDwingDesign_unconverged-MDA-GS.wf" index="2"/>
<item historyLabel="TUDwingDesign_unconverged-MDA-J.wf" index="3"/>
<item historyLabel="TUDwingDesign_unconverged-MDA-GS.wf" index="2"/>
<item historyLabel="test_all_tools.wf" index="1"/>
<item historyLabel="sellarProblem_converged-MDA-GS.wf" index="4"/>
<item historyLabel="test_all_tools.wf" index="1"/>
<item historyLabel="sellarProblem_IDF.wf" index="5"/>
<item historyLabel="TUDwingDesign_converged-MDA-GS.wf" index="6"/>
<item historyLabel="sellarProblem_IDF.wf" index="5"/>
<item historyLabel="TUDwingDesign_converged-MDA-GS.wf" index="6"/>
<item historyLabel="Workflow Viewer" index="7"/>
<item historyLabel="TUDwingDesign_converged-MDA-GS.wf" index="6"/>
<item historyLabel="test_all_tools.wf" index="8"/>
<item historyLabel="TUDwingDesign_converged-MDA-GS.wf" index="6"/>
<item historyLabel="Workflow Viewer" index="9"/>
<item historyLabel="CNSTRNT-merged_2modes_-1_err.log" index="10">
<position info="not_deleted" x="0" y="0"/>
</item>
<item historyLabel="Merger-output.xml" index="12">
<item historyLabel="Merger-output.xml" index="11">
<position info="not_deleted" x="0" y="0"/>
</item>
<item historyLabel="CNSTRNT-merged_2modes_-1_err.log" index="11">
<item historyLabel="CNSTRNT-merged_2modes_-1_err.log" index="10">
<position info="not_deleted" x="0" y="0"/>
</item>
<item historyLabel="cpacs_out.xml" index="13">
<item historyLabel="cpacs_out.xml" index="12">
<position info="not_deleted" x="17299" y="1"/>
</item>
<item historyLabel="Merger-output.xml" index="12">
<item historyLabel="Merger-output.xml" index="11">
<position info="not_deleted" x="0" y="0"/>
</item>
<item historyLabel="CNSTRNT-merged_2modes_-1_err.log" index="11">
<item historyLabel="CNSTRNT-merged_2modes_-1_err.log" index="10">
<position info="not_deleted" x="0" y="0"/>
</item>
<item historyLabel="TUDwingDesign_converged-MDA-GS2017-03-20_15:26:10_10: Failed" index="10"/>
<item historyLabel="TUDwingDesign_converged-MDA-GS.wf" index="7"/>
<item historyLabel="TUDwingDesign_converged-MDA-GS2017-03-20_15:26:10_10: Failed" index="10"/>
<item historyLabel="CNSTRNT-merged_2modes_-1_err.log" index="11">
<item historyLabel="TUDwingDesign_converged-MDA-GS2017-03-20_15:26:10_10: Failed" index="9"/>
<item historyLabel="TUDwingDesign_converged-MDA-GS.wf" index="6"/>
<item historyLabel="TUDwingDesign_converged-MDA-GS2017-03-20_15:26:10_10: Failed" index="9"/>
<item historyLabel="CNSTRNT-merged_2modes_-1_err.log" index="10">
<position info="not_deleted" x="0" y="0"/>
</item>
<item historyLabel="Merger-output.xml" index="12">
<item historyLabel="Merger-output.xml" index="11">
<position info="not_deleted" x="0" y="0"/>
</item>
<item historyLabel="cpacs_out.xml" index="13">
<item historyLabel="cpacs_out.xml" index="12">
<position info="not_deleted" x="17299" y="1"/>
</item>
<item historyLabel="test_all_tools.wf" index="9"/>
<item historyLabel="TUDwingDesign_converged-MDA-GS.wf" index="7"/>
<item historyLabel="test_all_tools.wf" index="9"/>
<item historyLabel="TUDwingDesign_converged-MDA-GS.wf" index="7"/>
<item historyLabel="test_all_tools.wf" index="9"/>
<item historyLabel="TUDwingDesign_converged-MDA-GS.wf" index="7"/>
<item historyLabel="Workflow Viewer" index="14"/>
<item historyLabel="TUDwingDesign_converged-MDA-GS.wf" index="7"/>
<item historyLabel="test_all_tools.wf" index="15"/>
<item historyLabel="TUDwingDesign_converged-MDA-GS.wf" index="7"/>
<item historyLabel="Workflow Viewer" index="16"/>
<item historyLabel="TUDwingDesign_converged-MDA-GS.wf" index="7"/>
<item historyLabel="TUDwingDesign_converged-MDA-J.wf" index="17"/>
<item historyLabel="Workflow Viewer" index="18"/>
<item historyLabel="TUDwingDesign_converged-MDA-J.wf" index="17"/>
<item historyLabel="TUDwingDesign_converged-MDA-GS.wf" index="7"/>
<item historyLabel="TUDwingDesign_converged-MDA-J.wf" index="17"/>
<item historyLabel="test_all_tools.wf" index="15"/>
<item historyLabel="TUDwingDesign_unconverged-DOE-GS.wf" index="19"/>
<item active="true" historyLabel="test_all_tools.wf" index="15"/>
<item historyLabel="test_all_tools.wf" index="8"/>
<item historyLabel="TUDwingDesign_converged-MDA-GS.wf" index="6"/>
<item historyLabel="test_all_tools.wf" index="8"/>
<item historyLabel="TUDwingDesign_converged-MDA-GS.wf" index="6"/>
<item historyLabel="test_all_tools.wf" index="8"/>
<item historyLabel="TUDwingDesign_converged-MDA-GS.wf" index="6"/>
<item historyLabel="Workflow Viewer" index="13"/>
<item historyLabel="TUDwingDesign_converged-MDA-GS.wf" index="6"/>
<item historyLabel="test_all_tools.wf" index="14"/>
<item historyLabel="TUDwingDesign_converged-MDA-GS.wf" index="6"/>
<item historyLabel="Workflow Viewer" index="15"/>
<item historyLabel="TUDwingDesign_converged-MDA-GS.wf" index="6"/>
<item historyLabel="TUDwingDesign_converged-MDA-J.wf" index="16"/>
<item historyLabel="Workflow Viewer" index="17"/>
<item historyLabel="TUDwingDesign_converged-MDA-J.wf" index="16"/>
<item historyLabel="TUDwingDesign_converged-MDA-GS.wf" index="6"/>
<item historyLabel="TUDwingDesign_converged-MDA-J.wf" index="16"/>
<item historyLabel="test_all_tools.wf" index="14"/>
<item historyLabel="TUDwingDesign_unconverged-DOE-GS.wf" index="18"/>
<item historyLabel="test_all_tools.wf" index="14"/>
<item active="true" historyLabel="TUDwingDesign_unconverged-DOE-GS.wf" index="19"/>
</navigationHistory>
</page>
<workbenchWindowAdvisor/>
......@@ -237,6 +241,9 @@
</trimLayout>
</window>
<mruList>
<file factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="org.eclipse.ui.systemExternalEditor" name="COOR-UXPathFilter-SCAM-merged[5modes].json" tooltip="scriptedTUDwingDesign/COOR-UXPathFilter-SCAM-merged[5modes].json">
<persistable path="/scriptedTUDwingDesign/COOR-UXPathFilter-SCAM-merged[5modes].json"/>
</file>
<file factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="de.rcenvironment.rce.gui.workflow.editor.WorkflowEditor" name="TUDwingDesign_unconverged-DOE-GS.wf" tooltip="scriptedTUDwingDesign/TUDwingDesign_unconverged-DOE-GS.wf">
<persistable path="/scriptedTUDwingDesign/TUDwingDesign_unconverged-DOE-GS.wf"/>
</file>
......@@ -279,8 +286,5 @@
<file factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="de.rcenvironment.rce.gui.workflow.editor.WorkflowEditor" name="TUDwingDesign_unconverged-MDA-GS.wf" tooltip="scriptedTUDwingDesign/TUDwingDesign_unconverged-MDA-GS.wf">
<persistable path="/scriptedTUDwingDesign/TUDwingDesign_unconverged-MDA-GS.wf"/>
</file>
<file factoryID="org.eclipse.ui.part.FileEditorInputFactory" id="de.rcenvironment.core.gui.workflow.editor.WorkflowRunEditor" name="45b1da16-fe76-47fe-bc2e-159021ce10ad.wfr" tooltip="External Files/Users/IMCOVA~1/AppData/Local/Temp/rce-temp/default-1489763683096/2/45b1da16-fe76-47fe-bc2e-159021ce10ad.wfr">
<persistable path="/External Files/Users/IMCOVA~1/AppData/Local/Temp/rce-temp/default-1489763683096/2/45b1da16-fe76-47fe-bc2e-159021ce10ad.wfr"/>
</file>
</mruList>
</workbench>
\ No newline at end of file
pyKADMOS/scripts/WP6_TUD_WingDesign2_XDSM_pdfs/XDSM_unconverged-DOE_Gauss-Seidel.pdf
+ 0
− 0
View file @ f69cef14
No preview for this file type
pyKADMOS/scripts/WP6_TUD_WingDesign2_vispack/supportFiles/xdsm.js 100644 → 100755
+ 1
− 4
View file @ f69cef14
......@@ -18322,10 +18322,7 @@ d3.json(jsonFile, function(error, mdo)
}
var aToolNameSplit = aTool.name.split(': ')
var headLine;
if (aToolNameSplit.length>1){headLine = "Tool Information (" + aToolNameSplit[1] + ")";}
else {headLine = "Tool Information (" + aToolNameSplit[0] + ")";}
var headLine = "Tool Information (" + aToolNameSplit[1] + ")";
var tabRemoveSVG = toolTableGroup.append("svg")
.attr("width",String(headLine.length*9.5+"pt"))
.attr("height",26)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment