xmls changed such that dataobjects are used instead of ioobjects

OpenDA-Association · Nov 27, 2020 · 769cf70 · 769cf70
1 parent b1706ac
commit 769cf70
Show file tree

Hide file tree

Showing 90 changed files with 669 additions and 664 deletions.
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
@@ -21,11 +21,11 @@
 		<finalizeActions/>
 	</run>
 	<inputOutput>
-		<ioObject className="org.openda.model_efdc.EfdcGridTimeSeriesIoObject">
+		<dataObject className="org.openda.model_efdc.EfdcGridTimeSeriesIoObject">
 			<file>%outputFile%</file>
 			<id>outputIoObject</id>
 			<arg>%timeZone%</arg>
 			<arg>%startTime%</arg>
-		</ioObject>
+		</dataObject>
 	</inputOutput>
 </blackBoxWrapperConfig>
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
@@ -1,66 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<blackBoxWrapperConfig xmlns="http://www.openda.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openda.org http://schemas.openda.org/blackBoxWrapperConfig.xsd">
+<blackBoxWrapperConfig xmlns="http://www.openda.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                       xsi:schemaLocation="http://www.openda.org http://schemas.openda.org/blackBoxWrapperConfig.xsd">
 
-	<!-- declare all the used aliases, specify the prefix and suffix of an alias key in a variable  -->
+  <!-- declare all the used aliases, specify the prefix and suffix of an alias key in a variable  -->
 
-	<aliasDefinitions defaultKeyPrefix="%" defaultKeySuffix="%" >
-		<alias key="instanceDir"/>
-		<alias key="templateDir"/>
-		<alias key="binDir"/>
-		<alias key="noosfile_1"/>
-		<alias key="noosfile_2"/>
-		<alias key="noosfile_3"/>
-        <alias key="statefile"/>
-	</aliasDefinitions>
+  <aliasDefinitions defaultKeyPrefix="%" defaultKeySuffix="%">
+    <alias key="instanceDir"/>
+    <alias key="templateDir"/>
+    <alias key="binDir"/>
+    <alias key="noosfile_1"/>
+    <alias key="noosfile_2"/>
+    <alias key="noosfile_3"/>
+    <alias key="statefile"/>
+  </aliasDefinitions>
 
-	<run>
+  <run>
 
-		<!-- for each model instance, the template directory will be cloned to create the instance directory -->
-		<initializeActionsUsingDirClone instanceDir="%instanceDir%%instanceNumber%" templateDir="%templateDir%"/>
+    <!-- for each model instance, the template directory will be cloned to create the instance directory -->
+    <initializeActionsUsingDirClone instanceDir="%instanceDir%%instanceNumber%" templateDir="%templateDir%"/>
 
-		<!-- computation actions -->
-		<!-- define actions relative to config dir. -->
-		<computeActions>
-			<action workingDirectory="%instanceDir%" windowsExe="./%binDir%/compute.bat" linuxExe="./%binDir%/compute.sh">
-			<arg>%instanceDir%%instanceNumber%</arg>
-			</action>
-		</computeActions>
+    <!-- computation actions -->
+    <!-- define actions relative to config dir. -->
+    <computeActions>
+      <action workingDirectory="%instanceDir%" windowsExe="./%binDir%/compute.bat" linuxExe="./%binDir%/compute.sh">
+        <arg>%instanceDir%%instanceNumber%</arg>
+      </action>
+    </computeActions>
 
-		<!-- actions to finalize (e.g. cleanup) an instance -->
-		<finalizeActions/>
+    <!-- actions to finalize (e.g. cleanup) an instance -->
+    <finalizeActions/>
 
-	</run>
+  </run>
 
-	<inputOutput>
+  <inputOutput>
 
-		<!-- noos time series 1 -->
+    <!-- noos time series 1 -->
 
-		<ioObject className="org.openda.exchange.ioobjects.NoosTimeSeriesIoObject">
-			<file>%noosfile_1%</file>
-			<id>noosfile_1</id>
-		</ioObject>
+    <ioObject className="org.openda.exchange.ioobjects.NoosTimeSeriesIoObject">
+      <file>%noosfile_1%</file>
+      <id>noosfile_1</id>
+    </ioObject>
 
