Skip to content

Openda org master #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nilsvanvelzen wants to merge 214 commits into
base: master
Choose a base branch
from
Open

Openda org master #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
214 commits
Select commit Hold shift + click to select a range
e7fcf0d
WIP: Fix line ending issue
Jun 21, 2018
e13a39e
ASCIIVectorIoObject now implements IDataObject, and can a single Arra…
Jun 13, 2018
df35348
Reactive Pollution model reads simulation time, reaction time and con…
Jun 13, 2018
c437eaa
Update stochModel settings for pollution model
Jun 21, 2018
7221498
TimeSeriesFormatter write and read methods can throw
Jul 20, 2018
65e2496
New TimeSeriesFormatte for delimited text
Jul 20, 2018
5a76a0d
New TimeSeriesFormatter based dataobject and observer
Jul 20, 2018
2c90e25
New TimeSeriesFormatter based dataobject and observer
Jul 20, 2018
a86d308
Merge branch 'feature-delimeted_text_timeseries' of https://github.co…
Jul 20, 2018
d406bee
DelimitedTextTimeSeriesFormatter added configuration posibility for c…
nilsvanvelzen Jul 25, 2018
76bbbb9
updated TimeseriesFormatter.xml files for explicit CommentMarker
nilsvanvelzen Jul 25, 2018
f67c9c9
Updated configuration to use start_dimr.bat to start DFLOWFM on Windows
vrielin Sep 20, 2018
1f4d0b3
Corrected dflowfm input
vrielin Sep 20, 2018
c24a2fd
Added script to run all tests in directory, renamed some output files…
vrielin Sep 20, 2018
cefdfc3
Added references to application module for metaswap advection model
Oct 16, 2018
813d85a
Merge branch 'master' of https://github.com/OpenDA-Association/OpenDA
Oct 16, 2018
e35fd19
fixed issue in metaswap-wrapper (metaswap state file was not properly…
Zepy1 Oct 18, 2018
0a9fde4
metaswap wrapper is now changing soil water deficit column of state f…
Zepy1 Oct 18, 2018
d8ecad9
changed dataObjects in BBModelInstance from private to protected
Zepy1 Oct 19, 2018
e877470
Merge pull request #51 from OpenDA-Association/metaswap_fix
Oct 31, 2018
b465011
Remove unnecessary gitkeep files.
Oct 31, 2018
d784c08
Fix shebang in clean.sh
Oct 31, 2018
2ee4d05
Use .gitkeep instead of teamcity_does_not_like_empty_folders.nop
Oct 31, 2018
18ac5f0
Merge pull request #55 from OpenDA-Association/fix-gitignore
nilsvanvelzen Nov 6, 2018
186bb10
#57 Fixed the tests
Nov 27, 2018
74961de
Check on time stamps with available observations now only searches th…
aljavrieling Nov 27, 2018
d903951
Merge pull request #59 from OpenDA-Association/fix_missingvals_filter…
nilsvanvelzen Nov 28, 2018
37c52d9
Update build.xml
aljavrieling Nov 29, 2018
d277d9c
Update NetcdfD3dHisExchangeItemTest.java
aljavrieling Nov 29, 2018
8fb51e8
Git ignore for native build dirs
wkramer Nov 29, 2018
708f543
ODA-644/#62 Added 64 bit executables for linux and reactivated swan t…
aljavrieling Nov 29, 2018
526cbde
This time with the correct executables.
aljavrieling Nov 29, 2018
d67580a
Merge pull request #60 from OpenDA-Association/fix-failing-tests
wkramer Dec 3, 2018
e179694
Update swan executables for windows (#62 ODA-644)
aljavrieling Dec 13, 2018
29c1703
Introduced boolean BBUtils.RUNNING_ON_64bit
aljavrieling Dec 13, 2018
5bddaaa
Update swan executables for linux (#62 ODA-644)
aljavrieling Dec 13, 2018
1493f83
deleted now unused SWAN executables
aljavrieling Dec 18, 2018
74140dd
for Mac: use same executable as before
aljavrieling Dec 18, 2018
94f0818
Merge branch 'master' into fix-update_swan_excutable
aljavrieling Dec 18, 2018
32a23ea
Merge pull request #64 from OpenDA-Association/fix-update_swan_excutable
wkramer Dec 19, 2018
31be845
Update WdmUtilsTest.java
aljavrieling Dec 19, 2018
9cdee17
Merge pull request #65 from OpenDA-Association/fix-failing-tests
wkramer Dec 19, 2018
86c80fb
Add windows Intel MPI build for Simona
wkramer Dec 31, 2018
ea9eb75
Improve gitignore
wkramer Dec 31, 2018
e17b2d6
Improve gitignore
wkramer Dec 31, 2018
813c039
Merge branch 'bo-gitignore' of https://github.com/OpenDA-Association/…
wkramer Dec 31, 2018
f537d18
Merge pull request #66 from OpenDA-Association/bo-gitignore
wkramer Dec 31, 2018
d417fd7
Output libary path and arch on link exception
wkramer Dec 31, 2018
18ea2a7
Remove old code trying to load libxml2.dll
wkramer Dec 31, 2018
2136934
Do not assume project is in public dir
wkramer Dec 31, 2018
bd2bcc8
Merge pull request #67 from OpenDA-Association/fix-opendatestsupport
wkramer Jan 3, 2019
4e3091b
#74 Implement parallel finish methode for ThreadStochModelInstance
erikpelgrim Mar 13, 2019
560c105
Merge pull request #75 from OpenDA-Association/#74-Implement-parallel…
nilsvanvelzen Mar 13, 2019
54cdf5b
Revert "WIP: Fix line ending issue"
wkramer Mar 18, 2019
18f396e
Update travis test to use jdk11
wkramer Mar 26, 2019
ba92985
Merge pull request #77 from wkramer/ascii_dataobject_clean
wkramer Mar 26, 2019
4b8be62
Rename ASCIIVectorIoObject to ASCIIVectorDataObject
wkramer Mar 26, 2019
357558e
Updated configuration to use start_dimr.bat to start DFLOWFM on Windows
vrielin Sep 20, 2018
cd5019f
Corrected dflowfm input
vrielin Sep 20, 2018
02ae305
Added script to run all tests in directory, renamed some output files…
vrielin Sep 20, 2018
dca4e78
Merge branch 'update_dflowfm_examples' of https://github.com/OpenDA-A…
aljavrieling Apr 9, 2019
1a540af
- RestartFile needs to be in same directory as `mdu` file for now
Jun 6, 2018
6306a45
Bugfix ignoring non-time-varying variables of restart file (*_map.nc)
aljavrieling Feb 18, 2019
de89bae
Added headers + other small layout changes for easier comparison with…
aljavrieling Apr 9, 2019
79553bd
Fix issues NetcdfFileConcatenater
Jun 19, 2018
6fe4ff3
fix NetcdfFileConcatenater, cherry-pick overwrote relevant changes
aljavrieling Apr 9, 2019
91f9834
ASCIIVectorIoObject now implements IDataObject, and can a single Arra…
Jun 13, 2018
8da3256
Reactive Pollution model reads simulation time, reaction time and con…
Jun 13, 2018
f88df8e
Update stochModel settings for pollution model
Jun 21, 2018
8de40b8
Revert "WIP: Fix line ending issue"
wkramer Mar 18, 2019
cbd8e76
Rename ASCIIVectorIoObject to ASCIIVectorDataObject
wkramer Mar 26, 2019
c129c0f
Port to python3
wkramer Apr 15, 2019
2787576
Move python script to model_reactive_advection
wkramer Apr 15, 2019
7f1fb20
Refactor reactive_pollution_model
wkramer Apr 15, 2019
10118e0
Change parameter config to yaml
wkramer Apr 15, 2019
64fe3f5
Merge branch 'ascii_dataobject' of https://github.com/OpenDA-Associat…
wkramer Apr 15, 2019
92572fc
Changed dcsmv5_kalman dcsmv5_map.nc version to work with newer versio…
henriqueguarneri Apr 16, 2019
e8adc32
Adapted estuary_kalman Model and stockModel to work in Linux.
henriqueguarneri Apr 16, 2019
b6f9fea
Adapted lake_kalman model files to case sensitive OS.
henriqueguarneri Apr 16, 2019
1693c26
Format logging
wkramer Apr 17, 2019
0d37792
Add yaml config
wkramer Apr 17, 2019
d2d3f3d
TimeSeriesFormatter write and read methods can throw
Jul 20, 2018
517b762
New TimeSeriesFormatte for delimited text
Jul 20, 2018
db09920
New TimeSeriesFormatter based dataobject and observer
Jul 20, 2018
e395cac
DelimitedTextTimeSeriesFormatter added configuration posibility for c…
nilsvanvelzen Jul 25, 2018
d17765f
updated TimeseriesFormatter.xml files for explicit CommentMarker
nilsvanvelzen Jul 25, 2018
a1aaadd
Merge branch 'feature-delimeted_text_timeseries' of https://github.co…
wkramer Apr 17, 2019
d101741
Deleted some backup model files
henriqueguarneri Apr 17, 2019
c23059d
AsciiKeywordDataObject
wkramer Apr 17, 2019
ef24d8b
Cleanup AsciiKeywordDataObject
wkramer Apr 17, 2019
3f78933
Merge pull request #80 from OpenDA-Association/feature-delimeted_text…
nilsvanvelzen Apr 17, 2019
03e2561
Update comments
wkramer Apr 17, 2019
28d7ecd
Rename to lower case Ascii
wkramer Apr 17, 2019
d72afde
Merge pull request #82 from OpenDA-Association/ascii_keyword_dataobject
nilsvanvelzen Apr 17, 2019
3a73593
Make numberd id consistent with AsciiKeywordDataObject
wkramer Apr 17, 2019
fbc724b
ASCIIVectorIoObject now implements IDataObject, and can a single Arra…
Jun 13, 2018
9314bdd
Reactive Pollution model reads simulation time, reaction time and con…
Jun 13, 2018
0248e48
Update stochModel settings for pollution model
Jun 21, 2018
51aa781
Revert "WIP: Fix line ending issue"
wkramer Mar 18, 2019
6dfbe8d
Rename ASCIIVectorIoObject to ASCIIVectorDataObject
wkramer Mar 26, 2019
9ad46fc
Port to python3
wkramer Apr 15, 2019
9c970d3
Move python script to model_reactive_advection
wkramer Apr 15, 2019
821715f
Refactor reactive_pollution_model
wkramer Apr 15, 2019
6fb09d6
Change parameter config to yaml
wkramer Apr 15, 2019
7cccb81
WIP: Fix line ending issue
Jun 21, 2018
96ebb06
ASCIIVectorIoObject now implements IDataObject, and can a single Arra…
Jun 13, 2018
6061eb9
Reactive Pollution model reads simulation time, reaction time and con…
Jun 13, 2018
4bd0713
Revert "WIP: Fix line ending issue"
wkramer Mar 18, 2019
350a48d
Rename ASCIIVectorIoObject to ASCIIVectorDataObject
wkramer Mar 26, 2019
ba9c875
Format logging
wkramer Apr 17, 2019
c5b1ccd
Add yaml config
wkramer Apr 17, 2019
9fd0cec
Rename to lower case Ascii
wkramer Apr 17, 2019
2c06eb2
Fix after rebase
wkramer Apr 17, 2019
6a7c6d2
Set US locale for decimal point
wkramer Apr 17, 2019
03f743e
Set timeseries id from config
wkramer Apr 17, 2019
1315afc
Use csv files for observations
wkramer Apr 17, 2019
8a73008
Add .gitignore
wkramer Apr 17, 2019
af91d03
Change times for noise model
wkramer Apr 18, 2019
cdc6687
Update reactive_pollution_model for new data objects
wkramer Apr 18, 2019
20ce0b9
Forcings are now stored in csv files
wkramer Apr 18, 2019
dcab91a
Find correct index for time series from currenTime
wkramer Apr 18, 2019
74beebc
Add /gitignore
wkramer Apr 18, 2019
094e3f8
Restore perturbed values for twin config
wkramer Apr 18, 2019
40a73c7
Reduce numer of maps files written
wkramer Apr 18, 2019
de680f0
Linear interpolation for sources and boundaries
wkramer Apr 18, 2019
e60725e
Update .gitignore
wkramer Apr 18, 2019
4f20f31
Merge branch 'ascii_dataobject' of https://github.com/OpenDA-Associat…
wkramer Apr 18, 2019
4e4815b
Add write support
wkramer Apr 23, 2019
e9da817
Fix time exchange item
wkramer Apr 23, 2019
627a3e3
Add support for dateTimeSelector and valueSelector
wkramer Apr 23, 2019
e2782c9
Add support for decimalSeparator
wkramer Apr 23, 2019
07e3d25
Git ignore for native build dirs
wkramer Nov 29, 2018
58233b6
Add windows Intel MPI build for Simona
wkramer Dec 31, 2018
ff9199a
Merge branch 'feature-windows_intelmpi' of https://github.com/OpenDA-…
wkramer May 13, 2019
246d8ea
Fix regression in model config
wkramer May 20, 2019
f30527e
Fix exit calls
wkramer May 20, 2019
a19eced
Remove unused files
wkramer May 20, 2019
d9157ae
Add note on cleaning the dist folder
wkramer May 20, 2019
342ef2c
Add write support
wkramer Apr 23, 2019
5bd7912
Add support for dateTimeSelector and valueSelector
wkramer Apr 23, 2019
02ee6f5
Add support for decimalSeparator
wkramer Apr 23, 2019
40cd3fe
Add debug output
wkramer May 21, 2019
0e81322
Merge pull request #78 from OpenDA-Association/jdk11
nilsvanvelzen May 21, 2019
d9e7bda
Merge pull request #86 from OpenDA-Association/fix-delimeted-text-for…
nilsvanvelzen May 21, 2019
a5f46de
added seprate scripts for, default builds of CASTOR and NATIVE and up…
nilsvanvelzen May 21, 2019
fd6d793
debug travis script
nilsvanvelzen May 21, 2019
d4aa840
Added install scripts for linux packages (mint 9.1 and travis)
nilsvanvelzen May 21, 2019
6aa0e47
fixes in mint 9.1 packages
nilsvanvelzen May 21, 2019
2850538
included various install_native scripts (mint and travis)
nilsvanvelzen May 21, 2019
8b3fb81
Merge pull request #87 from OpenDA-Association/tutorials
May 22, 2019
9852314
Add DHAVE_STRUCT_TIMESPEC options
wkramer May 23, 2019
e7b6cc1
Add unless test-only on build and testclasses targets
wkramer May 23, 2019
d28b30b
Merge pull request #84 from OpenDA-Association/feature-windows_intelmpi
nilsvanvelzen May 26, 2019
67fb17e
Merge pull request #88 from OpenDA-Association/test-against-jdk11
nilsvanvelzen May 27, 2019
b94c1ea
Fix exponent in csv files
wkramer May 28, 2019
f5b2c09
Check for + in exponent when parsing
wkramer Jun 5, 2019
3841a32
Reset reaction_time to original value
wkramer Jun 5, 2019
27867cd
Reset timeCorrelationScale to original value
wkramer Jun 5, 2019
d639029
first setup course exercise enkf with ascii version model_reactive_ad…
nilsvanvelzen Jun 21, 2019
e5ba917
Added new advection reaction exercise
nilsvanvelzen Jul 8, 2019
5265b53
removed old advection reaction exercise
nilsvanvelzen Jul 8, 2019
57f76df
remove garbage files
nilsvanvelzen Jul 8, 2019
2e46cc9
renamed exercise dir
nilsvanvelzen Jul 8, 2019
5978d7d
added missing model-code
nilsvanvelzen Jul 8, 2019
48d3acc
removed unused file
nilsvanvelzen Jul 8, 2019
8030e4b
moved name of summerschool main latex file
nilsvanvelzen Jul 8, 2019
be17430
changed quotes such that copy-paste works to ipython window
nilsvanvelzen Jul 9, 2019
73e6a06
renamed localization exercise folder
nilsvanvelzen Jul 10, 2019
dbfe010
small improvements summerschool 2019 exercises
nilsvanvelzen Jul 10, 2019
ddf336e
markerd black box calibration exercise as not working
nilsvanvelzen Jul 10, 2019
1da4747
added missing data file for TimeSeriesFormatter test
nilsvanvelzen Jul 10, 2019
fe67758
Merge branch 'master' into ascii_dataobject
nilsvanvelzen Jul 10, 2019
fd0618e
fixed shebang in python scripts to /use/bin/env python3
nilsvanvelzen Jul 15, 2019
89395bb
for now add python model in bin to black box exercise
nilsvanvelzen Jul 16, 2019
fa24eca
Merge pull request #96 from OpenDA-Association/ascii_dataobject
nilsvanvelzen Jul 16, 2019
9ad7225
Updated configuration to use start_dimr.bat to start DFLOWFM on Windows
vrielin Sep 20, 2018
a9b71b0
Corrected dflowfm input
vrielin Sep 20, 2018
6b69d08
Added script to run all tests in directory, renamed some output files…
vrielin Sep 20, 2018
8756456
- RestartFile needs to be in same directory as `mdu` file for now
Jun 6, 2018
f0cdc11
Bugfix ignoring non-time-varying variables of restart file (*_map.nc)
aljavrieling Feb 18, 2019
c9023fc
Added headers + other small layout changes for easier comparison with…
aljavrieling Apr 9, 2019
d3a274e
Fix issues NetcdfFileConcatenater
Jun 19, 2018
d384e6d
fix NetcdfFileConcatenater, cherry-pick overwrote relevant changes
aljavrieling Apr 9, 2019
84f212b
Added example for FMSuite 2019, estuary)kalman using pli and tim files
aljavrieling Jul 18, 2019
0df5ca6
Added example for FMsuite2019, estuary_kalman using bc files
aljavrieling Jul 18, 2019
d91acba
Merge branch 'update_dflowfm_examples' of https://github.com/OpenDA-A…
aljavrieling Jul 18, 2019
954a63f
Merge pull request #81 from henriqueguarneri/update_dflowfm_examples
aljavrieling Jul 18, 2019
844f660
Merge pull request #101 from OpenDA-Association/update_dflowfm_examples
nilsvanvelzen Jul 18, 2019
60e04c2
Added the concept of numThreadGroups to the ThreadStochModelFactory. …
nilsvanvelzen Jul 25, 2019
08f9368
fix gitkeep file with . at the end
nilsvanvelzen Jul 25, 2019
aaf90ba
Merge pull request #103 from OpenDA-Association/fix_gitkeep_file
nilsvanvelzen Jul 25, 2019
6ad432f
added sugested chages from review
nilsvanvelzen Jul 29, 2019
420d049
Merge pull request #102 from OpenDA-Association/parallel_thread_rmi
wkramer Jul 29, 2019
ecb2090
removed double occurence of testCsvFormattedWithSelectors; updated bu…
aljavrieling Jul 30, 2019
6593680
Merge pull request #105 from OpenDA-Association/104-fix-failing-Teamc…
nilsvanvelzen Jul 30, 2019
481c6c1
#106 Implement key=value arguments to only create desired exchange it…
erikpelgrim Aug 2, 2019
48540ba
Update .travis.yml
erikpelgrim Aug 2, 2019
f630c8d
Update travis install packages
erikpelgrim Aug 2, 2019
358681a
Update .travis.yml
erikpelgrim Aug 2, 2019
67f6b41
Update JDK & manually install ant
wkramer Aug 28, 2019
4749c0b
Add missing ant-optional package
wkramer Aug 28, 2019
a742698
Merge pull request #109 from OpenDA-Association/update-travis-jdk
nilsvanvelzen Aug 29, 2019
2134487
#106 Implement key=value arguments to only create desired exchange it…
erikpelgrim Aug 2, 2019
128c16c
Update .travis.yml
erikpelgrim Aug 2, 2019
21eeef6
Update travis install packages
erikpelgrim Aug 2, 2019
535f5cc
Merge branch 'PerformanceGainNetcdfDataObject' of https://github.com/…
erikpelgrim Aug 30, 2019
091995e
Fix netcdf file
erikpelgrim Aug 30, 2019
e7035a3
Update .travis.yml
erikpelgrim Sep 3, 2019
909b6d4
Merge pull request #111 from OpenDA-Association/PerformanceGainNetcdf…
nilsvanvelzen Sep 3, 2019
9403afe
NetcdfBmiUpperLowerLimits
erikpelgrim Sep 16, 2019
aa07aaf
Rename xml elements to include "space varying"
erikpelgrim Sep 17, 2019
91e794b
Merge pull request #117 from OpenDA-Association/NetcdfBmiUpperLowerLi…
nilsvanvelzen Sep 18, 2019
4f5ce14
Fixed unit conversion (mm to meter) in calculation of volumetric soil…
Zepy1 Nov 6, 2019
5ed00e5
Merge pull request #121 from OpenDA-Association/metaswap_fix
Nov 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 5 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
classes/
examples/
opendaTestRuns/
opendaTestBuild/
opendaTestReports/
*.iws
**/bin
**/build
**/build-test
**/MANIFEST.MF
**/tests/*.log
OpenDATimings_*.txt
8 changes: 4 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ language: java
sudo: required

jdk:
- openjdk7
- oraclejdk8
- oraclejdk9
- openjdk11
- oraclejdk11

before_install:
- sudo apt-get update
- sudo apt-get install jq

- sudo apt-get install ant
- sudo apt-get install ant-optional

install: ./travis_install.sh
script: ./travis_test.sh
Expand Down
424 changes: 212 additions & 212 deletions algorithms/java/test/org/openda/algorithms/SequentialAlgorithmRestartTest.java
View file
Open in desktop

Large diffs are not rendered by default.

42 changes: 21 additions & 21 deletions algorithms/java/test/org/openda/algorithms/testData/Dud.oda
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<?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.CsvStochObserver">
<workingDirectory>./stochobserver</workingDirectory>
<!-- <configFile>OscillatorSimpleStochObsConfig.xml</configFile> -->
<!-- <configFile>observations_oscillator_generated_for_calibration.csv</configFile> -->
<configFile>observations_oscillator_generated_2.csv</configFile>
</stochObserver>
<stochModelFactory className="org.openda.models.oscillator.OscillatorStochModelFactory">
<workingDirectory>./model</workingDirectory>
<configFile>OscillatorStochModel.xml</configFile>
</stochModelFactory>
<algorithm className="org.openda.algorithms.Dud">
<workingDirectory>./.</workingDirectory>
<configString>dudAlgorithm.xml</configString>
</algorithm>
<resultWriter className="org.openda.resultwriters.MatlabResultWriter">
<workingDirectory>.</workingDirectory>
<configFile>dud_results.m</configFile>
</resultWriter>
</openDaApplication>
<?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.CsvStochObserver">
<workingDirectory>./stochobserver</workingDirectory>
<!-- <configFile>OscillatorSimpleStochObsConfig.xml</configFile> -->
<!-- <configFile>observations_oscillator_generated_for_calibration.csv</configFile> -->
<configFile>observations_oscillator_generated_2.csv</configFile>
</stochObserver>
<stochModelFactory className="org.openda.models.oscillator.OscillatorStochModelFactory">
<workingDirectory>./model</workingDirectory>
<configFile>OscillatorStochModel.xml</configFile>
</stochModelFactory>
<algorithm className="org.openda.algorithms.Dud">
<workingDirectory>./.</workingDirectory>
<configString>dudAlgorithm.xml</configString>
</algorithm>
<resultWriter className="org.openda.resultwriters.MatlabResultWriter">
<workingDirectory>.</workingDirectory>
<configFile>dud_results.m</configFile>
</resultWriter>
</openDaApplication>
1 change: 1 addition & 0 deletions application/java/application.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,6 @@
</library>
</orderEntry>
<orderEntry type="module" module-name="model_reactive_advection" />
<orderEntry type="module" module-name="model_metaswap" />
</component>
</module>
44 changes: 22 additions & 22 deletions application/java/test/org/openda/algorithms/testData/ensr_read_restart.oda
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--Sample XML file generated by XMLSpy v2006 rel. 3 sp1 (http://www.altova.com)-->
<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.CsvStochObserver">
<workingDirectory>./stochobserver</workingDirectory>
<!-- <configFile>OscillatorSimpleStochObsConfig.xml</configFile> -->
<configFile>observations_oscillator_generated.csv</configFile>
</stochObserver>
<stochModelFactory className="org.openda.models.oscillator.OscillatorStochModelFactory">
<workingDirectory>./model</workingDirectory>
<configFile>OscillatorStochModel.xml</configFile>
</stochModelFactory>
<algorithm className="org.openda.algorithms.kalmanFilter.EnSR">
<workingDirectory>./algorithm</workingDirectory>
<configString>EnsrAlgorithm.xml</configString>
</algorithm>
<restartInFile>zero_length.zip</restartInFile>
<resultWriter className="org.openda.resultwriters.MatlabResultWriter">
<workingDirectory>.</workingDirectory>
<configFile>ensr_read_empty_restart_results.m</configFile>
</resultWriter>
</openDaApplication>
<?xml version="1.0" encoding="UTF-8"?>
<!--Sample XML file generated by XMLSpy v2006 rel. 3 sp1 (http://www.altova.com)-->
<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.CsvStochObserver">
<workingDirectory>./stochobserver</workingDirectory>
<!-- <configFile>OscillatorSimpleStochObsConfig.xml</configFile> -->
<configFile>observations_oscillator_generated.csv</configFile>
</stochObserver>
<stochModelFactory className="org.openda.models.oscillator.OscillatorStochModelFactory">
<workingDirectory>./model</workingDirectory>
<configFile>OscillatorStochModel.xml</configFile>
</stochModelFactory>
<algorithm className="org.openda.algorithms.kalmanFilter.EnSR">
<workingDirectory>./algorithm</workingDirectory>
<configString>EnsrAlgorithm.xml</configString>
</algorithm>
<restartInFile>zero_length.zip</restartInFile>
<resultWriter className="org.openda.resultwriters.MatlabResultWriter">
<workingDirectory>.</workingDirectory>
<configFile>ensr_read_empty_restart_results.m</configFile>
</resultWriter>
</openDaApplication>
46 changes: 23 additions & 23 deletions application/java/test/org/openda/algorithms/testData/ensr_write_restart.oda
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--Sample XML file generated by XMLSpy v2006 rel. 3 sp1 (http://www.altova.com)-->
<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.CsvStochObserver">
<workingDirectory>./stochobserver</workingDirectory>
<!-- <configFile>OscillatorSimpleStochObsConfig.xml</configFile> -->
<configFile>observations_oscillator_generated.csv</configFile>
</stochObserver>
<stochModelFactory className="org.openda.models.oscillator.OscillatorStochModelFactory">
<workingDirectory>./model</workingDirectory>
<configFile>OscillatorStochModel.xml</configFile>
</stochModelFactory>
<algorithm className="org.openda.algorithms.kalmanFilter.EnSR">
<workingDirectory>./algorithm</workingDirectory>
<configString>EnsrAlgorithm.xml</configString>
</algorithm>
<restartOutFilePrefix>restart</restartOutFilePrefix>
<restartOutFileTimeTag>no</restartOutFileTimeTag>
<resultWriter className="org.openda.resultwriters.MatlabResultWriter">
<workingDirectory>.</workingDirectory>
<configFile>ensr_write_restart_results.m</configFile>
</resultWriter>
</openDaApplication>
<?xml version="1.0" encoding="UTF-8"?>
<!--Sample XML file generated by XMLSpy v2006 rel. 3 sp1 (http://www.altova.com)-->
<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.CsvStochObserver">
<workingDirectory>./stochobserver</workingDirectory>
<!-- <configFile>OscillatorSimpleStochObsConfig.xml</configFile> -->
<configFile>observations_oscillator_generated.csv</configFile>
</stochObserver>
<stochModelFactory className="org.openda.models.oscillator.OscillatorStochModelFactory">
<workingDirectory>./model</workingDirectory>
<configFile>OscillatorStochModel.xml</configFile>
</stochModelFactory>
<algorithm className="org.openda.algorithms.kalmanFilter.EnSR">
<workingDirectory>./algorithm</workingDirectory>
<configString>EnsrAlgorithm.xml</configString>
</algorithm>
<restartOutFilePrefix>restart</restartOutFilePrefix>
<restartOutFileTimeTag>no</restartOutFileTimeTag>
<resultWriter className="org.openda.resultwriters.MatlabResultWriter">
<workingDirectory>.</workingDirectory>
<configFile>ensr_write_restart_results.m</configFile>
</resultWriter>
</openDaApplication>
42 changes: 21 additions & 21 deletions application/java/test/org/openda/algorithms/testData/oscillatorEnsrOpenDaConfig.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--Sample XML file generated by XMLSpy v2006 rel. 3 sp1 (http://www.altova.com)-->
<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.CsvStochObserver">
<workingDirectory>./stochobserver</workingDirectory>
<!-- <configFile>OscillatorSimpleStochObsConfig.xml</configFile> -->
<configFile>observations_oscillator_generated.csv</configFile>
</stochObserver>
<stochModelFactory className="org.openda.models.oscillator.OscillatorStochModelFactory">
<workingDirectory>./model</workingDirectory>
<configFile>OscillatorStochModel.xml</configFile>
</stochModelFactory>
<algorithm className="org.openda.algorithms.kalmanFilter.EnSR">
<workingDirectory>./algorithm</workingDirectory>
<configString>EnsrAlgorithm.xml</configString>
</algorithm>
<resultWriter className="org.openda.resultwriters.MatlabResultWriter">
<workingDirectory>.</workingDirectory>
<configFile>ensr_results.m</configFile>
</resultWriter>
</openDaApplication>
<?xml version="1.0" encoding="UTF-8"?>
<!--Sample XML file generated by XMLSpy v2006 rel. 3 sp1 (http://www.altova.com)-->
<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.CsvStochObserver">
<workingDirectory>./stochobserver</workingDirectory>
<!-- <configFile>OscillatorSimpleStochObsConfig.xml</configFile> -->
<configFile>observations_oscillator_generated.csv</configFile>
</stochObserver>
<stochModelFactory className="org.openda.models.oscillator.OscillatorStochModelFactory">
<workingDirectory>./model</workingDirectory>
<configFile>OscillatorStochModel.xml</configFile>
</stochModelFactory>
<algorithm className="org.openda.algorithms.kalmanFilter.EnSR">
<workingDirectory>./algorithm</workingDirectory>
<configString>EnsrAlgorithm.xml</configString>
</algorithm>
<resultWriter className="org.openda.resultwriters.MatlabResultWriter">
<workingDirectory>.</workingDirectory>
<configFile>ensr_results.m</configFile>
</resultWriter>
</openDaApplication>
52 changes: 26 additions & 26 deletions application/java/test/org/openda/application/testData/oscillEnsrMultiRes_1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +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.CsvStochObserver">
<workingDirectory>./stochobserver</workingDirectory>
<!-- <configFile>OscillatorSimpleStochObsConfig.xml</configFile> -->
<configFile>observations_oscillator_generated.csv</configFile>
</stochObserver>
<stochModelFactory className="org.openda.models.oscillator.OscillatorStochModelFactory">
<workingDirectory>./model</workingDirectory>
<configFile>OscillatorStochModel.xml</configFile>
</stochModelFactory>
<algorithm className="org.openda.algorithms.kalmanFilter.EnSR">
<workingDirectory>./algorithm</workingDirectory>
<configString>EnsrAlgorithm.xml</configString>
</algorithm>
<resultWriters>
<!-- <resultWriter className="org.openda.resultwriters.MatlabResultWriter">
<workingDirectory>.</workingDirectory>
<configFile>ensr_results.m</configFile>
</resultWriter>
<resultWriter className="org.openda.resultwriters.MatlabResultWriter">
<workingDirectory>.</workingDirectory>
<configFile>ensr_results.m</configFile>
</resultWriter> -->
</resultWriters>
</openDaApplication>
<?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.CsvStochObserver">
<workingDirectory>./stochobserver</workingDirectory>
<!-- <configFile>OscillatorSimpleStochObsConfig.xml</configFile> -->
<configFile>observations_oscillator_generated.csv</configFile>
</stochObserver>
<stochModelFactory className="org.openda.models.oscillator.OscillatorStochModelFactory">
<workingDirectory>./model</workingDirectory>
<configFile>OscillatorStochModel.xml</configFile>
</stochModelFactory>
<algorithm className="org.openda.algorithms.kalmanFilter.EnSR">
<workingDirectory>./algorithm</workingDirectory>
<configString>EnsrAlgorithm.xml</configString>
</algorithm>
<resultWriters>
<!-- <resultWriter className="org.openda.resultwriters.MatlabResultWriter">
<workingDirectory>.</workingDirectory>
<configFile>ensr_results.m</configFile>
</resultWriter>
<resultWriter className="org.openda.resultwriters.MatlabResultWriter">
<workingDirectory>.</workingDirectory>
<configFile>ensr_results.m</configFile>
</resultWriter> -->
</resultWriters>
</openDaApplication>
40 changes: 20 additions & 20 deletions application/java/test/org/openda/application/testData/oscillatorDudOpenDaConfig.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<?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.CsvStochObserver">
<workingDirectory>./stochobserver</workingDirectory>
<!-- <configFile>OscillatorSimpleStochObsConfig.xml</configFile> -->
<configFile>observations_oscillator_generated_for_calibration.csv</configFile>
</stochObserver>
<stochModelFactory className="org.openda.models.oscillator.OscillatorStochModelFactory">
<workingDirectory>./model</workingDirectory>
<configFile>OscillatorStochModel.xml</configFile>
</stochModelFactory>
<algorithm className="org.openda.algorithms.Dud">
<workingDirectory>./algorithm</workingDirectory>
<configString>dudAlgorithm.xml</configString>
</algorithm>
<resultWriter className="org.openda.resultwriters.MatlabResultWriter">
<workingDirectory>.</workingDirectory>
<configFile>dud_results.m</configFile>
</resultWriter>
</openDaApplication>
<?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.CsvStochObserver">
<workingDirectory>./stochobserver</workingDirectory>
<!-- <configFile>OscillatorSimpleStochObsConfig.xml</configFile> -->
<configFile>observations_oscillator_generated_for_calibration.csv</configFile>
</stochObserver>
<stochModelFactory className="org.openda.models.oscillator.OscillatorStochModelFactory">
<workingDirectory>./model</workingDirectory>
<configFile>OscillatorStochModel.xml</configFile>
</stochModelFactory>
<algorithm className="org.openda.algorithms.Dud">
<workingDirectory>./algorithm</workingDirectory>
<configString>dudAlgorithm.xml</configString>
</algorithm>
<resultWriter className="org.openda.resultwriters.MatlabResultWriter">
<workingDirectory>.</workingDirectory>
<configFile>dud_results.m</configFile>
</resultWriter>
</openDaApplication>
40 changes: 20 additions & 20 deletions ...on/java/test/org/openda/application/testData/oscillatorDudOpenDaConfig_withConstraint.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<?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.CsvStochObserver">
<workingDirectory>./stochobserver</workingDirectory>
<!-- <configFile>OscillatorSimpleStochObsConfig.xml</configFile> -->
<configFile>observations_oscillator_generated_for_calibration.csv</configFile>
</stochObserver>
<stochModelFactory className="org.openda.models.oscillator.OscillatorStochModelFactory">
<workingDirectory>./model</workingDirectory>
<configFile>OscillatorStochModel.xml</configFile>
</stochModelFactory>
<algorithm className="org.openda.algorithms.Dud">
<workingDirectory>./algorithm</workingDirectory>
<configString>dudAlgorithm_withConstraint.xml</configString>
</algorithm>
<resultWriter className="org.openda.resultwriters.MatlabResultWriter">
<workingDirectory>.</workingDirectory>
<configFile>dud_constraint_results.m</configFile>
</resultWriter>
</openDaApplication>
<?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.CsvStochObserver">
<workingDirectory>./stochobserver</workingDirectory>
<!-- <configFile>OscillatorSimpleStochObsConfig.xml</configFile> -->
<configFile>observations_oscillator_generated_for_calibration.csv</configFile>
</stochObserver>
<stochModelFactory className="org.openda.models.oscillator.OscillatorStochModelFactory">
<workingDirectory>./model</workingDirectory>
<configFile>OscillatorStochModel.xml</configFile>
</stochModelFactory>
<algorithm className="org.openda.algorithms.Dud">
<workingDirectory>./algorithm</workingDirectory>
<configString>dudAlgorithm_withConstraint.xml</configString>
</algorithm>
<resultWriter className="org.openda.resultwriters.MatlabResultWriter">
<workingDirectory>.</workingDirectory>
<configFile>dud_constraint_results.m</configFile>
</resultWriter>
</openDaApplication>
Loading