From d35e25206e690ff225c668fcfb277f4276261059 Mon Sep 17 00:00:00 2001
From: Nils van Velzen <nilsvanvelzen@gmail.com>
Date: Mon, 24 Aug 2020 18:37:12 +0200
Subject: [PATCH 1/2] Added a SWAN DUD example with parallel model runs in the
 initialization step of DUD

---
 .../tests/swan_l21triad/algorithm/dud_par.xml |  9 +++++++
 .../tests/swan_l21triad/swanDud_par.oda       | 26 +++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 model_swan/tests/swan_l21triad/algorithm/dud_par.xml
 create mode 100644 model_swan/tests/swan_l21triad/swanDud_par.oda

diff --git a/model_swan/tests/swan_l21triad/algorithm/dud_par.xml b/model_swan/tests/swan_l21triad/algorithm/dud_par.xml
new file mode 100644
index 000000000..d11e80da0
--- /dev/null
+++ b/model_swan/tests/swan_l21triad/algorithm/dud_par.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<DudConfig  xmlns="http://www.openda.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://www.openda.org http://schemas.openda.org/algorithm/dudConfig.xsd">
+   <costFunction weakParameterConstraint="false" tryParallel="true" class="org.openda.algorithms.SimulationKwadraticCostFunction" />
+   <outerLoop maxIterations="20" absTolerance="0.001" relTolerance="0.001" />
+   <lineSearch maxIterations="5" maxRelStepSize="10.0" >
+      <backTracking shorteningFactor="0.5" startIterationNegativeLook="3" />
+   </lineSearch>
+</DudConfig>
diff --git a/model_swan/tests/swan_l21triad/swanDud_par.oda b/model_swan/tests/swan_l21triad/swanDud_par.oda
new file mode 100644
index 000000000..773c891d9
--- /dev/null
+++ b/model_swan/tests/swan_l21triad/swanDud_par.oda
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openDaApplication xmlns="http://www.openda.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openda.org http://schemas.openda.org/openDaApplication.xsd">
+	<stochObserver className="org.openda.observers.IoObjectStochObserver">
+		<workingDirectory>./stochObserver</workingDirectory>
+		<configFile>swanStochObsConfig.xml</configFile>
+	</stochObserver>
+        <stochModelFactory className="org.openda.models.threadModel.ThreadStochModelFactory">
+       	<workingDirectory>.</workingDirectory>
+	<configFile>ThreadStochModel.xml</configFile>
+	</stochModelFactory>
+	
+	<algorithm className="org.openda.algorithms.Dud">
+		<workingDirectory>./algorithm</workingDirectory>
+		<configString>dud_par.xml</configString>
+	</algorithm>
+	<resultWriters>
+		<resultWriter className="org.openda.resultwriters.MatlabResultWriter">
+			<workingDirectory>.</workingDirectory>
+			<configFile>results_dud.m</configFile>
+		</resultWriter>
+		<resultWriter className="org.openda.resultwriters.TextTableWriter">
+			<workingDirectory>.</workingDirectory>
+			<configFile>results_dud.csv</configFile>
+		</resultWriter>
+	</resultWriters>
+</openDaApplication>

From 6e592baf9ed1b212918e2553ece5490a2229749f Mon Sep 17 00:00:00 2001
From: Nils van Velzen <nilsvanvelzen@gmail.com>
Date: Wed, 26 Aug 2020 11:46:00 +0200
Subject: [PATCH 2/2] added missing ThreadStochModel.xml in parallel DUD
 example

---
 model_swan/tests/swan_l21triad/ThreadStochModel.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 model_swan/tests/swan_l21triad/ThreadStochModel.xml

diff --git a/model_swan/tests/swan_l21triad/ThreadStochModel.xml b/model_swan/tests/swan_l21triad/ThreadStochModel.xml
new file mode 100644
index 000000000..a59acca95
--- /dev/null
+++ b/model_swan/tests/swan_l21triad/ThreadStochModel.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<threadConfig xmlns="http://www.openda.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://www.openda.org http://schemas.openda.org/threadConfig.xsd">
+   <maxThreads>4</maxThreads>
+   <stochModelFactory className="org.openda.model_swan.SwanCalibStochModelFactory">
+	<workingDirectory>./swanModel/config</workingDirectory>
+	<configFile>swanStochModelConfig.xml</configFile>
+   </stochModelFactory>
+</threadConfig>
+