-		<!-- noos time series 2 -->
+    <!-- noos time series 2 -->
 
-		<ioObject className="org.openda.exchange.ioobjects.NoosTimeSeriesIoObject">
-			<file>%noosfile_2%</file>
-			<id>noosfile_2</id>
-		</ioObject>
+    <ioObject className="org.openda.exchange.ioobjects.NoosTimeSeriesIoObject">
+      <file>%noosfile_2%</file>
+      <id>noosfile_2</id>
+    </ioObject>
 
-		<!-- noos time series 3 -->
+    <!-- noos time series 3 -->
 
-		<ioObject className="org.openda.exchange.ioobjects.NoosTimeSeriesIoObject">
-			<file>%noosfile_3%</file>
-			<id>noosfile_3</id>
-		</ioObject>
+    <ioObject className="org.openda.exchange.ioobjects.NoosTimeSeriesIoObject">
+      <file>%noosfile_3%</file>
+      <id>noosfile_3</id>
+    </ioObject>
 
-		<!-- simple state file -->
+    <!-- simple state file -->
 
-		<ioObject className="org.openda.blackbox.wrapper.DummyState">
-			<file>%statefile%</file>
-			<id>statefile</id>
-		</ioObject>
+    <dataObject className="org.openda.blackbox.wrapper.DummyState">
+      <file>%statefile%</file>
+      <id>statefile</id>
+    </dataObject>
 
-	</inputOutput>
+  </inputOutput>
 
 </blackBoxWrapperConfig>
diff --git a/...test/org/openda/blackbox/wrapper/testData/noiseModel2DMaps/bbWrapperConfig_noiseRatio.xml b/...test/org/openda/blackbox/wrapper/testData/noiseModel2DMaps/bbWrapperConfig_noiseRatio.xml
@@ -22,10 +22,10 @@
   <inputOutput>
 
 
-    <ioObject className="org.openda.blackbox.wrapper.DummyStateDataObject">
+    <dataObject className="org.openda.blackbox.wrapper.DummyStateDataObject">
       <file>notUsed</file>
       <id>DummyStateObject</id>
-    </ioObject>
+    </dataObject>
 
 
   </inputOutput>

diff --git a/...x/wrapper/testData/noiseModel2DMaps/noiseAfterCompute/bbModelConfig_noiseAfterCompute.xml b/...x/wrapper/testData/noiseModel2DMaps/noiseAfterCompute/bbModelConfig_noiseAfterCompute.xml
@@ -18,7 +18,7 @@
 
   <exchangeItems>
 
-    <vector id="allElementsFromIoObject" ioObjectId="DummyStateObject"/>
+    <vector id="allElementsFromDataObject" dataObjectId="DummyStateObject"/>
 
   </exchangeItems>
 

diff --git a/...wrapper/testData/noiseModel2DMaps/noiseAfterCompute/bbWrapperConfig_noiseAfterCompute.xml b/...wrapper/testData/noiseModel2DMaps/noiseAfterCompute/bbWrapperConfig_noiseAfterCompute.xml
@@ -22,10 +22,10 @@
   <inputOutput>
 
 
-    <ioObject className="org.openda.blackbox.wrapper.DummyStateDataObject">
+    <dataObject className="org.openda.blackbox.wrapper.DummyStateDataObject">
       <file>notUsed</file>
       <id>DummyStateObject</id>
-    </ioObject>
+    </dataObject>
 
 
   </inputOutput>

diff --git a/...per/testData/noiseModel2DMaps/noiseRatio2DMapping/bbWrapperConfig_noiseRatio2DMapping.xml b/...per/testData/noiseModel2DMaps/noiseRatio2DMapping/bbWrapperConfig_noiseRatio2DMapping.xml
@@ -22,10 +22,10 @@
   <inputOutput>
 
 
-    <ioObject className="org.openda.exchange.dataobjects.EsriAsciiGridDataObject">
+    <dataObject className="org.openda.exchange.dataobjects.EsriAsciiGridDataObject">
       <file>param2D_20020102.asc</file>
       <id>param2D</id>
