diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 580ff65da9a89e17ced9e01c37a09dce006f7169..d793ac97fc9ab75d6b8495d59776834a4c509a49 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,9 +5,20 @@
</component>
<component name="ChangeListManager">
<list default="true" id="d3e74292-1e1a-4cba-81b3-9c9d67f586ca" name="Default" comment="">
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pyKADMOS/AGILE_EY01_DEMO_big.pdf" afterPath="$PROJECT_DIR$/pyKADMOS/AGILE_EY01_DEMO_big.pdf" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pyKADMOS/AGILE_EY01_DEMO_small.pdf" afterPath="$PROJECT_DIR$/pyKADMOS/AGILE_EY01_DEMO_small.pdf" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pyKADMOS/sellarProblemXDSM.pdf" afterPath="$PROJECT_DIR$/pyKADMOS/sellarProblemXDSM.pdf" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pyKADMOS/AGILE_EY01_DEMO.py" afterPath="$PROJECT_DIR$/pyKADMOS/AGILE_EY01_DEMO.py" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pyKADMOS/AGILE_EY01_DEMO_big.log" afterPath="$PROJECT_DIR$/pyKADMOS/AGILE_EY01_DEMO_big.log" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pyKADMOS/AGILE_EY01_DEMO_small.log" afterPath="$PROJECT_DIR$/pyKADMOS/AGILE_EY01_DEMO_small.log" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pyKADMOS/KB_Sellar/D1-info.json" afterPath="$PROJECT_DIR$/pyKADMOS/KB_Sellar/D1-info.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pyKADMOS/KB_Sellar/D2-info.json" afterPath="$PROJECT_DIR$/pyKADMOS/KB_Sellar/D2-info.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pyKADMOS/KB_Sellar/F-info.json" afterPath="$PROJECT_DIR$/pyKADMOS/KB_Sellar/F-info.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pyKADMOS/KB_Sellar/G1-info.json" afterPath="$PROJECT_DIR$/pyKADMOS/KB_Sellar/G1-info.json" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pyKADMOS/KB_Sellar/G2-info.json" afterPath="$PROJECT_DIR$/pyKADMOS/KB_Sellar/G2-info.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/pyKADMOS/MDOproblem.py" afterPath="$PROJECT_DIR$/pyKADMOS/MDOproblem.py" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pyKADMOS/sellarProblemXDSM.log" afterPath="$PROJECT_DIR$/pyKADMOS/sellarProblemXDSM.log" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pyKADMOS/sellarProblemXDSM.tex" afterPath="$PROJECT_DIR$/pyKADMOS/sellarProblemXDSM.tex" />
</list>
<ignored path="KADMOS.iws" />
<ignored path=".idea/workspace.xml" />
@@ -22,7 +33,7 @@
<component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
<component name="CoverageDataManager">
<SUITE FILE_PATH="coverage/KADMOS$IDF_example__1_.coverage" NAME="IDF_example (1) Coverage Results" MODIFIED="1466090585286" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/pyKADMOS/XDSM" />
- <SUITE FILE_PATH="coverage/KADMOS$AGILE_EY01_DEMO.coverage" NAME="AGILE_EY01_DEMO Coverage Results" MODIFIED="1467817155866" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/pyKADMOS" />
+ <SUITE FILE_PATH="coverage/KADMOS$AGILE_EY01_DEMO.coverage" NAME="AGILE_EY01_DEMO Coverage Results" MODIFIED="1467818354948" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/pyKADMOS" />
<SUITE FILE_PATH="coverage/KADMOS$docutils.coverage" NAME="docutils Coverage Results" MODIFIED="1465812341714" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
<SUITE FILE_PATH="coverage/KADMOS$Sphinx.coverage" NAME="Sphinx Coverage Results" MODIFIED="1466008428644" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
<SUITE FILE_PATH="coverage/KADMOS$IDF_example.coverage" NAME="IDF_example Coverage Results" MODIFIED="1466090266982" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/pyKADMOS/XDSM-master/XDSM" />
@@ -34,7 +45,7 @@
<SUITE FILE_PATH="coverage/KADMOS$Doc_MDOproblem_class.coverage" NAME="doc MDOproblem class Coverage Results" MODIFIED="1465810428149" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
<SUITE FILE_PATH="coverage/KADMOS$CPACSdummyProblem.coverage" NAME="CPACSdummyProblem Coverage Results" MODIFIED="1466512244343" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/pyKADMOS" />
<SUITE FILE_PATH="coverage/KADMOS$bigMathProblem.coverage" NAME="bigMathProblem Coverage Results" MODIFIED="1463418247627" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/pyKADMOS" />
- <SUITE FILE_PATH="coverage/KADMOS$sellarProblem.coverage" NAME="sellarProblem Coverage Results" MODIFIED="1466431766560" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/pyKADMOS" />
+ <SUITE FILE_PATH="coverage/KADMOS$sellarProblem.coverage" NAME="sellarProblem Coverage Results" MODIFIED="1467818638638" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/pyKADMOS" />
<SUITE FILE_PATH="coverage/KADMOS$test_pymetis.coverage" NAME="test_pymetis Coverage Results" MODIFIED="1463842497510" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/pyKADMOS" />
</component>
<component name="CreatePatchCommitExecutor">
@@ -49,8 +60,8 @@
<file leaf-file-name="MDOproblem.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/pyKADMOS/MDOproblem.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-5520">
- <caret line="29" column="20" selection-start-line="29" selection-start-column="20" selection-end-line="29" selection-end-column="20" />
+ <state relative-caret-position="315">
+ <caret line="835" column="83" selection-start-line="835" selection-start-column="83" selection-end-line="835" selection-end-column="83" />
<folding>
<element signature="e#0#11#0" expanded="true" />
</folding>
@@ -58,11 +69,11 @@
</provider>
</entry>
</file>
- <file leaf-file-name="CPACSdummyProblem.py" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/pyKADMOS/CPACSdummyProblem.py">
+ <file leaf-file-name="sellarProblem.py" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/sellarProblem.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="750">
- <caret line="50" column="7" selection-start-line="50" selection-start-column="7" selection-end-line="50" selection-end-column="7" />
+ <state relative-caret-position="305">
+ <caret line="61" column="44" selection-start-line="61" selection-start-column="44" selection-end-line="61" selection-end-column="44" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
@@ -85,12 +96,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
- <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/EMISSION-output.xml" />
- <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/EMISSION-info.json" />
- <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/MISSION-info.json" />
- <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/CON_EM-input.xml" />
- <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/CON_EM-output.xml" />
- <option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/CON_EM-info.json" />
<option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/PHALANX-input.xml" />
<option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/OBJ-input.xml" />
<option value="$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/MASS-info.json" />
@@ -134,8 +139,14 @@
<option value="$PROJECT_DIR$/pyKADMOS/MDOstatic.py" />
<option value="$PROJECT_DIR$/pyKADMOS/checkAgainstSchema.py" />
<option value="$PROJECT_DIR$/pyKADMOS/testRun.py" />
- <option value="$PROJECT_DIR$/pyKADMOS/MDOproblem.py" />
<option value="$PROJECT_DIR$/pyKADMOS/AGILE_EY01_DEMO.py" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_Sellar/D1-info.json" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_Sellar/D2-info.json" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_Sellar/F-info.json" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_Sellar/G1-info.json" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_Sellar/G2-info.json" />
+ <option value="$PROJECT_DIR$/pyKADMOS/KB_Sellar/Sellar-base.xml" />
+ <option value="$PROJECT_DIR$/pyKADMOS/MDOproblem.py" />
</list>
</option>
</component>
@@ -223,6 +234,24 @@
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH>
+ <PATH>
+ <PATH_ELEMENT USER_OBJECT="Root">
+ <option name="myItemId" value="" />
+ <option name="myItemType" value="" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT USER_OBJECT="KADMOS">
+ <option name="myItemId" value="" />
+ <option name="myItemType" value="" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT USER_OBJECT="pyKADMOS">
+ <option name="myItemId" value="" />
+ <option name="myItemType" value="" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT USER_OBJECT="KB_Sellar">
+ <option name="myItemId" value="" />
+ <option name="myItemType" value="" />
+ </PATH_ELEMENT>
+ </PATH>
<PATH>
<PATH_ELEMENT USER_OBJECT="Root">
<option name="myItemId" value="" />
@@ -268,7 +297,7 @@
<recent name="$PROJECT_DIR$/pyKADMOS/doc_source" />
</key>
</component>
- <component name="RunManager" selected="Python.AGILE_EY01_DEMO">
+ <component name="RunManager" selected="Python.sellarProblem">
<configuration default="false" name="sellarProblem" type="PythonConfigurationType" factoryName="Python" temporary="true">
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
@@ -663,9 +692,9 @@
</list>
<recent_temporary>
<list size="5">
- <item index="0" class="java.lang.String" itemvalue="Python.AGILE_EY01_DEMO" />
- <item index="1" class="java.lang.String" itemvalue="Python.CPACSdummyProblem" />
- <item index="2" class="java.lang.String" itemvalue="Python.sellarProblem" />
+ <item index="0" class="java.lang.String" itemvalue="Python.sellarProblem" />
+ <item index="1" class="java.lang.String" itemvalue="Python.AGILE_EY01_DEMO" />
+ <item index="2" class="java.lang.String" itemvalue="Python.CPACSdummyProblem" />
<item index="3" class="java.lang.String" itemvalue="Python.IDF_example (1)" />
<item index="4" class="java.lang.String" itemvalue="Python.IDF_example" />
</list>
@@ -758,37 +787,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$USER_HOME$/Library/Caches/PyCharm2016.1/python_stubs/120269359/__builtin__.py" />
- <entry file="file://$PROJECT_DIR$/pyKADMOS/test_doc.py" />
- <entry file="file://$PROJECT_DIR$/pyKADMOS/doc_source/conf.py">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="45">
- <caret line="97" column="48" selection-start-line="97" selection-start-column="48" selection-end-line="97" selection-end-column="48" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/pyKADMOS/test.png" />
- <entry file="file://$PROJECT_DIR$/pyKADMOS/create_math_problem.py">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="3150">
- <caret line="210" column="0" selection-start-line="210" selection-start-column="0" selection-end-line="210" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_big_math_problem/C1-info.json">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="14" selection-start-line="0" selection-start-column="14" selection-end-line="0" selection-end-column="14" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/pyKADMOS/mathProblem.py">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="285">
- <caret line="19" column="52" selection-start-line="19" selection-start-column="52" selection-end-line="19" selection-end-column="52" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/pyKADMOS/doc_source/KADMOS.rst">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="555">
@@ -803,13 +801,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_Sellar/D1-info.json">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/PHALANX-input.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
@@ -908,13 +899,6 @@
</provider>
</entry>
<entry file="file:///usr/local/lib/python2.7/site-packages/networkx/algorithms/operators/binary.py" />
- <entry file="file://$PROJECT_DIR$/pyKADMOS/sellarProblem.py">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1094">
- <caret line="93" column="30" selection-start-line="93" selection-start-column="30" selection-end-line="93" selection-end-column="30" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/OBJ-input.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
@@ -965,13 +949,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pyKADMOS/MDOvisualization.py">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="720">
- <caret line="174" column="17" selection-start-line="174" selection-start-column="15" selection-end-line="174" selection-end-column="17" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS/EMWET-output.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
@@ -979,22 +956,7 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pyKADMOS/MDOstatic.py">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-450">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/pyKADMOS/checkAgainstSchema.py" />
- <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/CPACS_DUMMY-base.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/ACAERO-input.xml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
@@ -1024,7 +986,7 @@
<state relative-caret-position="90">
<caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
<folding>
- <element signature="e#0#13#0" expanded="true" />
+ <element signature="e#0#13#0" expanded="false" />
</folding>
</state>
</provider>
@@ -1043,6 +1005,106 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="750">
<caret line="50" column="7" selection-start-line="50" selection-start-column="7" selection-end-line="50" selection-end-column="7" />
+ <folding>
+ <element signature="e#0#13#0" expanded="false" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/MDOvisualization.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-4735">
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <folding>
+ <element signature="e#0#31#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/MDOstatic.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-6160">
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/CPACS_DUMMY-base.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="525">
+ <caret line="35" column="14" selection-start-line="35" selection-start-column="14" selection-end-line="35" selection-end-column="14" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_Sellar/D1-info.json">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="0">
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="5" selection-end-column="37" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_CPACS_dummy/OBJ-info.json">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="0">
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="5" selection-end-column="37" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_Sellar/D2-info.json">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="0">
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="5" selection-end-column="37" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_Sellar/F-info.json">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="75">
+ <caret line="5" column="34" selection-start-line="5" selection-start-column="34" selection-end-line="5" selection-end-column="34" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_Sellar/G1-info.json">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="0">
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="5" selection-end-column="37" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_Sellar/G2-info.json">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="75">
+ <caret line="5" column="37" selection-start-line="5" selection-start-column="37" selection-end-line="5" selection-end-column="37" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_Sellar/data_schema.xsd">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="0">
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/KB_Sellar/Sellar-base.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="345">
+ <caret line="23" column="14" selection-start-line="23" selection-start-column="14" selection-end-line="23" selection-end-column="14" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/pyKADMOS/sellarProblem.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="305">
+ <caret line="61" column="44" selection-start-line="61" selection-start-column="44" selection-end-line="61" selection-end-column="44" />
<folding>
<element signature="e#0#13#0" expanded="true" />
</folding>
@@ -1051,8 +1113,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/pyKADMOS/MDOproblem.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-5520">
- <caret line="29" column="20" selection-start-line="29" selection-start-column="20" selection-end-line="29" selection-end-column="20" />
+ <state relative-caret-position="315">
+ <caret line="835" column="83" selection-start-line="835" selection-start-column="83" selection-end-line="835" selection-end-column="83" />
<folding>
<element signature="e#0#11#0" expanded="true" />
</folding>
diff --git a/pyKADMOS/AGILE_EY01_DEMO_big.log b/pyKADMOS/AGILE_EY01_DEMO_big.log
index fbf573c999f7be4bc22dbc9af2dad8125f726ece..52b74a294bbb8d629bc76932629cede175c5a51a 100644
--- a/pyKADMOS/AGILE_EY01_DEMO_big.log
+++ b/pyKADMOS/AGILE_EY01_DEMO_big.log
@@ -1,4 +1,4 @@
-This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015) (preloaded format=pdflatex 2015.10.20) 6 JUL 2016 16:59
+This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015) (preloaded format=pdflatex 2015.10.20) 6 JUL 2016 17:19
entering extended mode
restricted \write18 enabled.
%&-line parsing enabled.
diff --git a/pyKADMOS/AGILE_EY01_DEMO_big.pdf b/pyKADMOS/AGILE_EY01_DEMO_big.pdf
index a717662a61049ab729910801346090303ecbf159..cd177783ae21595594241826f91e6945df334612 100644
Binary files a/pyKADMOS/AGILE_EY01_DEMO_big.pdf and b/pyKADMOS/AGILE_EY01_DEMO_big.pdf differ
diff --git a/pyKADMOS/AGILE_EY01_DEMO_small.log b/pyKADMOS/AGILE_EY01_DEMO_small.log
index 52a282f337ed16b2b893c7806c17caf46fdfffe6..a8c20f54d82350c4058710b3ccff2fb8b1c79183 100644
--- a/pyKADMOS/AGILE_EY01_DEMO_small.log
+++ b/pyKADMOS/AGILE_EY01_DEMO_small.log
@@ -1,4 +1,4 @@
-This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015) (preloaded format=pdflatex 2015.10.20) 6 JUL 2016 16:59
+This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015) (preloaded format=pdflatex 2015.10.20) 6 JUL 2016 17:19
entering extended mode
restricted \write18 enabled.
%&-line parsing enabled.
diff --git a/pyKADMOS/AGILE_EY01_DEMO_small.pdf b/pyKADMOS/AGILE_EY01_DEMO_small.pdf
index 0c7b2be490bf982ede2b820d97a676d5c4ad5a99..4b07bfa8d7674965c643e092f52896c90e1a2385 100644
Binary files a/pyKADMOS/AGILE_EY01_DEMO_small.pdf and b/pyKADMOS/AGILE_EY01_DEMO_small.pdf differ
diff --git a/pyKADMOS/KB_Sellar/D1-info.json b/pyKADMOS/KB_Sellar/D1-info.json
index 21e0c8397e4e5b0e3d44df530dc69e2569523784..b575e099bb04780f92efce4f603f3aeb5bbcdb12 100644
--- a/pyKADMOS/KB_Sellar/D1-info.json
+++ b/pyKADMOS/KB_Sellar/D1-info.json
@@ -1 +1,6 @@
-{"text": 42.0}
\ No newline at end of file
+{"general_info":{"name":"D1 function",
+ "version":1.0,
+ "creator":"Imco van Gent",
+ "fidelity level":"NA"},
+ "executing_info":{"run time (s)":0.1,
+ "precision":1.00}}
\ No newline at end of file
diff --git a/pyKADMOS/KB_Sellar/D2-info.json b/pyKADMOS/KB_Sellar/D2-info.json
index 21e0c8397e4e5b0e3d44df530dc69e2569523784..09bbafe585bf8a958276543ad8922b40a1195761 100644
--- a/pyKADMOS/KB_Sellar/D2-info.json
+++ b/pyKADMOS/KB_Sellar/D2-info.json
@@ -1 +1,6 @@
-{"text": 42.0}
\ No newline at end of file
+{"general_info":{"name":"D2 function",
+ "version":1.0,
+ "creator":"Imco van Gent",
+ "fidelity level":"NA"},
+ "executing_info":{"run time (s)":0.1,
+ "precision":1.00}}
\ No newline at end of file
diff --git a/pyKADMOS/KB_Sellar/F-info.json b/pyKADMOS/KB_Sellar/F-info.json
index 21e0c8397e4e5b0e3d44df530dc69e2569523784..6a10797cfa8dad5fad9b28b1465c98c3bd5ea986 100644
--- a/pyKADMOS/KB_Sellar/F-info.json
+++ b/pyKADMOS/KB_Sellar/F-info.json
@@ -1 +1,6 @@
-{"text": 42.0}
\ No newline at end of file
+{"general_info":{"name":"F function",
+ "version":1.0,
+ "creator":"Imco van Gent",
+ "fidelity level":"NA"},
+ "executing_info":{"run time (s)":0.1,
+ "precision":1.00}}
\ No newline at end of file
diff --git a/pyKADMOS/KB_Sellar/G1-info.json b/pyKADMOS/KB_Sellar/G1-info.json
index 21e0c8397e4e5b0e3d44df530dc69e2569523784..4373745f7c389f19f1691526f5c43a2746d09789 100644
--- a/pyKADMOS/KB_Sellar/G1-info.json
+++ b/pyKADMOS/KB_Sellar/G1-info.json
@@ -1 +1,6 @@
-{"text": 42.0}
\ No newline at end of file
+{"general_info":{"name":"G1 function",
+ "version":1.0,
+ "creator":"Imco van Gent",
+ "fidelity level":"NA"},
+ "executing_info":{"run time (s)":0.1,
+ "precision":1.00}}
\ No newline at end of file
diff --git a/pyKADMOS/KB_Sellar/G2-info.json b/pyKADMOS/KB_Sellar/G2-info.json
index 21e0c8397e4e5b0e3d44df530dc69e2569523784..ede5c5f812ae1706edfc528f78d08b2473134224 100644
--- a/pyKADMOS/KB_Sellar/G2-info.json
+++ b/pyKADMOS/KB_Sellar/G2-info.json
@@ -1 +1,6 @@
-{"text": 42.0}
\ No newline at end of file
+{"general_info":{"name":"G2 function",
+ "version":1.0,
+ "creator":"Imco van Gent",
+ "fidelity level":"NA"},
+ "executing_info":{"run time (s)":0.1,
+ "precision":1.00}}
\ No newline at end of file
diff --git a/pyKADMOS/KB_Sellar/Sellar-base.xml b/pyKADMOS/KB_Sellar/Sellar-base.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1ab1aacb3b9ae06643b00bd1eb05e81dc2dae55e
--- /dev/null
+++ b/pyKADMOS/KB_Sellar/Sellar-base.xml
@@ -0,0 +1,24 @@
+<data_schema tool_name="string" in_or_output="string">
+ <!--Optional:-->
+ <geometry>
+ <!--Optional:-->
+ <x1>1000.00</x1>
+ <!--Optional:-->
+ <z1>1000.00</z1>
+ <!--Optional:-->
+ <z2>1000.00</z2>
+ </geometry>
+ <!--Optional:-->
+ <analyses>
+ <!--Optional:-->
+ <y1>1000.00</y1>
+ <!--Optional:-->
+ <y2>1000.00</y2>
+ <!--Optional:-->
+ <g1>1000.00</g1>
+ <!--Optional:-->
+ <g2>1000.00</g2>
+ <!--Optional:-->
+ <f>1000.00</f>
+ </analyses>
+</data_schema>
\ No newline at end of file
diff --git a/pyKADMOS/MDOproblem.py b/pyKADMOS/MDOproblem.py
index bb5a31ba688d8ade2a69da6ea2bef920775b73ea..584577ae9c22b4bbfe798d946c172d2157d30a0e 100644
--- a/pyKADMOS/MDOproblem.py
+++ b/pyKADMOS/MDOproblem.py
@@ -492,7 +492,7 @@ class MDOproblem:
:return: dictionary with common nodes
"""
- function_data = self.analyzefunction_files()
+ function_data = self.analyze_function_files()
function_data_lst = []
common_nodes = []
idx = 1
@@ -833,7 +833,7 @@ class MDOproblem:
# Remove the objective function and constraint functions from the set
MDA_analysis_nodes = function_nodes.difference(set(optimizer_functions))
- # Check if any functions are left between analysis nodes and analysis order?
+ # Check if any functions are left between analysis nodes and analysis order
assert len(MDA_analysis_nodes.difference(set(analysis_order))) == 0, \
"There are undefined functions present in the FPG, namely %s! These should be added to the analysis order" \
" or become objective/constraints functions." % MDA_analysis_nodes.difference(set(analysis_order))
diff --git a/pyKADMOS/MDOproblem.pyc b/pyKADMOS/MDOproblem.pyc
index 0e5f6ff40c478b78012831ec6f96c4fe448ce324..d492bca0d1054f80b496480157ed0c4439f7e391 100644
Binary files a/pyKADMOS/MDOproblem.pyc and b/pyKADMOS/MDOproblem.pyc differ
diff --git a/pyKADMOS/sellarProblemXDSM.log b/pyKADMOS/sellarProblemXDSM.log
index 5c280e778eb83d91b9da8706c9413e79d712a6bd..9f1b7beb0c459d96e9d835c42dfaf7b5ba1e684b 100644
--- a/pyKADMOS/sellarProblemXDSM.log
+++ b/pyKADMOS/sellarProblemXDSM.log
@@ -1,4 +1,4 @@
-This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015) (preloaded format=pdflatex 2015.10.20) 20 JUN 2016 16:09
+This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015) (preloaded format=pdflatex 2015.10.20) 6 JUL 2016 17:24
entering extended mode
restricted \write18 enabled.
%&-line parsing enabled.
@@ -500,7 +500,7 @@ Package: preview 2010/02/14 11.88 (AUCTeX/preview-latex)
\pr@box=\box39
\pr@output=\toks34
))
-No file sellarProblemXDSM.aux.
+(./sellarProblemXDSM.aux)
\openout1 = `sellarProblemXDSM.aux'.
LaTeX Font Info: Checking defaults for OML/cmm/m/it on input line 10.
@@ -515,6 +515,7 @@ LaTeX Font Info: Checking defaults for OMX/cmex/m/n on input line 10.
LaTeX Font Info: ... okay on input line 10.
LaTeX Font Info: Checking defaults for U/cmr/m/n on input line 10.
LaTeX Font Info: ... okay on input line 10.
+
*geometry* driver: auto-detecting
*geometry* detected driver: pdftex
*geometry* verbose mode - [ preamble ] result:
@@ -626,7 +627,7 @@ LaTeX Font Info: Try loading font information for U+msb on input line 19.
(/usr/local/texlive/2015/texmf-dist/tex/latex/amsfonts/umsb.fd
File: umsb.fd 2013/01/14 v3.01 AMS symbols B
)
-Overfull \hbox (19.64833pt too wide) in paragraph at lines 195--195
+Overfull \hbox (28.94588pt too wide) in paragraph at lines 195--195
[][]
[]
@@ -634,9 +635,9 @@ Preview: Tightpage -327680 -327680 327680 327680
[1{/usr/local/texlive/2015/texmf-var/fonts/map/pdftex/updmap/pdftex.map}]
(./sellarProblemXDSM.aux) )
Here is how much of TeX's memory you used:
- 14577 strings out of 493089
- 298180 string characters out of 6134841
- 357592 words of memory out of 5000000
+ 14579 strings out of 493089
+ 298228 string characters out of 6134841
+ 359792 words of memory out of 5000000
17780 multiletter control sequences out of 15000+600000
5339 words of font info for 22 fonts, out of 8000000 for 9000
1141 hyphenation exceptions out of 8191
@@ -648,7 +649,7 @@ amsfonts/cm/cmr10.pfb></usr/local/texlive/2015/texmf-dist/fonts/type1/public/am
sfonts/cm/cmr7.pfb></usr/local/texlive/2015/texmf-dist/fonts/type1/public/amsfo
nts/cm/cmsy10.pfb></usr/local/texlive/2015/texmf-dist/fonts/type1/public/amsfon
ts/cm/cmsy7.pfb>
-Output written on sellarProblemXDSM.pdf (1 page, 55483 bytes).
+Output written on sellarProblemXDSM.pdf (1 page, 55471 bytes).
PDF statistics:
59 PDF objects out of 1000 (max. 8388607)
33 compressed objects within 1 object stream
diff --git a/pyKADMOS/sellarProblemXDSM.pdf b/pyKADMOS/sellarProblemXDSM.pdf
index 12baa041dd0fe01245266a01d46305d6b144f237..f97c93e55c6bb60464e1e1bb884134afbfa9a9f7 100644
Binary files a/pyKADMOS/sellarProblemXDSM.pdf and b/pyKADMOS/sellarProblemXDSM.pdf differ
diff --git a/pyKADMOS/sellarProblemXDSM.tex b/pyKADMOS/sellarProblemXDSM.tex
index 7d6ecc23ee9ccfd6d93ff2bd273a15b5537ec375..19fbfc587dcfb76769e72b3dccebf4f4a671063c 100644
--- a/pyKADMOS/sellarProblemXDSM.tex
+++ b/pyKADMOS/sellarProblemXDSM.tex
@@ -17,18 +17,18 @@
{
%Row 1
\node [Initiator] (Initiator) {$0,8$:\\INI}; &
- \node [DataIO] (Optimizer-Initiator) {1: $z1^0$, $z2^0$}; &
+ \node [DataIO] (Optimizer-Initiator) {1: $z1^0$\\\\[-10pt] $z2^0$}; &
\node [DataIO] (MDA-Initiator) {2: $y2^{c0}$}; &
\node [DataIO] (D1-Initiator) {3: $x1$}; &
&
\node [DataIO] (F-Initiator) {6: $x1$}; &
&
\\
- \node [DataIO] (Initiator-Optimizer) {8: $z1^*$, $z2^*$}; &
+ \node [DataIO] (Initiator-Optimizer) {8: $z1^*$\\\\[-10pt] $z2^*$}; &
\node [Optimization] (Optimizer) {$1,7\to2$:\\OPT}; &
&
- \node [DataInter] (D1-Optimizer) {3: $z2$, $z1$}; &
- \node [DataInter] (D2-Optimizer) {4: $z2$, $z1$}; &
+ \node [DataInter] (D1-Optimizer) {3: $z2$\\\\[-10pt] $z1$}; &
+ \node [DataInter] (D2-Optimizer) {4: $z2$\\\\[-10pt] $z1$}; &
\node [DataInter] (F-Optimizer) {6: $z2$}; &
&
\\