Merge branch 'dev_distr_architectures_surr_models' into dev_0_8_a

# Conflicts:
#	examples/scripts/ssbj/CMDOWS/RCG.xml


Former-commit-id: 7c49e23bfd47dd4a3cb63f21e742e4c1d5e20703

examples/scripts/ssbj/(X)DSM/RCG.tex

-\documentclass{article}
-\usepackage{geometry}
-\usepackage{amsfonts}
-\usepackage{amsmath}
-\usepackage{amssymb}
-\usepackage{tikz}
-
-\input{C:/Users/Maaike/Documents/kadmos/kadmos/external/XDSM_writer/diagram_border}
-
-\begin{document}
-
-\input{C:/Users/Maaike/Documents/kadmos/kadmos/external/XDSM_writer/diagram_styles}
-
-\begin{tikzpicture}
-
-  \matrix[MatrixSetup]
-  {
-    %Row 1
-    &
-    \node [DataIO] (7374727563747572655b6d61696e5d5b315d5b312e305d-EMPTY) {$Lambda$\\[1pt] $Sref$\\[1pt] $AR$\\[1pt] $tc$\\[1pt] $lambda$\\[1pt] $section$}; &
-    \node [DataIO] (6165726f64796e616d6963735b6d61696e5d5b315d5b312e305d-EMPTY) {$tc$\\[1pt] $Cf$\\[1pt] $AR$\\[1pt] $Sref$\\[1pt] $h$\\[1pt] $M$\\[1pt] $Lambda$}; &
-    \node [DataIO] (70726f70756c73696f6e5b6d61696e5d5b315d5b312e305d-EMPTY) {$h$\\[1pt] $M$\\[1pt] $T$}; &
-    \node [DataIO] (706572666f726d616e63655b6d61696e5d5b315d5b312e305d-EMPTY) {$h$\\[1pt] $M$}; &
-    \\
-    \node [DataIO] (EMPTY-7374727563747572655b6d61696e5d5b315d5b312e305d) {$sigma$}; &
-    \node [RcgAnalysis] (7374727563747572655b6d61696e5d5b315d5b312e305d) {structure}; &
-    \node [DataInter] (6165726f64796e616d6963735b6d61696e5d5b315d5b312e305d-7374727563747572655b6d61696e5d5b315d5b312e305d) {$Theta$\\[1pt] $WT$}; &
-    &
-    \node [DataInter] (706572666f726d616e63655b6d61696e5d5b315d5b312e305d-7374727563747572655b6d61696e5d5b315d5b312e305d) {$WT$\\[1pt] $WF$}; &
-    \\
-    \node [DataIO] (EMPTY-6165726f64796e616d6963735b6d61696e5d5b315d5b312e305d) {$dpdx$}; &
-    \node [DataInter] (7374727563747572655b6d61696e5d5b315d5b312e305d-6165726f64796e616d6963735b6d61696e5d5b315d5b312e305d) {$L$}; &
-    \node [RcgAnalysis] (6165726f64796e616d6963735b6d61696e5d5b315d5b312e305d) {aerodynamics}; &
-    \node [DataInter] (70726f70756c73696f6e5b6d61696e5d5b315d5b312e305d-6165726f64796e616d6963735b6d61696e5d5b315d5b312e305d) {$D$}; &
-    \node [DataInter] (706572666f726d616e63655b6d61696e5d5b315d5b312e305d-6165726f64796e616d6963735b6d61696e5d5b315d5b312e305d) {$fin$}; &
-    \\
-    \node [DataIO] (EMPTY-70726f70756c73696f6e5b6d61696e5d5b315d5b312e305d) {$Temp$\\[1pt] $DT$}; &
-    \node [DataInter] (7374727563747572655b6d61696e5d5b315d5b312e305d-70726f70756c73696f6e5b6d61696e5d5b315d5b312e305d) {$WE$}; &
-    \node [DataInter] (6165726f64796e616d6963735b6d61696e5d5b315d5b312e305d-70726f70756c73696f6e5b6d61696e5d5b315d5b312e305d) {$ESF$}; &
-    \node [RcgAnalysis] (70726f70756c73696f6e5b6d61696e5d5b315d5b312e305d) {propulsion}; &
-    \node [DataInter] (706572666f726d616e63655b6d61696e5d5b315d5b312e305d-70726f70756c73696f6e5b6d61696e5d5b315d5b312e305d) {$SFC$}; &
-    \\
-    &
-    &
-    &
-    &
-    \node [RcgAnalysis] (706572666f726d616e63655b6d61696e5d5b315d5b312e305d) {performance}; &
-    \node [DataInter] (6f626a656374697665-706572666f726d616e63655b6d61696e5d5b315d5b312e305d) {$R$}; \\
-    %Row 6
-    \node [DataIO] (EMPTY-6f626a656374697665) {$obj$}; &
-    &
-    &
-    &
-    &
-    \node [RcgAnalysis] (6f626a656374697665) {objective}; \\
-    %Row 7
-  };
-
-  \begin{pgfonlayer}{data}
-    \path
-    % Horizontal edges
-    (EMPTY-7374727563747572655b6d61696e5d5b315d5b312e305d) edge [DataLine] (706572666f726d616e63655b6d61696e5d5b315d5b312e305d-7374727563747572655b6d61696e5d5b315d5b312e305d)
-    (EMPTY-6165726f64796e616d6963735b6d61696e5d5b315d5b312e305d) edge [DataLine] (706572666f726d616e63655b6d61696e5d5b315d5b312e305d-6165726f64796e616d6963735b6d61696e5d5b315d5b312e305d)
-    (EMPTY-70726f70756c73696f6e5b6d61696e5d5b315d5b312e305d) edge [DataLine] (706572666f726d616e63655b6d61696e5d5b315d5b312e305d-70726f70756c73696f6e5b6d61696e5d5b315d5b312e305d)
-    (706572666f726d616e63655b6d61696e5d5b315d5b312e305d) edge [DataLine] (6f626a656374697665-706572666f726d616e63655b6d61696e5d5b315d5b312e305d)
-    (EMPTY-6f626a656374697665) edge [DataLine] (6f626a656374697665)
-    % Vertical edges
-    (7374727563747572655b6d61696e5d5b315d5b312e305d-EMPTY) edge [DataLine] (7374727563747572655b6d61696e5d5b315d5b312e305d-70726f70756c73696f6e5b6d61696e5d5b315d5b312e305d)
-    (6165726f64796e616d6963735b6d61696e5d5b315d5b312e305d-EMPTY) edge [DataLine] (6165726f64796e616d6963735b6d61696e5d5b315d5b312e305d-70726f70756c73696f6e5b6d61696e5d5b315d5b312e305d)
-    (70726f70756c73696f6e5b6d61696e5d5b315d5b312e305d-EMPTY) edge [DataLine] (70726f70756c73696f6e5b6d61696e5d5b315d5b312e305d)
-    (706572666f726d616e63655b6d61696e5d5b315d5b312e305d-EMPTY) edge [DataLine] (706572666f726d616e63655b6d61696e5d5b315d5b312e305d)
-    (6f626a656374697665-706572666f726d616e63655b6d61696e5d5b315d5b312e305d) edge [DataLine] (6f626a656374697665)
-    ;
-  \end{pgfonlayer}
-
-\end{tikzpicture}
-
-\end{document}

examples/scripts/ssbj/CMDOWS/RCG.xml

@@ -3,14 +3,14 @@
   <header>
     <creator>Lukas Mueller</creator>
     <description>RCG CMDOWS file of the super-sonic business jet test case optimization problem</description>
-    <timestamp>2018-02-05T10:29:34.769155</timestamp>
+    <timestamp>2018-02-02T16:21:59.756922</timestamp>
     <fileVersion>0.1</fileVersion>
     <cmdowsVersion>0.7</cmdowsVersion>
     <updates>
       <update>
         <modification>KADMOS export of a repository connectivity graph (RCG).</modification>
         <creator>Lukas Mueller</creator>
-        <timestamp>2018-02-05T10:29:34.769155</timestamp>
+        <timestamp>2018-02-02T16:21:59.756922</timestamp>
         <fileVersion>0.1</fileVersion>
         <cmdowsVersion>0.7</cmdowsVersion>
       </update>