diff --git a/core/java/test/org/openda/blackbox/config/testData/wrapper/BBWrapperConfigTest_config.xml b/core/java/test/org/openda/blackbox/config/testData/wrapper/BBWrapperConfigTest_config.xml
index ee509810a..21c89c651 100644
--- a/core/java/test/org/openda/blackbox/config/testData/wrapper/BBWrapperConfigTest_config.xml
+++ b/core/java/test/org/openda/blackbox/config/testData/wrapper/BBWrapperConfigTest_config.xml
@@ -21,11 +21,11 @@
-
+
%outputFile%
outputIoObject
%timeZone%
%startTime%
-
+
diff --git a/core/java/test/org/openda/blackbox/wrapper/testData/noiseModel/bbWrapperConfig.xml b/core/java/test/org/openda/blackbox/wrapper/testData/noiseModel/bbWrapperConfig.xml
index 428bd79ff..6bcb3c820 100644
--- a/core/java/test/org/openda/blackbox/wrapper/testData/noiseModel/bbWrapperConfig.xml
+++ b/core/java/test/org/openda/blackbox/wrapper/testData/noiseModel/bbWrapperConfig.xml
@@ -1,66 +1,67 @@
-
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
-
-
- %instanceDir%%instanceNumber%
-
-
+
+
+
+
+ %instanceDir%%instanceNumber%
+
+
-
-
+
+
-
+
-
+
-
+
-
- %noosfile_1%
- noosfile_1
-
+
+ %noosfile_1%
+ noosfile_1
+
-
+
-
- %noosfile_2%
- noosfile_2
-
+
+ %noosfile_2%
+ noosfile_2
+
-
+
-
- %noosfile_3%
- noosfile_3
-
+
+ %noosfile_3%
+ noosfile_3
+
-
+
-
- %statefile%
- statefile
-
+
+ %statefile%
+ statefile
+
-
+
diff --git a/core/java/test/org/openda/blackbox/wrapper/testData/noiseModel2DMaps/bbWrapperConfig_noiseRatio.xml b/core/java/test/org/openda/blackbox/wrapper/testData/noiseModel2DMaps/bbWrapperConfig_noiseRatio.xml
index 191ab4ed2..9db2e742d 100644
--- a/core/java/test/org/openda/blackbox/wrapper/testData/noiseModel2DMaps/bbWrapperConfig_noiseRatio.xml
+++ b/core/java/test/org/openda/blackbox/wrapper/testData/noiseModel2DMaps/bbWrapperConfig_noiseRatio.xml
@@ -22,10 +22,10 @@
-
+
notUsed
DummyStateObject
-
+
diff --git a/core/java/test/org/openda/blackbox/wrapper/testData/noiseModel2DMaps/noiseAfterCompute/bbModelConfig_noiseAfterCompute.xml b/core/java/test/org/openda/blackbox/wrapper/testData/noiseModel2DMaps/noiseAfterCompute/bbModelConfig_noiseAfterCompute.xml
index 2c41d1f89..d554bb303 100644
--- a/core/java/test/org/openda/blackbox/wrapper/testData/noiseModel2DMaps/noiseAfterCompute/bbModelConfig_noiseAfterCompute.xml
+++ b/core/java/test/org/openda/blackbox/wrapper/testData/noiseModel2DMaps/noiseAfterCompute/bbModelConfig_noiseAfterCompute.xml
@@ -18,7 +18,7 @@
-
+
diff --git a/core/java/test/org/openda/blackbox/wrapper/testData/noiseModel2DMaps/noiseAfterCompute/bbWrapperConfig_noiseAfterCompute.xml b/core/java/test/org/openda/blackbox/wrapper/testData/noiseModel2DMaps/noiseAfterCompute/bbWrapperConfig_noiseAfterCompute.xml
index 191ab4ed2..9db2e742d 100644
--- a/core/java/test/org/openda/blackbox/wrapper/testData/noiseModel2DMaps/noiseAfterCompute/bbWrapperConfig_noiseAfterCompute.xml
+++ b/core/java/test/org/openda/blackbox/wrapper/testData/noiseModel2DMaps/noiseAfterCompute/bbWrapperConfig_noiseAfterCompute.xml
@@ -22,10 +22,10 @@
-
+
notUsed
DummyStateObject
-
+
diff --git a/core/java/test/org/openda/blackbox/wrapper/testData/noiseModel2DMaps/noiseRatio2DMapping/bbWrapperConfig_noiseRatio2DMapping.xml b/core/java/test/org/openda/blackbox/wrapper/testData/noiseModel2DMaps/noiseRatio2DMapping/bbWrapperConfig_noiseRatio2DMapping.xml
index 237cbb4a1..400ff6c7c 100644
--- a/core/java/test/org/openda/blackbox/wrapper/testData/noiseModel2DMaps/noiseRatio2DMapping/bbWrapperConfig_noiseRatio2DMapping.xml
+++ b/core/java/test/org/openda/blackbox/wrapper/testData/noiseModel2DMaps/noiseRatio2DMapping/bbWrapperConfig_noiseRatio2DMapping.xml
@@ -22,10 +22,10 @@
-
+
param2D_20020102.asc
param2D
-
+
diff --git a/core/java/test/org/openda/blackbox/wrapper/testData/noiseModel2DMaps/noiseRatio2DMappingBigger/bbWrapperConfig_noiseRatio2DMappingBigger.xml b/core/java/test/org/openda/blackbox/wrapper/testData/noiseModel2DMaps/noiseRatio2DMappingBigger/bbWrapperConfig_noiseRatio2DMappingBigger.xml
index 237cbb4a1..400ff6c7c 100644
--- a/core/java/test/org/openda/blackbox/wrapper/testData/noiseModel2DMaps/noiseRatio2DMappingBigger/bbWrapperConfig_noiseRatio2DMappingBigger.xml
+++ b/core/java/test/org/openda/blackbox/wrapper/testData/noiseModel2DMaps/noiseRatio2DMappingBigger/bbWrapperConfig_noiseRatio2DMappingBigger.xml
@@ -22,10 +22,10 @@
-
+
param2D_20020102.asc
param2D
-
+
diff --git a/core/java/test/org/openda/blackbox/wrapper/testData/noiseModel2DMaps/noiseRatio2DMappingSmaller/bbWrapperConfig_noiseRatio2DMappingSmaller.xml b/core/java/test/org/openda/blackbox/wrapper/testData/noiseModel2DMaps/noiseRatio2DMappingSmaller/bbWrapperConfig_noiseRatio2DMappingSmaller.xml
index 237cbb4a1..400ff6c7c 100644
--- a/core/java/test/org/openda/blackbox/wrapper/testData/noiseModel2DMaps/noiseRatio2DMappingSmaller/bbWrapperConfig_noiseRatio2DMappingSmaller.xml
+++ b/core/java/test/org/openda/blackbox/wrapper/testData/noiseModel2DMaps/noiseRatio2DMappingSmaller/bbWrapperConfig_noiseRatio2DMappingSmaller.xml
@@ -22,10 +22,10 @@
-
+
param2D_20020102.asc
param2D
-
+
diff --git a/core/java/test/org/openda/blackbox/wrapper/testData/parameterUncertainty/DummyWrapperConfig.xml b/core/java/test/org/openda/blackbox/wrapper/testData/parameterUncertainty/DummyWrapperConfig.xml
index 247ce4009..20c02e8ac 100644
--- a/core/java/test/org/openda/blackbox/wrapper/testData/parameterUncertainty/DummyWrapperConfig.xml
+++ b/core/java/test/org/openda/blackbox/wrapper/testData/parameterUncertainty/DummyWrapperConfig.xml
@@ -19,10 +19,10 @@
-
+
not-needed
parametersIoObject
-
+
diff --git a/core/java/test/org/openda/blackbox/wrapper/testData/restart/bbWrapperConfig.xml b/core/java/test/org/openda/blackbox/wrapper/testData/restart/bbWrapperConfig.xml
index b0f93c73f..16b71a38a 100644
--- a/core/java/test/org/openda/blackbox/wrapper/testData/restart/bbWrapperConfig.xml
+++ b/core/java/test/org/openda/blackbox/wrapper/testData/restart/bbWrapperConfig.xml
@@ -21,12 +21,12 @@
-
+
dflow1d/wlevStateFileIn.xyz
state
-
+
-
\ No newline at end of file
+
diff --git a/core/java/test/org/openda/blackbox/wrapper/testData/restartFirstPart/bbWrapperConfig.xml b/core/java/test/org/openda/blackbox/wrapper/testData/restartFirstPart/bbWrapperConfig.xml
index 428bd79ff..6f655562b 100644
--- a/core/java/test/org/openda/blackbox/wrapper/testData/restartFirstPart/bbWrapperConfig.xml
+++ b/core/java/test/org/openda/blackbox/wrapper/testData/restartFirstPart/bbWrapperConfig.xml
@@ -56,10 +56,10 @@
-
+
%statefile%
statefile
-
+
diff --git a/core/java/test/org/openda/blackbox/wrapper/testData/restartFull/bbWrapperConfig.xml b/core/java/test/org/openda/blackbox/wrapper/testData/restartFull/bbWrapperConfig.xml
index 428bd79ff..6f655562b 100644
--- a/core/java/test/org/openda/blackbox/wrapper/testData/restartFull/bbWrapperConfig.xml
+++ b/core/java/test/org/openda/blackbox/wrapper/testData/restartFull/bbWrapperConfig.xml
@@ -56,10 +56,10 @@
-
+
%statefile%
statefile
-
+
diff --git a/core/java/test/org/openda/blackbox/wrapper/testData/restartSecondPart/bbWrapperConfig.xml b/core/java/test/org/openda/blackbox/wrapper/testData/restartSecondPart/bbWrapperConfig.xml
index 428bd79ff..6f655562b 100644
--- a/core/java/test/org/openda/blackbox/wrapper/testData/restartSecondPart/bbWrapperConfig.xml
+++ b/core/java/test/org/openda/blackbox/wrapper/testData/restartSecondPart/bbWrapperConfig.xml
@@ -56,10 +56,10 @@
-
+
%statefile%
statefile
-
+
diff --git a/core/java/test/org/openda/blackbox/wrapper/testData/timeInfo/wrapperConf.xml b/core/java/test/org/openda/blackbox/wrapper/testData/timeInfo/wrapperConf.xml
index d3843d8ae..53ac3d635 100644
--- a/core/java/test/org/openda/blackbox/wrapper/testData/timeInfo/wrapperConf.xml
+++ b/core/java/test/org/openda/blackbox/wrapper/testData/timeInfo/wrapperConf.xml
@@ -12,13 +12,13 @@
-
+
noRealFile
timeInfoIoObject
2010-07-16 23:59:59
2010-07-17 00:01:01
-
+
-
+
diff --git a/core/java/test/org/openda/blackbox/wrapper/testData/transformations/simpleBbWrapperConfig.xml b/core/java/test/org/openda/blackbox/wrapper/testData/transformations/simpleBbWrapperConfig.xml
index f117424dd..01e7eea30 100644
--- a/core/java/test/org/openda/blackbox/wrapper/testData/transformations/simpleBbWrapperConfig.xml
+++ b/core/java/test/org/openda/blackbox/wrapper/testData/transformations/simpleBbWrapperConfig.xml
@@ -1,5 +1,7 @@
-
+
@@ -22,10 +24,10 @@
-
+
no file needed
DummyAstroIoObject
-
+
diff --git a/core/xmlSchemas/examples/stochObservers/swanStochObsConfig.xml b/core/xmlSchemas/examples/stochObservers/swanStochObsConfig.xml
index 4e354be70..139f57179 100644
--- a/core/xmlSchemas/examples/stochObservers/swanStochObsConfig.xml
+++ b/core/xmlSchemas/examples/stochObservers/swanStochObsConfig.xml
@@ -1,9 +1,9 @@
-
+
stochObsUncertainties.xml
-
+
meas_l21triad_loc.tab
-
-
+
+
diff --git a/core/xmlSchemas/examples/wrappers/d3dBbWrapperConfig.xml b/core/xmlSchemas/examples/wrappers/d3dBbWrapperConfig.xml
index 5afc60ed8..33f363e22 100644
--- a/core/xmlSchemas/examples/wrappers/d3dBbWrapperConfig.xml
+++ b/core/xmlSchemas/examples/wrappers/d3dBbWrapperConfig.xml
@@ -30,25 +30,25 @@
-
+
%runid%.mdf
roughness
rgh
-
+
-
+
%runid%.mdf
depth
dep
-
+
-
+
trih-%runid%.dat
trih-file
%NATIVE_DLL_DIR%
-
+
diff --git a/course/exercise_black_box_calibration_polution_NOT_WORKING/stochModel/polluteWrapper.xml b/course/exercise_black_box_calibration_polution_NOT_WORKING/stochModel/polluteWrapper.xml
index 58f29cab4..f7fd50769 100644
--- a/course/exercise_black_box_calibration_polution_NOT_WORKING/stochModel/polluteWrapper.xml
+++ b/course/exercise_black_box_calibration_polution_NOT_WORKING/stochModel/polluteWrapper.xml
@@ -57,39 +57,39 @@
-
-
+
+
%inputFile%
input
-
+
-
+
%inputFileReactionTime%
input_reaction_time
-
+
-
+
%inputFileSimulationTime%
input_simulation_time
as_separate_exchange_items
-
+
-
+
%inputFileC1%
input_c1
-
+
-
+
%inputFileC2%
input_c2
-
+
-
-
+
+
%outputFile%
output
-
+
diff --git a/course/exercise_black_box_enkf_polution/stochModel/polluteWrapper.xml b/course/exercise_black_box_enkf_polution/stochModel/polluteWrapper.xml
index 365654e68..d48b06a08 100644
--- a/course/exercise_black_box_enkf_polution/stochModel/polluteWrapper.xml
+++ b/course/exercise_black_box_enkf_polution/stochModel/polluteWrapper.xml
@@ -56,36 +56,36 @@
-
+ -->
-
+
%configFile%
configuration
-
+
-
+
%inputFileC1%
state_concentration1
-
+
-
+
%inputFileC2%
state_concentration2
-
+
-
+
timeSeriesFormatter.xml
output
-
+
-
+
forcingsSeriesFormatter.xml
forcings
-
+
diff --git a/course/exercise_oct24/stochModel/polluteWrapper.xml b/course/exercise_oct24/stochModel/polluteWrapper.xml
index 0f9e10535..e8f4e327e 100644
--- a/course/exercise_oct24/stochModel/polluteWrapper.xml
+++ b/course/exercise_oct24/stochModel/polluteWrapper.xml
@@ -1,7 +1,7 @@
+ xsi:schemaLocation="http://www.openda.org http://schemas.openda.org/blackBoxWrapperConfig.xsd">
@@ -45,16 +45,16 @@
-
+
%inputFile%
input
-
+
-
+
%outputFile%
output
-
+
diff --git a/course/exercise_oct24/stochModel/polluteWrapper1.xml b/course/exercise_oct24/stochModel/polluteWrapper1.xml
index 8c9137214..bf600c4f1 100644
--- a/course/exercise_oct24/stochModel/polluteWrapper1.xml
+++ b/course/exercise_oct24/stochModel/polluteWrapper1.xml
@@ -1,7 +1,8 @@
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.openda.org
+ http://schemas.openda.org/blackBoxWrapperConfig.xsd">
@@ -46,23 +47,23 @@
-
+
%templateFile%
template
starttime
reaction_time
-
+
-
+
%inputFile%
input
-
+
-
+
%outputFile%
output
-
+
diff --git a/course/exercise_oct24/stochModel/polluteWrapper2.xml b/course/exercise_oct24/stochModel/polluteWrapper2.xml
index 7c05c51b0..ee58bc814 100644
--- a/course/exercise_oct24/stochModel/polluteWrapper2.xml
+++ b/course/exercise_oct24/stochModel/polluteWrapper2.xml
@@ -1,7 +1,7 @@
+ xsi:schemaLocation="http://www.openda.org http://schemas.openda.org/blackBoxWrapperConfig.xsd">
@@ -55,17 +55,6 @@
-
- %inputFile%
- input
-
-
-
-
- %outputFile%
- output
-
-
%noosFilec1A%
c1_locA
@@ -91,6 +80,17 @@
c2_locC
+
+ %inputFile%
+ input
+
+
+
+
+ %outputFile%
+ output
+
+
diff --git a/course/exercise_oct24/stochModel/polluteWrapper3.xml b/course/exercise_oct24/stochModel/polluteWrapper3.xml
index 8620d5397..dc77594cd 100644
--- a/course/exercise_oct24/stochModel/polluteWrapper3.xml
+++ b/course/exercise_oct24/stochModel/polluteWrapper3.xml
@@ -1,7 +1,7 @@
+ xsi:schemaLocation="http://www.openda.org http://schemas.openda.org/blackBoxWrapperConfig.xsd">
@@ -60,12 +60,6 @@
-
- %inputFile%
- input
-
-
-
%noosFilec1A%
c1_locA
@@ -91,15 +85,22 @@
c2_locC
-
- %xmlFilec1%
- grid_c1
-
+
+ %inputFile%
+ input
+
+
+
+
+
+ %xmlFilec1%
+ grid_c1
+
-
- %xmlFilec2%
- grid_c2
-
+
+ %xmlFilec2%
+ grid_c2
+
diff --git a/model_RainfallRunoffZhang/tests/model/WrapperConfig.xml b/model_RainfallRunoffZhang/tests/model/WrapperConfig.xml
index acc1e0e55..f57638cf2 100644
--- a/model_RainfallRunoffZhang/tests/model/WrapperConfig.xml
+++ b/model_RainfallRunoffZhang/tests/model/WrapperConfig.xml
@@ -42,46 +42,46 @@
-
+
%inputFileInitialStates%
initialStates
%instanceDir%%instanceNumber%
-
+
-
+
%inputFileParameters%
parameters
%instanceDir%%instanceNumber%
-
+
-
+
%inputFileTimes%
timeConfig
%instanceDir%%instanceNumber%
-
+
-
+
%outputFile%
output
%instanceDir%%instanceNumber%
-
+
-
+
%forcingPrecipFile%
forcingPrecip
%instanceDir%%instanceNumber%
-
+
-
+
%forcingPotETFile%
forcingPotET
%instanceDir%%instanceNumber%
-
+
diff --git a/model_bmi/java/test/org/openda/model_bmi/testData/wflowBmiModelTest/openda_config/Murrumbegee/Murrumbegee_stochObsConfig.xml b/model_bmi/java/test/org/openda/model_bmi/testData/wflowBmiModelTest/openda_config/Murrumbegee/Murrumbegee_stochObsConfig.xml
index 71c85c027..04aff351c 100644
--- a/model_bmi/java/test/org/openda/model_bmi/testData/wflowBmiModelTest/openda_config/Murrumbegee/Murrumbegee_stochObsConfig.xml
+++ b/model_bmi/java/test/org/openda/model_bmi/testData/wflowBmiModelTest/openda_config/Murrumbegee/Murrumbegee_stochObsConfig.xml
@@ -1,5 +1,5 @@
-
@@ -9,10 +9,10 @@
-
+
../../observations.nc
true
false
-
+
-
+
diff --git a/model_damflow/tests/test1/stochModel/damflowWrapper.xml b/model_damflow/tests/test1/stochModel/damflowWrapper.xml
index b5c2edadb..0988afaa0 100644
--- a/model_damflow/tests/test1/stochModel/damflowWrapper.xml
+++ b/model_damflow/tests/test1/stochModel/damflowWrapper.xml
@@ -38,35 +38,35 @@
-
+
%inputFileName%.C000
dupuitC
-
+
-
+
%inputFileName%.P
dupuitP
-
+
-
+
%inputFileName%.O
dupuitO
-
+
-
+
%inputFileName%.B
dupuitB
-
+
-
+
%inputFileName%.G
dupuitG
-
+
diff --git a/model_damflow/tests/test1/stochObserver/damflowStochObsConfig.xml b/model_damflow/tests/test1/stochObserver/damflowStochObsConfig.xml
index 14aa41040..d7cc82475 100644
--- a/model_damflow/tests/test1/stochObserver/damflowStochObsConfig.xml
+++ b/model_damflow/tests/test1/stochObserver/damflowStochObsConfig.xml
@@ -1,9 +1,9 @@
-
+
stochObsUncertainties.xml
-
+
observ/dupuit.H
-
-
+
+
diff --git a/model_damflow/tests/test2/stochModel/damflowWrapper.xml b/model_damflow/tests/test2/stochModel/damflowWrapper.xml
index 641360d2e..e70600422 100644
--- a/model_damflow/tests/test2/stochModel/damflowWrapper.xml
+++ b/model_damflow/tests/test2/stochModel/damflowWrapper.xml
@@ -28,41 +28,41 @@
-
+
%inputFileName%.C000
state0
-
+
-
+
%inputFileName%.C001
state1
-
+
-
+
%inputFileName%.P
timeInfo
-
+
-
+
%inputFileName%.O
output
-
+
-
+
%inputFileName%.B
input
-
+
-
+
%inputFileName%.G
materialProperty
-
+
diff --git a/model_damflow/tests/test2/stochObserver/damflowStochObsConfig.xml b/model_damflow/tests/test2/stochObserver/damflowStochObsConfig.xml
index 14aa41040..d7cc82475 100644
--- a/model_damflow/tests/test2/stochObserver/damflowStochObsConfig.xml
+++ b/model_damflow/tests/test2/stochObserver/damflowStochObsConfig.xml
@@ -1,9 +1,9 @@
-
+
stochObsUncertainties.xml
-
+
observ/dupuit.H
-
-
+
+
diff --git a/model_damflow/tests/test3/stochModel/damflowWrapper.xml b/model_damflow/tests/test3/stochModel/damflowWrapper.xml
index 5399f8f63..210caa46f 100644
--- a/model_damflow/tests/test3/stochModel/damflowWrapper.xml
+++ b/model_damflow/tests/test3/stochModel/damflowWrapper.xml
@@ -37,35 +37,35 @@
-
+
%inputFileName%.C000
dupuitC
-
+
-
+
%inputFileName%.P
dupuitP
-
+
-
+
%inputFileName%.O
dupuitO
-
+
-
+
%inputFileName%.B
dupuitB
-
+
-
+
%inputFileName%.G
dupuitG
-
+
diff --git a/model_damflow/tests/test3/stochObserver/damflowStochObsConfig.xml b/model_damflow/tests/test3/stochObserver/damflowStochObsConfig.xml
index 14aa41040..d7cc82475 100644
--- a/model_damflow/tests/test3/stochObserver/damflowStochObsConfig.xml
+++ b/model_damflow/tests/test3/stochObserver/damflowStochObsConfig.xml
@@ -1,9 +1,9 @@
-
+
stochObsUncertainties.xml
-
+
observ/dupuit.H
-
-
+
+
diff --git a/model_delft3d/java/test/org/openda/model_delft3d/testData/bb_test_1/stochModel/config/d3dBbWrapperConfig.xml b/model_delft3d/java/test/org/openda/model_delft3d/testData/bb_test_1/stochModel/config/d3dBbWrapperConfig.xml
index 9e3c81a99..f1c0c1163 100644
--- a/model_delft3d/java/test/org/openda/model_delft3d/testData/bb_test_1/stochModel/config/d3dBbWrapperConfig.xml
+++ b/model_delft3d/java/test/org/openda/model_delft3d/testData/bb_test_1/stochModel/config/d3dBbWrapperConfig.xml
@@ -32,31 +32,31 @@
-
+
%runid%.mdf
astro-components
-
+
-
+
%runid%.mdf
roughness
rgh
-
+
-
+
%runid%.mdf
depth
dep
-
+
-
+
trih-%runid%.dat
trih-file
%NATIVE_DLL_DIR%
-
+
diff --git a/model_delft3d/java/test/org/openda/model_delft3d/testData/bb_test_1/stochModel/config/d3dBbWrapperConfig_linux64_gnu.xml b/model_delft3d/java/test/org/openda/model_delft3d/testData/bb_test_1/stochModel/config/d3dBbWrapperConfig_linux64_gnu.xml
index d95ba14ca..45bc69554 100644
--- a/model_delft3d/java/test/org/openda/model_delft3d/testData/bb_test_1/stochModel/config/d3dBbWrapperConfig_linux64_gnu.xml
+++ b/model_delft3d/java/test/org/openda/model_delft3d/testData/bb_test_1/stochModel/config/d3dBbWrapperConfig_linux64_gnu.xml
@@ -32,31 +32,31 @@
-
+
%runid%.mdf
astro-components
-
+
-
+
%runid%.mdf
roughness
rgh
-
+
-
+
%runid%.mdf
depth
dep
-
+
-
+
trih-%runid%.dat
trih-file
%NATIVE_DLL_DIR%
-
-
+
+
diff --git a/model_delft3d/java/test/org/openda/model_delft3d/testData/test_4/stochmodel/D3DWrapperConfig.xml b/model_delft3d/java/test/org/openda/model_delft3d/testData/test_4/stochmodel/D3DWrapperConfig.xml
index 472536bca..2651cd74b 100644
--- a/model_delft3d/java/test/org/openda/model_delft3d/testData/test_4/stochmodel/D3DWrapperConfig.xml
+++ b/model_delft3d/java/test/org/openda/model_delft3d/testData/test_4/stochmodel/D3DWrapperConfig.xml
@@ -41,46 +41,46 @@
-
+
%runid%.mdf
astro-components
-
+
-
+
%runid%.mdf
roughness
rgh
-
+
-
+
%runid%.mdf
depth
dep
-
+
-
+
%runid%.mdf
windguFile
gu
-
+
-
+
%runid%.mdf
windgvFile
gv
-
+
-
+
trih-%runid%.dat
trih-file
%NATIVE_DLL_DIR%
-
+
diff --git a/model_delft3d/java/test/org/openda/model_delft3d/testData/test_4/stochmodel/D3DWrapperConfig_linux64_gnu.xml b/model_delft3d/java/test/org/openda/model_delft3d/testData/test_4/stochmodel/D3DWrapperConfig_linux64_gnu.xml
index eb5cc9d1b..0f52d1c52 100644
--- a/model_delft3d/java/test/org/openda/model_delft3d/testData/test_4/stochmodel/D3DWrapperConfig_linux64_gnu.xml
+++ b/model_delft3d/java/test/org/openda/model_delft3d/testData/test_4/stochmodel/D3DWrapperConfig_linux64_gnu.xml
@@ -41,46 +41,46 @@
-
+
%runid%.mdf
astro-components
-
+
-
+
%runid%.mdf
roughness
rgh
-
+
-
+
%runid%.mdf
depth
dep
-
+
-
+
%runid%.mdf
windguFile
gu
-
+
-
+
%runid%.mdf
windgvFile
gv
-
+
-
+
trih-%runid%.dat
trih-file
%NATIVE_DLL_DIR%
-
+
diff --git a/model_delft3d/tests/calibration_estuary/stochModel/D3DWrapper.xml b/model_delft3d/tests/calibration_estuary/stochModel/D3DWrapper.xml
index d75ef9761..dc96a621f 100644
--- a/model_delft3d/tests/calibration_estuary/stochModel/D3DWrapper.xml
+++ b/model_delft3d/tests/calibration_estuary/stochModel/D3DWrapper.xml
@@ -39,31 +39,31 @@
-
+
%runid%.mdf
roughness
rgh
-
+
-
+
%runid%.mdf
depth
dep
-
+
-
+
%runid%.mdf
astro-components
-
+
-
+
trih-%runid%.nc
trih-file
true
-
+
diff --git a/model_delft3d/tests/calibration_estuary_dd/stochModel/D3DWrapper.xml b/model_delft3d/tests/calibration_estuary_dd/stochModel/D3DWrapper.xml
index fa2aebc2a..c49c45023 100644
--- a/model_delft3d/tests/calibration_estuary_dd/stochModel/D3DWrapper.xml
+++ b/model_delft3d/tests/calibration_estuary_dd/stochModel/D3DWrapper.xml
@@ -40,46 +40,46 @@
-
+
%runid%1.mdf
roughness1
rgh
-
-
+
+
%runid%2.mdf
roughness2
rgh
-
+
-
+
%runid%1.mdf
depth1
dep
-
-
+
+
%runid%2.mdf
depth2
dep
-
+
-
+
%runid%1.mdf
astro-components
-
+
-
+
trih-%runid%1.nc
trih-file1
true
-
-
+
+
trih-%runid%2.nc
trih-file2
true
-
+
diff --git a/model_delft3d/tests/calibration_river_roughness/stochmodel/detmodel/D3DWrapper.xml b/model_delft3d/tests/calibration_river_roughness/stochmodel/detmodel/D3DWrapper.xml
index a2ddc5aa7..1c9002b6a 100644
--- a/model_delft3d/tests/calibration_river_roughness/stochmodel/detmodel/D3DWrapper.xml
+++ b/model_delft3d/tests/calibration_river_roughness/stochmodel/detmodel/D3DWrapper.xml
@@ -35,37 +35,37 @@
-
+
%runid%.mdf
roughness
rgh
-
+
-
+
%runid%.mdf
depth
dep
-
+
-
+
%runid%.mdf
astro-components
-
+
-
+
trih-%runid%.nc
trih-file
true
-
+
-
+
%roughParamsFile%
roughParams
-
+
diff --git a/model_delft3d/tests/calibration_wind/stochmodel/D3DWrapperConfig.xml b/model_delft3d/tests/calibration_wind/stochmodel/D3DWrapperConfig.xml
index e10017d8f..e5c06598a 100644
--- a/model_delft3d/tests/calibration_wind/stochmodel/D3DWrapperConfig.xml
+++ b/model_delft3d/tests/calibration_wind/stochmodel/D3DWrapperConfig.xml
@@ -41,46 +41,46 @@
-
+
%runid%.mdf
- astro-components
-
+ astro-components
+
-
+
%runid%.mdf
roughness
rgh
-
+
-
+
%runid%.mdf
depth
dep
-
+
-
+
%runid%.mdf
windguFile
gu
-
+
-
+
%runid%.mdf
windgvFile
gv
-
-
-
-
- trih-%runid%.nc
- trih-file
- true
-
-
+
+
+
+
+ trih-%runid%.nc
+ trih-file
+ true
+
+
diff --git a/model_delft3d/tests/d3d_3Dlake_EnKF/stochModel/D3DWrapper.xml b/model_delft3d/tests/d3d_3Dlake_EnKF/stochModel/D3DWrapper.xml
index fa692f71f..967149bd7 100644
--- a/model_delft3d/tests/d3d_3Dlake_EnKF/stochModel/D3DWrapper.xml
+++ b/model_delft3d/tests/d3d_3Dlake_EnKF/stochModel/D3DWrapper.xml
@@ -38,39 +38,39 @@
-
+
%runid%.mdf
mdFile
-
+
-
+
trih-%runid%.nc
trih-file
-
+
-
+
%runid%.mdf
windwuFile
wu
-
+
-
+
%runid%.mdf
windwvFile
wv
-
+
-
+
trim-%runid%.nc
states
tri-rst.restart-in
%targetTime%
-
+
diff --git a/model_delft3d/tests/d3d_3Dlake_EnKF_states/stochModel/D3DWrapper.xml b/model_delft3d/tests/d3d_3Dlake_EnKF_states/stochModel/D3DWrapper.xml
index fc39bdfda..51f301630 100644
--- a/model_delft3d/tests/d3d_3Dlake_EnKF_states/stochModel/D3DWrapper.xml
+++ b/model_delft3d/tests/d3d_3Dlake_EnKF_states/stochModel/D3DWrapper.xml
@@ -30,39 +30,39 @@
-
+
%runid%.mdf
mdFile
-
+
-
+
trih-%runid%.nc
trih-file
-
+
-
+
%runid%.mdf
windwuFile
wu
-
+
-
+
%runid%.mdf
windwvFile
wv
-
+
-
+
trim-%runid%.nc
states
restart-in
%targetTime%
-
+
diff --git a/model_delft3d/tests/d3d_3Dlake_calibration/stochModel/D3DWrapper.xml b/model_delft3d/tests/d3d_3Dlake_calibration/stochModel/D3DWrapper.xml
index ddd082582..68cc63cc1 100644
--- a/model_delft3d/tests/d3d_3Dlake_calibration/stochModel/D3DWrapper.xml
+++ b/model_delft3d/tests/d3d_3Dlake_calibration/stochModel/D3DWrapper.xml
@@ -39,16 +39,16 @@
-
+
%runid%.mdf
mdFile
-
+
-
+
trih-%runid%.nc
trih-file
-
+
diff --git a/model_delft3d/tests/d3d_3Dlake_calibration/stochObserver/stochObsConfig.xml b/model_delft3d/tests/d3d_3Dlake_calibration/stochObserver/stochObsConfig.xml
index 1335abd8a..417426184 100644
--- a/model_delft3d/tests/d3d_3Dlake_calibration/stochObserver/stochObsConfig.xml
+++ b/model_delft3d/tests/d3d_3Dlake_calibration/stochObserver/stochObsConfig.xml
@@ -1,11 +1,11 @@
-
+
stochObsUncertainties.xml
-
+
trih-cadagno_netcdf.nc
-
-
+
+
diff --git a/model_delft3d/tests/kalman_estuary/stochModel/D3DWrapper.xml b/model_delft3d/tests/kalman_estuary/stochModel/D3DWrapper.xml
index d75ef9761..dc96a621f 100644
--- a/model_delft3d/tests/kalman_estuary/stochModel/D3DWrapper.xml
+++ b/model_delft3d/tests/kalman_estuary/stochModel/D3DWrapper.xml
@@ -39,31 +39,31 @@
-
+
%runid%.mdf
roughness
rgh
-
+
-
+
%runid%.mdf
depth
dep
-
+
-
+
%runid%.mdf
astro-components
-
+
-
+
trih-%runid%.nc
trih-file
true
-
+
diff --git a/model_delwaq/tests/test1/stochModel/efdcWrapper.xml b/model_delwaq/tests/test1/stochModel/efdcWrapper.xml
index c20b93bf4..e1f202263 100644
--- a/model_delwaq/tests/test1/stochModel/efdcWrapper.xml
+++ b/model_delwaq/tests/test1/stochModel/efdcWrapper.xml
@@ -30,16 +30,16 @@
-
+
%inpConstantsFile%
constantsFile
%inpConstantsDataFile%
-
+
-
+
%delwaqOutputFile%
outputFile
-
+
diff --git a/model_delwaq/tests/test1/stochObserver/delwaqMapStochObsConfig.xml b/model_delwaq/tests/test1/stochObserver/delwaqMapStochObsConfig.xml
index acff9af53..eae45935e 100644
--- a/model_delwaq/tests/test1/stochObserver/delwaqMapStochObsConfig.xml
+++ b/model_delwaq/tests/test1/stochObserver/delwaqMapStochObsConfig.xml
@@ -1,13 +1,13 @@
-
stochObsUncertainties.xml
-
+
measurements_res.map
0
0
-
-
+
+
diff --git a/model_dflowfm_blackbox/tests/calibration_discharge_dependent_river_roughness/stochModel/dflowfmWrapper.xml b/model_dflowfm_blackbox/tests/calibration_discharge_dependent_river_roughness/stochModel/dflowfmWrapper.xml
index a603724ec..943a5583c 100644
--- a/model_dflowfm_blackbox/tests/calibration_discharge_dependent_river_roughness/stochModel/dflowfmWrapper.xml
+++ b/model_dflowfm_blackbox/tests/calibration_discharge_dependent_river_roughness/stochModel/dflowfmWrapper.xml
@@ -35,35 +35,35 @@
-
+
%frictionMultiplierFile%
frictionCoefFile
idsFromTemplateFile=%frictionMultiplierTemplateFile%
idPrefix=friction_
-
+
-
+
%depthMultiplierFile%
depthCoefFile
idsFromTemplateFile=%depthMultiplierTemplateFile%
idPrefix=depth_
-
+
-
+
%netcdfoutput%
%netcdfoutput%
true
false
-
-
+
+
%inputFile%
boundaries
-
+
-
+
%trachytopeFile%
ttdFile
-
+
diff --git a/model_dflowfm_blackbox/tests/calibration_river_roughness/stochModel/dflowfmWrapper.xml b/model_dflowfm_blackbox/tests/calibration_river_roughness/stochModel/dflowfmWrapper.xml
index a603724ec..943a5583c 100644
--- a/model_dflowfm_blackbox/tests/calibration_river_roughness/stochModel/dflowfmWrapper.xml
+++ b/model_dflowfm_blackbox/tests/calibration_river_roughness/stochModel/dflowfmWrapper.xml
@@ -35,35 +35,35 @@
-
+
%frictionMultiplierFile%
frictionCoefFile
idsFromTemplateFile=%frictionMultiplierTemplateFile%
idPrefix=friction_
-
+
-
+
%depthMultiplierFile%
depthCoefFile
idsFromTemplateFile=%depthMultiplierTemplateFile%
idPrefix=depth_
-
+
-
+
%netcdfoutput%
%netcdfoutput%
true
false
-
-
+
+
%inputFile%
boundaries
-
+
-
+
%trachytopeFile%
ttdFile
-
+
diff --git a/model_dflowfm_blackbox/tests/dcsmv5_kalman/stochModel/dflowfmWrapper.xml b/model_dflowfm_blackbox/tests/dcsmv5_kalman/stochModel/dflowfmWrapper.xml
index 0fd7a8245..9838b8af8 100644
--- a/model_dflowfm_blackbox/tests/dcsmv5_kalman/stochModel/dflowfmWrapper.xml
+++ b/model_dflowfm_blackbox/tests/dcsmv5_kalman/stochModel/dflowfmWrapper.xml
@@ -39,24 +39,24 @@
-
+
%mdufile%
mdufile
-
-
+
+
%mapfile%
mapfile
-
-
+
+
%outputdir%/%hisfile%
hisfile
true
false
-
-
+
+
%meteofile%
meteofile
-
+
diff --git a/model_dflowfm_blackbox/tests/estuary_calibration/stochModel/dflowfmWrapper.xml b/model_dflowfm_blackbox/tests/estuary_calibration/stochModel/dflowfmWrapper.xml
index 6a7ebf07a..b3e6bf4f2 100644
--- a/model_dflowfm_blackbox/tests/estuary_calibration/stochModel/dflowfmWrapper.xml
+++ b/model_dflowfm_blackbox/tests/estuary_calibration/stochModel/dflowfmWrapper.xml
@@ -34,30 +34,30 @@
-
+
%frictionMultiplierFile%
frictionCoefFile
idsFromTemplateFile=%frictionMultiplierTemplateFile%
idPrefix=friction_
-
+
-
+
%depthMultiplierFile%
depthCoefFile
idsFromTemplateFile=%depthMultiplierTemplateFile%
idPrefix=depth_
-
+
-
+
%netcdfoutput%
%netcdfoutput%
true
false
-
-
+
+
%inputFile%
boundaries
-
+
diff --git a/model_dflowfm_blackbox/tests/estuary_kalman/stochModel/dflowfmWrapper.xml b/model_dflowfm_blackbox/tests/estuary_kalman/stochModel/dflowfmWrapper.xml
index ef26f2d9d..2d2b4a4ad 100644
--- a/model_dflowfm_blackbox/tests/estuary_kalman/stochModel/dflowfmWrapper.xml
+++ b/model_dflowfm_blackbox/tests/estuary_kalman/stochModel/dflowfmWrapper.xml
@@ -39,24 +39,24 @@
-
+
%mdufile%
mdufile
-
-
+
+
%mapfile%
mapfile
-
-
+
+
%outputdir%/%hisfile%
hisfile
true
false
-
-
+
+
%mdufile%
boundaries
-
+
diff --git a/model_dflowfm_blackbox/tests/estuary_kalman_FMSuite2019.01/stochModel/dflowfmWrapper.xml b/model_dflowfm_blackbox/tests/estuary_kalman_FMSuite2019.01/stochModel/dflowfmWrapper.xml
index 016eba827..d380ded3a 100644
--- a/model_dflowfm_blackbox/tests/estuary_kalman_FMSuite2019.01/stochModel/dflowfmWrapper.xml
+++ b/model_dflowfm_blackbox/tests/estuary_kalman_FMSuite2019.01/stochModel/dflowfmWrapper.xml
@@ -41,24 +41,24 @@
-
+
%mdufile%
mdufile
-
-
+
+
%mapfile%
mapfile
-
-
+
+
%hisfile%
hisfile
true
false
-
-
+
+
%mdufile%
boundaries
-
+
diff --git a/model_dflowfm_blackbox/tests/estuary_kalman_FMSuite2019.01_bcfile/stochModel/dflowfmWrapper.xml b/model_dflowfm_blackbox/tests/estuary_kalman_FMSuite2019.01_bcfile/stochModel/dflowfmWrapper.xml
index df1d5e072..85d9c6f91 100644
--- a/model_dflowfm_blackbox/tests/estuary_kalman_FMSuite2019.01_bcfile/stochModel/dflowfmWrapper.xml
+++ b/model_dflowfm_blackbox/tests/estuary_kalman_FMSuite2019.01_bcfile/stochModel/dflowfmWrapper.xml
@@ -41,29 +41,29 @@
-
+
%mdufile%
mdufile
-
-
+
+
%mapfile%
mapfile
-
-
+
+
%hisfile%
hisfile
true
false
-
-
-
+
+
dflowfm/waterlevel_noise.bc
bcfile
dflowfm/waterlevel_noise.bc
-
+
diff --git a/model_dflowfm_blackbox/tests/lake_kalman/stochModel/dflowfmWrapper.xml b/model_dflowfm_blackbox/tests/lake_kalman/stochModel/dflowfmWrapper.xml
index 0fd7a8245..9838b8af8 100644
--- a/model_dflowfm_blackbox/tests/lake_kalman/stochModel/dflowfmWrapper.xml
+++ b/model_dflowfm_blackbox/tests/lake_kalman/stochModel/dflowfmWrapper.xml
@@ -39,24 +39,24 @@
-
+
%mdufile%
mdufile
-
-
+
+
%mapfile%
mapfile
-
-
+
+
%outputdir%/%hisfile%
hisfile
true
false
-
-
+
+
%meteofile%
meteofile
-
+
diff --git a/model_dflowfm_blackbox/tests/lake_kalman/stochObserver/dflowfmStochObsConfig.xml b/model_dflowfm_blackbox/tests/lake_kalman/stochObserver/dflowfmStochObsConfig.xml
index 4ded5bda9..9428d621f 100644
--- a/model_dflowfm_blackbox/tests/lake_kalman/stochObserver/dflowfmStochObsConfig.xml
+++ b/model_dflowfm_blackbox/tests/lake_kalman/stochObserver/dflowfmStochObsConfig.xml
@@ -1,11 +1,11 @@
-
+
stochObsUncertainties.xml
-
+
lake2d_his.nc
true
false
-
-
+
+
diff --git a/model_dflowfm_blackbox/tests/simple_waal_calibration_roughness/stochModel/dflowfmWrapper.xml b/model_dflowfm_blackbox/tests/simple_waal_calibration_roughness/stochModel/dflowfmWrapper.xml
index 39ebd42ac..4644eeb0a 100644
--- a/model_dflowfm_blackbox/tests/simple_waal_calibration_roughness/stochModel/dflowfmWrapper.xml
+++ b/model_dflowfm_blackbox/tests/simple_waal_calibration_roughness/stochModel/dflowfmWrapper.xml
@@ -32,19 +32,19 @@
-
+
%frictionMultiplierFile%
frictionCoefFile
idsFromTemplateFile=%frictionMultiplierTemplateFile%
idPrefix=friction_
-
+
-
+
%netcdfoutput%
%netcdfoutput%
true
false
-
+
diff --git a/model_dflowfm_blackbox/tests/simple_waal_kalman/stochModel/dflowfmWrapper.xml b/model_dflowfm_blackbox/tests/simple_waal_kalman/stochModel/dflowfmWrapper.xml
index ea1cbf9a5..02ab02669 100644
--- a/model_dflowfm_blackbox/tests/simple_waal_kalman/stochModel/dflowfmWrapper.xml
+++ b/model_dflowfm_blackbox/tests/simple_waal_kalman/stochModel/dflowfmWrapper.xml
@@ -38,24 +38,24 @@
-
+
%mdufile%
mdufile
-
-
+
+
%mapfile%
mapfile
-
-
+
+
%outputdir%/%hisfile%
hisfile
true
false
-
-
+
+
%mdufile%
boundaries
-
+
diff --git a/model_dflowfm_blackbox/tests/simple_waal_salt_kalman/stochModel/dflowfmWrapper.xml b/model_dflowfm_blackbox/tests/simple_waal_salt_kalman/stochModel/dflowfmWrapper.xml
index ef26f2d9d..2d2b4a4ad 100644
--- a/model_dflowfm_blackbox/tests/simple_waal_salt_kalman/stochModel/dflowfmWrapper.xml
+++ b/model_dflowfm_blackbox/tests/simple_waal_salt_kalman/stochModel/dflowfmWrapper.xml
@@ -39,24 +39,24 @@
-
+
%mdufile%
mdufile
-
-
+
+
%mapfile%
mapfile
-
-
+
+
%outputdir%/%hisfile%
hisfile
true
false
-
-
+
+
%mdufile%
boundaries
-
+
diff --git a/model_efdc_dll/java/test/org/openda/model_efdc_dll/testData/observation/stochObserverConfig.xml b/model_efdc_dll/java/test/org/openda/model_efdc_dll/testData/observation/stochObserverConfig.xml
index c76bf68f0..52bdf9464 100644
--- a/model_efdc_dll/java/test/org/openda/model_efdc_dll/testData/observation/stochObserverConfig.xml
+++ b/model_efdc_dll/java/test/org/openda/model_efdc_dll/testData/observation/stochObserverConfig.xml
@@ -1,5 +1,5 @@
-
@@ -9,11 +9,11 @@
-
+
AlgalGreenAlgae.nc
true
false
-
+
-
+
diff --git a/model_efdc_dll/tests/han_dll_EnSIM_NN/stochObserver/stochObserverConfig.xml b/model_efdc_dll/tests/han_dll_EnSIM_NN/stochObserver/stochObserverConfig.xml
index 60f91ba00..147c31b71 100644
--- a/model_efdc_dll/tests/han_dll_EnSIM_NN/stochObserver/stochObserverConfig.xml
+++ b/model_efdc_dll/tests/han_dll_EnSIM_NN/stochObserver/stochObserverConfig.xml
@@ -1,5 +1,5 @@
-
@@ -9,11 +9,11 @@
-
+
WaterTemperature.nc
true
false
-
+
-
+
diff --git a/model_example_blackbox/tests/blackbox_example_calibration/stochModel/polluteWrapper.xml b/model_example_blackbox/tests/blackbox_example_calibration/stochModel/polluteWrapper.xml
index 47d907567..2a3d96cfc 100644
--- a/model_example_blackbox/tests/blackbox_example_calibration/stochModel/polluteWrapper.xml
+++ b/model_example_blackbox/tests/blackbox_example_calibration/stochModel/polluteWrapper.xml
@@ -40,16 +40,16 @@
-
+
%inputFile%
input
-
+
-
+
%outputFile%
output
-
+
diff --git a/model_example_blackbox/tests/blackbox_example_kalman/stochModel/polluteWrapper.xml b/model_example_blackbox/tests/blackbox_example_kalman/stochModel/polluteWrapper.xml
index 368bbadf2..fa7c07e72 100644
--- a/model_example_blackbox/tests/blackbox_example_kalman/stochModel/polluteWrapper.xml
+++ b/model_example_blackbox/tests/blackbox_example_kalman/stochModel/polluteWrapper.xml
@@ -46,16 +46,16 @@
-
+
%inputFile%
input
-
+
-
+
%outputFile%
output
-
+
diff --git a/model_glm/tests/glm_calibration_example/stochModel/glmWrapper.xml b/model_glm/tests/glm_calibration_example/stochModel/glmWrapper.xml
index d34641770..5290965ec 100644
--- a/model_glm/tests/glm_calibration_example/stochModel/glmWrapper.xml
+++ b/model_glm/tests/glm_calibration_example/stochModel/glmWrapper.xml
@@ -40,16 +40,16 @@
-
+
%inputFile%
input
-
+
-
+
%outputFile%
output
-
+
diff --git a/model_gotm/tests/gotm_calibration_example/stochModel/gotmWrapper.xml b/model_gotm/tests/gotm_calibration_example/stochModel/gotmWrapper.xml
index 9a298734f..dbdcffe1f 100644
--- a/model_gotm/tests/gotm_calibration_example/stochModel/gotmWrapper.xml
+++ b/model_gotm/tests/gotm_calibration_example/stochModel/gotmWrapper.xml
@@ -82,45 +82,45 @@
-
+
%inputFile%
input
-
+
-
+
%inputFileTurb%
inputTurb
-
-
+
+
%outputMeanTop%
meanTempTop
-
-
+
+
%outputMeanMid%
meanTempMid
-
-
+
+
%outputMeanBot%
meanTempBot
-
+
-
+ -->
-
+
%outputFile%
output
true
false
-
+
diff --git a/model_gotm/tests/gotm_calibration_example/stochObserver/gotmStochObsConfig.xml b/model_gotm/tests/gotm_calibration_example/stochObserver/gotmStochObsConfig.xml
index 7dc1c4c64..4af8c80a1 100644
--- a/model_gotm/tests/gotm_calibration_example/stochObserver/gotmStochObsConfig.xml
+++ b/model_gotm/tests/gotm_calibration_example/stochObserver/gotmStochObsConfig.xml
@@ -1,15 +1,15 @@
-
+
stochObsUncertainties.xml
-
+
observ/meantemptop.txt
-
-
+
+
observ/meantempmid.txt
-
-
+
+
observ/meantempbot.txt
-
-
+
+
diff --git a/model_gotm/tests/gotm_simple_kalman/stochModel/gotmWrapper.xml b/model_gotm/tests/gotm_simple_kalman/stochModel/gotmWrapper.xml
index 1ba2f579e..a34c71433 100644
--- a/model_gotm/tests/gotm_simple_kalman/stochModel/gotmWrapper.xml
+++ b/model_gotm/tests/gotm_simple_kalman/stochModel/gotmWrapper.xml
@@ -83,82 +83,82 @@
-
+
%inputFile%
input
-
+
-
+
%inputFileTurb%
inputTurb
-
+
-
+
%inputFileMeteo%
inputMeteo
-
+
-
+
%outputTemp%
outTemp
-
-
+
+
%outputSalt%
outSalt
-
-
+
+
%outputEps%
outEps
-
-
+
+
%outputVelo%
outVelo
-
-
+
+
%outputMeanTop%
meanTempTop
-
-
+
+
%outputMeanMid%
meanTempMid
-
-
+
+
%outputMeanBot%
meanTempBot
-
-
+
+
%outputEps%
noise
-
-
+
+
-
+
-
+ -->
-
+
%outputFile%
output
true
false
-
+
diff --git a/model_gotm/tests/gotm_simple_kalman/stochObserver/gotmStochObsConfig.xml b/model_gotm/tests/gotm_simple_kalman/stochObserver/gotmStochObsConfig.xml
index 7dc1c4c64..4af8c80a1 100644
--- a/model_gotm/tests/gotm_simple_kalman/stochObserver/gotmStochObsConfig.xml
+++ b/model_gotm/tests/gotm_simple_kalman/stochObserver/gotmStochObsConfig.xml
@@ -1,15 +1,15 @@
-
+
stochObsUncertainties.xml
-
+
observ/meantemptop.txt
-
-
+
+
observ/meantempmid.txt
-
-
+
+
observ/meantempbot.txt
-
-
+
+
diff --git a/model_reactive_advection/tests/default/stochModel/polluteWrapper.xml b/model_reactive_advection/tests/default/stochModel/polluteWrapper.xml
index 365654e68..d48b06a08 100644
--- a/model_reactive_advection/tests/default/stochModel/polluteWrapper.xml
+++ b/model_reactive_advection/tests/default/stochModel/polluteWrapper.xml
@@ -56,36 +56,36 @@
-
+ -->
-
+
%configFile%
configuration
-
+
-
+
%inputFileC1%
state_concentration1
-
+
-
+
%inputFileC2%
state_concentration2
-
+
-
+
timeSeriesFormatter.xml
output
-
+
-
+
forcingsSeriesFormatter.xml
forcings
-
+
diff --git a/model_swan/java/test/org/openda/model_swan/testData/SwanSimpleBBEnKF/stochModel/bbSwanWrapper.xml b/model_swan/java/test/org/openda/model_swan/testData/SwanSimpleBBEnKF/stochModel/bbSwanWrapper.xml
index e909b8852..15d29f06e 100644
--- a/model_swan/java/test/org/openda/model_swan/testData/SwanSimpleBBEnKF/stochModel/bbSwanWrapper.xml
+++ b/model_swan/java/test/org/openda/model_swan/testData/SwanSimpleBBEnKF/stochModel/bbSwanWrapper.xml
@@ -29,38 +29,38 @@
-
+
%openboundaryFile%
openBoundary
-
+
-
+
%hotFile%
hotFile
-
+
-
+
%outFile%
outFile
-
+
-
+
%inputFile%
timeInfo
-
+
diff --git a/model_swan/java/test/org/openda/model_swan/testData/SwanSimpleBBEnKF/stochObserver/swanStochObsConfig.xml b/model_swan/java/test/org/openda/model_swan/testData/SwanSimpleBBEnKF/stochObserver/swanStochObsConfig.xml
index 0062716b6..eca06d181 100644
--- a/model_swan/java/test/org/openda/model_swan/testData/SwanSimpleBBEnKF/stochObserver/swanStochObsConfig.xml
+++ b/model_swan/java/test/org/openda/model_swan/testData/SwanSimpleBBEnKF/stochObserver/swanStochObsConfig.xml
@@ -1,9 +1,9 @@
-
+
stochObsUncertainties.xml
-
+
observ/timeseries.out
-
-
+
+
diff --git a/model_swan/java/test/org/openda/model_swan/testData/l21triad/stochobserver/swanStochObsConfig.xml b/model_swan/java/test/org/openda/model_swan/testData/l21triad/stochobserver/swanStochObsConfig.xml
index bb5f5a534..5021601cb 100644
--- a/model_swan/java/test/org/openda/model_swan/testData/l21triad/stochobserver/swanStochObsConfig.xml
+++ b/model_swan/java/test/org/openda/model_swan/testData/l21triad/stochobserver/swanStochObsConfig.xml
@@ -1,9 +1,9 @@
-
+
stochObsUncertainties.xml
-
+
meas_l21triad_loc.tab
-
-
+
+
diff --git a/model_swan/java/test/org/openda/model_swan/testData/l21triadInOpenDa/stochObserver/swanStochObsConfig.xml b/model_swan/java/test/org/openda/model_swan/testData/l21triadInOpenDa/stochObserver/swanStochObsConfig.xml
index ca497a2fc..cf1e9ee90 100644
--- a/model_swan/java/test/org/openda/model_swan/testData/l21triadInOpenDa/stochObserver/swanStochObsConfig.xml
+++ b/model_swan/java/test/org/openda/model_swan/testData/l21triadInOpenDa/stochObserver/swanStochObsConfig.xml
@@ -1,10 +1,10 @@
-
+
stochObsUncertainties.xml
-
+
observ/meas_l021triad001_loc.tab
-
-
+
+
diff --git a/model_swan/java/test/org/openda/model_swan/testData/simpleBBW/simpleBBStochModel/bbSwanWrapper.xml b/model_swan/java/test/org/openda/model_swan/testData/simpleBBW/simpleBBStochModel/bbSwanWrapper.xml
index a3b36b977..5e0c23152 100644
--- a/model_swan/java/test/org/openda/model_swan/testData/simpleBBW/simpleBBStochModel/bbSwanWrapper.xml
+++ b/model_swan/java/test/org/openda/model_swan/testData/simpleBBW/simpleBBStochModel/bbSwanWrapper.xml
@@ -30,35 +30,35 @@
-
+
%openboundaryFile%
openBoundary
-
+
-
+
%openboundaryTPARFile%
openBoundaryTPAR
-
+
-
+
%inputFile%
windFile
WIND
-
+
-
+
%hotFile%
hotFile
-
+
-
+
%inputFile%
timeInfo
-
+
diff --git a/model_swan/java/test/org/openda/model_swan/testData/swanObsRegexTest1/swanStochObsConfig.xml b/model_swan/java/test/org/openda/model_swan/testData/swanObsRegexTest1/swanStochObsConfig.xml
index 700855590..50479fddc 100644
--- a/model_swan/java/test/org/openda/model_swan/testData/swanObsRegexTest1/swanStochObsConfig.xml
+++ b/model_swan/java/test/org/openda/model_swan/testData/swanObsRegexTest1/swanStochObsConfig.xml
@@ -1,9 +1,9 @@
-
+
stochObsUncertainties.xml
-
+
observ/meas_l021triad001_loc.tab
-
-
+
+
diff --git a/model_swan/java/test/org/openda/model_swan/testData/swanObsRegexTest1/swanStochObsRegexConfig.xml b/model_swan/java/test/org/openda/model_swan/testData/swanObsRegexTest1/swanStochObsRegexConfig.xml
index 5adcedc74..cc6e18f1c 100644
--- a/model_swan/java/test/org/openda/model_swan/testData/swanObsRegexTest1/swanStochObsRegexConfig.xml
+++ b/model_swan/java/test/org/openda/model_swan/testData/swanObsRegexTest1/swanStochObsRegexConfig.xml
@@ -1,9 +1,9 @@
-
+
stochObsUncertaintiesRegex.xml
-
+
observ/meas_l021triad001_loc.tab
-
-
+
+
diff --git a/model_swan/java/test/org/openda/model_swan/testData/swanObsTest1/swanStochObsConfig.xml b/model_swan/java/test/org/openda/model_swan/testData/swanObsTest1/swanStochObsConfig.xml
index 2e699ee0c..462fc219d 100644
--- a/model_swan/java/test/org/openda/model_swan/testData/swanObsTest1/swanStochObsConfig.xml
+++ b/model_swan/java/test/org/openda/model_swan/testData/swanObsTest1/swanStochObsConfig.xml
@@ -1,9 +1,9 @@
-
+
obsUncertainties.xml
-
+
observations.txt
-
-
+
+
diff --git a/model_swan/java/test/org/openda/model_swan/testData/swanObsTimeDependent/swanStochObsConfig.xml b/model_swan/java/test/org/openda/model_swan/testData/swanObsTimeDependent/swanStochObsConfig.xml
index ebc79d8a7..8b150a5cc 100644
--- a/model_swan/java/test/org/openda/model_swan/testData/swanObsTimeDependent/swanStochObsConfig.xml
+++ b/model_swan/java/test/org/openda/model_swan/testData/swanObsTimeDependent/swanStochObsConfig.xml
@@ -1,9 +1,9 @@
-
+
stochObsUncertainties.xml
-
+
out_P5.TAB
-
-
+
+
diff --git a/model_swan/tests/kalman_twin_windbound/stochModel/bbSwanWrapper.xml b/model_swan/tests/kalman_twin_windbound/stochModel/bbSwanWrapper.xml
index 997f54683..b116d4d01 100644
--- a/model_swan/tests/kalman_twin_windbound/stochModel/bbSwanWrapper.xml
+++ b/model_swan/tests/kalman_twin_windbound/stochModel/bbSwanWrapper.xml
@@ -29,40 +29,40 @@
-
+
%openboundaryFile%
open-boundary
-
+
-
+
%inputFile%
windFile
WIND
-
+
-
+
%hotFile%
hotFile
-
+
-
+
%inputFile%
timeInfo
-
+
-
+
%outFile%
outFile
-
+
diff --git a/model_swan/tests/s00c2/stochModel/bbSwanWrapper.xml b/model_swan/tests/s00c2/stochModel/bbSwanWrapper.xml
index 730e3a76b..6e7a94c27 100644
--- a/model_swan/tests/s00c2/stochModel/bbSwanWrapper.xml
+++ b/model_swan/tests/s00c2/stochModel/bbSwanWrapper.xml
@@ -29,39 +29,39 @@
-
+
%openboundaryFile%
openBoundary
-
+
-
+
%hotFile%
hotFile
-
+
-
+
%outFile%
outFile
-
+
-
+
%inputFile%
timeInfo
-
+
diff --git a/model_swan/tests/s00c2/stochModel/bbSwanWrapper_asyn.xml b/model_swan/tests/s00c2/stochModel/bbSwanWrapper_asyn.xml
index 74dfc21fb..4db90f80d 100644
--- a/model_swan/tests/s00c2/stochModel/bbSwanWrapper_asyn.xml
+++ b/model_swan/tests/s00c2/stochModel/bbSwanWrapper_asyn.xml
@@ -29,39 +29,39 @@
-
+
%openboundaryFile%
openBoundary
-
+
-
+
%hotFile%
hotFile
-
+
-
+
%outFile%
outFile
-
+
-
+
%inputFile%
timeInfo
-
+
diff --git a/model_swan/tests/s00c2/stochObserver/swanStochObsConfig.xml b/model_swan/tests/s00c2/stochObserver/swanStochObsConfig.xml
index 46e044407..16719b98e 100644
--- a/model_swan/tests/s00c2/stochObserver/swanStochObsConfig.xml
+++ b/model_swan/tests/s00c2/stochObserver/swanStochObsConfig.xml
@@ -1,9 +1,9 @@
-
+
stochObsUncertainties.xml
-
+
observ/timeseries.out
-
-
+
+
diff --git a/model_swan/tests/s00c2_netcdf_notfinished/stochModel/bbSwanWrapper.xml b/model_swan/tests/s00c2_netcdf_notfinished/stochModel/bbSwanWrapper.xml
index b0987c9bc..595868383 100644
--- a/model_swan/tests/s00c2_netcdf_notfinished/stochModel/bbSwanWrapper.xml
+++ b/model_swan/tests/s00c2_netcdf_notfinished/stochModel/bbSwanWrapper.xml
@@ -34,40 +34,40 @@
-
+
%openboundaryFile%
openBoundary
-
+
-
-
+
+
%hotFile%
hotFile
-
+
-
+
%outFile%
outFile
-
+
-
+
%inputFile%
timeInfo
-
+
diff --git a/model_swan/tests/s00c2_netcdf_notfinished/stochObserver/swanStochObsConfig.xml b/model_swan/tests/s00c2_netcdf_notfinished/stochObserver/swanStochObsConfig.xml
index 46e044407..16719b98e 100644
--- a/model_swan/tests/s00c2_netcdf_notfinished/stochObserver/swanStochObsConfig.xml
+++ b/model_swan/tests/s00c2_netcdf_notfinished/stochObserver/swanStochObsConfig.xml
@@ -1,9 +1,9 @@
-
+
stochObsUncertainties.xml
-
+
observ/timeseries.out
-
-
+
+
diff --git a/model_swan/tests/s00c2_withMissingValues/stochModel/bbSwanWrapper.xml b/model_swan/tests/s00c2_withMissingValues/stochModel/bbSwanWrapper.xml
index 730e3a76b..6e7a94c27 100644
--- a/model_swan/tests/s00c2_withMissingValues/stochModel/bbSwanWrapper.xml
+++ b/model_swan/tests/s00c2_withMissingValues/stochModel/bbSwanWrapper.xml
@@ -29,39 +29,39 @@
-
+
%openboundaryFile%
openBoundary
-
+
-
+
%hotFile%
hotFile
-
+
-
+
%outFile%
outFile
-
+
-
+
%inputFile%
timeInfo
-
+
diff --git a/model_swan/tests/s00c2_withMissingValues/stochObserver/swanStochObsConfig.xml b/model_swan/tests/s00c2_withMissingValues/stochObserver/swanStochObsConfig.xml
index 0cafd6feb..7a7ae7ac3 100644
--- a/model_swan/tests/s00c2_withMissingValues/stochObserver/swanStochObsConfig.xml
+++ b/model_swan/tests/s00c2_withMissingValues/stochObserver/swanStochObsConfig.xml
@@ -1,9 +1,9 @@
-
+
stochObsUncertainties.xml
-
+
observ/timeseries.out
-
-
+
+
diff --git a/model_swan/tests/swan_l21triad/stochObserver/swanStochObsConfig.xml b/model_swan/tests/swan_l21triad/stochObserver/swanStochObsConfig.xml
index 5f1cd1e52..12f98d0ab 100644
--- a/model_swan/tests/swan_l21triad/stochObserver/swanStochObsConfig.xml
+++ b/model_swan/tests/swan_l21triad/stochObserver/swanStochObsConfig.xml
@@ -1,9 +1,9 @@
-
+
stochObsUncertainties.xml
-
+
observ/meas_l021triad001_loc.tab
-
-
+
+
diff --git a/model_swan/tests/swan_l21triad_two_twin/stochObserver1/swanStochObsConfig.xml b/model_swan/tests/swan_l21triad_two_twin/stochObserver1/swanStochObsConfig.xml
index 9fe8d2967..79e274789 100644
--- a/model_swan/tests/swan_l21triad_two_twin/stochObserver1/swanStochObsConfig.xml
+++ b/model_swan/tests/swan_l21triad_two_twin/stochObserver1/swanStochObsConfig.xml
@@ -1,10 +1,10 @@
-
+
stochObsUncertainties.xml
-
+
observ/generated1_edited_l021triad001_loc.tab
-
-
+
+
diff --git a/model_swan/tests/swan_l21triad_two_twin/stochObserver2/swanStochObsConfig.xml b/model_swan/tests/swan_l21triad_two_twin/stochObserver2/swanStochObsConfig.xml
index b7a599ecc..732ed2eb3 100644
--- a/model_swan/tests/swan_l21triad_two_twin/stochObserver2/swanStochObsConfig.xml
+++ b/model_swan/tests/swan_l21triad_two_twin/stochObserver2/swanStochObsConfig.xml
@@ -1,10 +1,10 @@
-
+
stochObsUncertainties.xml
-
+
observ/generated2_edited_l021triad001_loc.tab
-
-
+
+
diff --git a/observers/java/test/org/openda/observers/testData/ioObjectNetcdfStochObsConfig.xml b/observers/java/test/org/openda/observers/testData/ioObjectNetcdfStochObsConfig.xml
index aa1af53a2..935033d45 100644
--- a/observers/java/test/org/openda/observers/testData/ioObjectNetcdfStochObsConfig.xml
+++ b/observers/java/test/org/openda/observers/testData/ioObjectNetcdfStochObsConfig.xml
@@ -1,17 +1,17 @@
-
+
ioObjectNetcdfStochObsUncert.xml
useFixedSeed
-
+
netcdf-test-file-1.nc
true
false
-
-
+
+
diff --git a/py_openda/examples/py_swan_calibration/stochObserver/swanStochObsConfig.xml b/py_openda/examples/py_swan_calibration/stochObserver/swanStochObsConfig.xml
index 5f1cd1e52..12f98d0ab 100644
--- a/py_openda/examples/py_swan_calibration/stochObserver/swanStochObsConfig.xml
+++ b/py_openda/examples/py_swan_calibration/stochObserver/swanStochObsConfig.xml
@@ -1,9 +1,9 @@
-
+
stochObsUncertainties.xml
-
+
observ/meas_l021triad001_loc.tab
-
-
+
+