-    </ioObject>
+    </dataObject>
 
 
   </inputOutput>

diff --git a/.../noiseModel2DMaps/noiseRatio2DMappingBigger/bbWrapperConfig_noiseRatio2DMappingBigger.xml b/.../noiseModel2DMaps/noiseRatio2DMappingBigger/bbWrapperConfig_noiseRatio2DMappingBigger.xml
@@ -22,10 +22,10 @@
   <inputOutput>
 
 
-    <ioObject className="org.openda.exchange.dataobjects.EsriAsciiGridDataObject">
+    <dataObject className="org.openda.exchange.dataobjects.EsriAsciiGridDataObject">
       <file>param2D_20020102.asc</file>
       <id>param2D</id>
-    </ioObject>
+    </dataObject>
 
 
   </inputOutput>

diff --git a/...oiseModel2DMaps/noiseRatio2DMappingSmaller/bbWrapperConfig_noiseRatio2DMappingSmaller.xml b/...oiseModel2DMaps/noiseRatio2DMappingSmaller/bbWrapperConfig_noiseRatio2DMappingSmaller.xml
@@ -22,10 +22,10 @@
   <inputOutput>
 
 
-    <ioObject className="org.openda.exchange.dataobjects.EsriAsciiGridDataObject">
+    <dataObject className="org.openda.exchange.dataobjects.EsriAsciiGridDataObject">
       <file>param2D_20020102.asc</file>
       <id>param2D</id>
-    </ioObject>
+    </dataObject>
 
 
   </inputOutput>

diff --git a/...ava/test/org/openda/blackbox/wrapper/testData/parameterUncertainty/DummyWrapperConfig.xml b/...ava/test/org/openda/blackbox/wrapper/testData/parameterUncertainty/DummyWrapperConfig.xml
@@ -19,10 +19,10 @@
 
 	<inputOutput>
 
-		<ioObject className="org.openda.blackbox.wrapper.DummyParametersIoObject">
+		<dataObject className="org.openda.blackbox.wrapper.DummyParametersIoObject">
 			<file>not-needed</file>
 			<id>parametersIoObject</id>
-		</ioObject>
+		</dataObject>
 
 	</inputOutput>
 

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
@@ -21,12 +21,12 @@
     <inputOutput>
 
         <!-- Reading the model states -->
-        <ioObject className="org.openda.blackbox.wrapper.DummyState">
+        <dataObject className="org.openda.blackbox.wrapper.DummyState">
             <file>dflow1d/wlevStateFileIn.xyz</file>
             <id>state</id>
-        </ioObject>
+        </dataObject>
 
 
     </inputOutput>
 
-</blackBoxWrapperConfig>
+</blackBoxWrapperConfig>
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
@@ -56,10 +56,10 @@
 
 		<!-- simple state file -->
 
-		<ioObject className="org.openda.blackbox.wrapper.DummyState">
+		<dataObject className="org.openda.blackbox.wrapper.DummyState">
 			<file>%statefile%</file>
 			<id>statefile</id>
-		</ioObject>
+		</dataObject>
 
 	</inputOutput>
 

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
@@ -56,10 +56,10 @@
 
 		<!-- simple state file -->
 
-		<ioObject className="org.openda.blackbox.wrapper.DummyState">
+		<dataObject className="org.openda.blackbox.wrapper.DummyState">
 			<file>%statefile%</file>
 			<id>statefile</id>
-		</ioObject>
+		</dataObject>
 
 	</inputOutput>
 

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
@@ -56,10 +56,10 @@
 
 		<!-- simple state file -->
 
-		<ioObject className="org.openda.blackbox.wrapper.DummyState">
+		<dataObject className="org.openda.blackbox.wrapper.DummyState">
 			<file>%statefile%</file>
 			<id>statefile</id>
-		</ioObject>
+		</dataObject>
 
 	</inputOutput>
 

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
@@ -12,13 +12,13 @@
 	<inputOutput>
 
 		<!-- dummy test object that contains the start time / end time exchange items -->
