Skip to content

Commit 6076bfe

Browse files
mabesamabesa
mabesa
authored and
mabesa
committed
bug fix, generalised matlab_batcher
Bugs in the test-oda files fixed. Matlab_batcher generalised to work on different systems (thanks Nils).
1 parent 7549f9a commit 6076bfe

34 files changed

+9230
-5
lines changed

‎build_backup.xml‎

Lines changed: 174 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,174 @@
1+
<project name="model_RainfallRunoffZhang" default="help" basedir=".">
2+
<!--
3+
================================================================================
4+
Ant build file for openda java code
5+
install ant and type
6+
"ant help"
7+
for a list of options
8+
================================================================================
9+
-->
10+
<target name="help">
11+
<echo>
12+
ant help --> print this help
13+
ant build --> compile, make jar and copy resources
14+
ant build-test --> compile test classes
15+
ant clean --> remove output
16+
ant javadoc --> build javadoc
17+
</echo>
18+
</target>
19+
20+
<property file="module.properties"/>
21+
22+
<target name="debug">
23+
<echo>
24+
module=${module}
25+
srcdir=${srcdir}
26+
jarname=${jarname}
27+
builddir=${builddir}
28+
bindir=${bindir}
29+
</echo>
30+
</target>
31+
32+
<!--
33+
===========================================================================
34+
Compilation
35+
===========================================================================
36+
-->
37+
<target name="build" depends="jarfile">
38+
</target>
39+
40+
<target name="build-test" depends="init">
41+
<javac srcdir="${testdir}" destdir="${buildtestdir}" debug="${debug}" source="${source}" encoding="UTF-8" failonerror="${failonerror}" listfiles="${listfiles}" fork="yes" memoryInitialSize="${minmemory}" memoryMaximumSize="${maxmemory}" includeantruntime="false">
42+
<classpath>
43+
<fileset dir="${projectdir}">
44+
<include name="${projectlib}/*.jar"/>
45+
</fileset>
46+
</classpath>
47+
</javac>
48+
</target>
49+
50+
<target name="jarfile" depends="moduleclasses,manifest">
51+
<jar jarfile="${modulelibdir}/${jarname}" manifest="MANIFEST.MF">
52+
<fileset dir="${builddir}">
53+
<include name="**/*.class"/>
54+
<include name="**/*.gif"/>
55+
</fileset>
56+
</jar>
57+
</target>
58+
59+
<target name="moduleclasses" depends="init,copy-module-resources">
60+
<javac srcdir="${srcdir}" destdir="${builddir}" debug="${debug}" source="${source}" encoding="UTF-8" failonerror="${failonerror}" listfiles="${listfiles}" fork="yes" memoryInitialSize="${minmemory}" memoryMaximumSize="${maxmemory}" includeantruntime="false">
61+
<classpath>
62+
<fileset dir=".">
63+
<include name="${modulelibdir}/*.jar"/>
64+
</fileset>
65+
<fileset dir="${projectdir}">
66+
<include name="${projectlib}/*.jar"/>
67+
</fileset>
68+
</classpath>
69+
</javac>
70+
</target>
71+
72+
<target name="javadoc" depends="init">
73+
<javadoc destdir="${javadocdir}/${module}" classpath="${projectfiles}" verbose="yes" windowtitle="openDA.Module: ${module} Version: ${version}" source="${source}">
74+
<fileset dir="${srcdir}">
75+
<include name="**/*.java"/>
76+
</fileset>
77+
<classpath>
78+
<fileset dir="${projectfiles}">
79+
<include name"${modulebindir"
80+
<fileset dir="${resourcesdir}">
81+
<include name="openda_core.jar"/>
82+
</fileset>
83+
</classpath>
84+
</javadoc>
85+
</target>
86+
87+
88+
<!--
89+
===========================================================================
90+
Tools: init, clean, etc.
91+
===========================================================================
92+
-->
93+
<target name="init" depends="clean">
94+
<tstamp/>
95+
<mkdir dir="${builddir}"/>
96+
<mkdir dir="${buildtestdir}"/>
97+
<mkdir dir="${modulebindir}"/>
98+
<mkdir dir="${modulelibdir}"/>
99+
<mkdir dir="${javadocdir}"/>
100+
</target>
101+
102+
<target name="clean">
103+
<delete dir="${modulebindir}"/>
104+
<delete dir="${modulelibdir}"/>
105+
<delete dir="${builddir}"/>
106+
<delete dir="${buildtestdir}"/>
107+
<delete dir="${javadocdir}"/>
108+
<delete file="MANIFEST.MF"/>
109+
</target>
110+
111+
<taskdef resource="org/tigris/subversion/svnant/svnantlib.xml">
112+
<classpath>
113+
<fileset dir="../core/java/resources/svnant-1.3.0/lib" includes="**/*.jar" />
114+
</classpath>
115+
</taskdef>
116+
117+
<target name="svn-revision" >
118+
<svn>
119+
<status path="." revisionProperty="svn.revision" />
120+
</svn>
121+
<echo>Subversion Revision: ${svn.revision}</echo>
122+
</target>
123+
124+
<target name="manifest" depends="svn-revision">
125+
<tstamp/>
126+
<manifest file="MANIFEST.MF">
127+
<attribute name="Title" value="${projectname}"/>
128+
<attribute name="Version" value="${version}.${svn.revision} ${TODAY}"/>
129+
<attribute name="Vendor" value="${vendor}"/>
130+
</manifest>
131+
</target>
132+
133+
<target name="copy-module-resources">
134+
<!-- copy openda resources and additional binaries -->
135+
<copy todir="${modulelibdir}" flatten="yes">
136+
<!-- copy resources -->
137+
<fileset dir="${resourcesdir}">
138+
<include name="**/*.jar"/>
139+
<include name="**/*.dll"/>
140+
<include name="**/*.DLL"/>
141+
<include name="**/*.so"/>
142+
<include name="**/*.lic"/>
143+
<include name="**/*.LIC"/>
144+
<include name="**/*.xsd"/>
145+
<include name="**/*.exe"/>
146+
<include name="**/*.EXE"/>
147+
<include name="**/*.bat"/>
148+
<include name="**/*.BAT"/>
149+
<include name="**/*.test"/>
150+
<include name="**/openDA_castor_schemas.zip"/>
151+
</fileset>
152+
</copy>
153+
<copy todir="${modulebindir}" flatten="yes">
154+
<fileset dir="${external}">
155+
<include name="**/*.sh"/>
156+
<include name="**/*.bat"/>
157+
<include name="**/*.exe"/>
158+
<include name="**/*.pl"/>
159+
<include name="**/*.dll"/>
160+
</fileset>
161+
</copy>
162+
<copy todir="${modulebindir}" flatten="no">
163+
<fileset dir="${native_bin}">
164+
<include name="**/*"/>
165+
<exclude name="**/*.exp"/>
166+
</fileset>
167+
</copy>
168+
<chmod dir="${modulebindir}" perm="ugo+rx" includes="**/*.sh"/>
169+
<chmod dir="${modulebindir}" perm="ugo+rx" includes="**/*.pl"/>
170+
</target>
171+
172+
173+
</project>
174+

‎tests/EnKFaugmentedMultithread.oda‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<openDaApplication xmlns:oda="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">
3-
<stochObserver className="org.openda.model_oneCellBudyko.ASCIITimeSeriesStochObserver">
3+
<stochObserver className="org.openda.model_RainfallRunoffZhang.ASCIITimeSeriesStochObserver">
44
<workingDirectory>./observer</workingDirectory>
55
<configFile>Observations.xml</configFile>
66
</stochObserver>

0 commit comments

Comments
 (0)