-		<ioObject className="org.openda.blackbox.wrapper.DummyTimeInfoIoObject">
+		<dataObject className="org.openda.blackbox.wrapper.DummyTimeInfoIoObject">
 			<file>noRealFile</file>
 			<id>timeInfoIoObject</id>
 			<arg>2010-07-16 23:59:59</arg>
 			<arg>2010-07-17 00:01:01</arg>
-        </ioObject>
+    </dataObject>
 
-    </inputOutput>
+  </inputOutput>
 
 </blackBoxWrapperConfig>
diff --git a/.../java/test/org/openda/blackbox/wrapper/testData/transformations/simpleBbWrapperConfig.xml b/.../java/test/org/openda/blackbox/wrapper/testData/transformations/simpleBbWrapperConfig.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<blackBoxWrapperConfig xmlns="http://www.openda.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openda.org http://schemas.openda.org/blackBoxWrapperConfig.xsd">
+<blackBoxWrapperConfig xmlns="http://www.openda.org"
+                       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                       xsi:schemaLocation="http://www.openda.org http://schemas.openda.org/blackBoxWrapperConfig.xsd">
 
 	<!-- no aliases -->
 	<aliasDefinitions/>
@@ -22,10 +24,10 @@
 	<inputOutput>
 
 		<!-- one test io object -->
-		<ioObject className="org.openda.blackbox.wrapper.DummyAstroIoObject">
+		<dataObject className="org.openda.blackbox.wrapper.DummyAstroIoObject">
 			<file>no file needed</file>
 			<id>DummyAstroIoObject</id>
-        </ioObject>
+    </dataObject>
 
     </inputOutput>
 

diff --git a/core/xmlSchemas/examples/stochObservers/swanStochObsConfig.xml b/core/xmlSchemas/examples/stochObservers/swanStochObsConfig.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ioObjectStochObserver xmlns="http://www.openda.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openda.org http://schemas.openda.org/openDaStochObserver.xsd">
+<dataObjectStochObserver xmlns="http://www.openda.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openda.org http://schemas.openda.org/openDaStochObserver.xsd">
 	<uncertaintyModule workingDirectory="." className="org.openda.uncertainties.UncertaintyEngine">
 		<arg>stochObsUncertainties.xml</arg>
 	</uncertaintyModule>
-	<ioObject workingDirectory="." className="org.openda.model_swan.SwanResults">
+	<dataObject workingDirectory="." className="org.openda.model_swan.SwanResults">
 		<fileName>meas_l21triad_loc.tab</fileName>
-	</ioObject>
-</ioObjectStochObserver>
+	</dataObject>
+</dataObjectStochObserver>
diff --git a/core/xmlSchemas/examples/wrappers/d3dBbWrapperConfig.xml b/core/xmlSchemas/examples/wrappers/d3dBbWrapperConfig.xml
@@ -30,25 +30,25 @@
 	<inputOutput>
 
 		<!-- u/v rougness -->
-		<ioObject className="nl.deltares.openda.models.d3dflow.D3dField2DFile">
+		<dataObject className="nl.deltares.openda.models.d3dflow.D3dField2DFile">
 			<file>%runid%.mdf</file>
 			<id>roughness</id>
 			<arg>rgh</arg>
-        </ioObject>
+        </dataObject>
 
 		<!-- depth -->
-		<ioObject className="nl.deltares.openda.models.d3dflow.D3dField2DFile">
+		<dataObject className="nl.deltares.openda.models.d3dflow.D3dField2DFile">
 			<file>%runid%.mdf</file>
 			<id>depth</id>
 			<arg>dep</arg>
-        </ioObject>
+        </dataObject>
 
 		<!-- time series results -->
-		<ioObject className="nl.deltares.openda.models.d3dflow.D3dResults">
+		<dataObject className="nl.deltares.openda.models.d3dflow.D3dResults">
             <file>trih-%runid%.dat</file>
             <id>trih-file</id>
 			<arg>%NATIVE_DLL_DIR%</arg>
-        </ioObject>
+        </dataObject>
     </inputOutput>
 
 </blackBoxWrapperConfig>