Skip to content
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.

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

Develop #3

Open
wants to merge 209 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
209 commits
Select commit Hold shift + click to select a range
95ca580
Adding weather translator for APSIM
ionathan Jul 10, 2012
7b1bbb9
Proof on concept for Failure issues
frostbytten Jul 11, 2012
c2a3a7e
Safekeeping json light...
ionathan Jul 11, 2012
afb9bdb
Added annotations and removed stations - now weather contains only one
ionathan Jul 11, 2012
0f8f771
Corrected naming convention.
ionathan Jul 11, 2012
fe4d9ee
Records done as well.
ionathan Jul 11, 2012
828b79f
Renamed converter class
ionathan Jul 11, 2012
cc9303e
Added separate Soil, SoilLayer and Experiment classes using @JsonProp…
hol353 Jul 11, 2012
f291a1e
Management sketch
ionathan Jul 11, 2012
9f7191f
Merge branch 'master' into light-json
ionathan Jul 11, 2012
a38d7f0
configuration of .gitignore
ionathan Jul 11, 2012
533f452
Configuration for eclipse
ionathan Jul 11, 2012
fac10d1
Management et al
ionathan Jul 11, 2012
6d7e65d
Prettyprint json example
ionathan Jul 11, 2012
a965284
Added InitialConditions
hol353 Jul 11, 2012
ac79d86
Resolved conflicts
ionathan Jul 11, 2012
b464a9b
Change-Id: I102fece76dfb98a33c675a8252bb6fc0965dbe87
ionathan Jul 11, 2012
56b0ad1
More changes
ionathan Jul 11, 2012
3b3d8fe
Change-Id: I6ff70d7403f14878d6f9508ab012c4658f7be563
ionathan Jul 11, 2012
a232e60
Small fixes.
ionathan Jul 11, 2012
06cdbec
Severe reconstructions - new json schema and pojos
ionathan Jul 12, 2012
23873d2
More getters and setters
ionathan Jul 12, 2012
52ae174
Modified template matching severe reconstructions
hol353 Jul 12, 2012
0ae33f9
Converter changes, json ignores
ionathan Jul 12, 2012
05dac48
Merge branch 'master' of github.com:agmip/translator-apsim
ionathan Jul 12, 2012
555e8c9
Tests updates...
ionathan Jul 12, 2012
68a978a
Fixed serialization problems with dates. Added velocity template for
ionathan Jul 13, 2012
ac07739
Date serialization fixes
ionathan Jul 13, 2012
b3dde2d
Added exception in weather beans, not to serialize default values.
ionathan Jul 13, 2012
658fe3b
Fixes here and there...
ionathan Jul 13, 2012
0cf239e
Refactoring tests
ionathan Jul 13, 2012
137a8bd
Tests fixed
ionathan Jul 13, 2012
acf9e8c
Added InitialConditions
hol353 Jul 13, 2012
1d433cf
Added InitialConditions
hol353 Jul 13, 2012
da3ddcb
Added InitialConditions
hol353 Jul 13, 2012
4014833
Added InitialConditions
hol353 Jul 13, 2012
cc35d1e
Added InitialConditions
hol353 Jul 13, 2012
6464919
Added InitialConditions
hol353 Jul 13, 2012
73adf03
Added InitialConditions
hol353 Jul 13, 2012
1e37369
New template
hol353 Jul 13, 2012
9ede9bd
Fixed merge conflicts
hol353 Jul 13, 2012
251edd3
Try and get InitialConditions to work
hol353 Jul 13, 2012
ca2c6ba
easy fix
ionathan Jul 13, 2012
2f1e8d1
Small fixes
ionathan Jul 13, 2012
ac3c31e
fixed crlf problem with template
ionathan Jul 13, 2012
a11a692
lat long in place
ionathan Jul 13, 2012
2bbf5ba
Met file dates corrected
ionathan Jul 13, 2012
4023f88
APSIM works!!!
hol353 Jul 13, 2012
aad78f3
zipped files produced - and tested
ionathan Jul 13, 2012
8666c31
Fixed date format unit in met file
hol353 Jul 13, 2012
a89a5f8
Bug date fixed. Thats all folks!
ionathan Jul 13, 2012
60e2b41
Merge branch 'master' of github.com:agmip/translator-apsim
ionathan Jul 13, 2012
5d4ede0
Added a test for a peanut json string - it fails though
hol353 Aug 8, 2012
85b6ed8
Fixed velocity templates
frostbytten Sep 4, 2012
a930602
Major Edits for compatiblity with QuADUI
frostbytten Sep 6, 2012
695a8c9
Bug Fixes
frostbytten Sep 26, 2012
143aa8c
Made the translator a lot more robust and able to handle missing data…
hol353 Oct 3, 2012
2f2dbd7
Fixes #2
frostbytten Oct 19, 2012
faa02d1
Minor change to stop $simulation.initialCondition.getResidueType() be…
hol353 Oct 24, 2012
3c52561
Many changes to improve calculation of APSIM variables.
hol353 Nov 12, 2012
068d215
Fixed file close issue and Jackson requirements
frostbytten Nov 12, 2012
56951bb
Preparing for preparing for release ;)
frostbytten Nov 22, 2012
b40f739
[maven-release-plugin] prepare release translator-apsim-1.2
frostbytten Nov 22, 2012
c6aa81a
[maven-release-plugin] prepare for next development iteration
frostbytten Nov 22, 2012
80f3181
Merge branch 'release-1.2' into develop
frostbytten Nov 22, 2012
130ce58
Merge branch 'release-1.2'
frostbytten Nov 22, 2012
6cb3f21
Removed the use of Logger.
hol353 Feb 4, 2013
bf84c02
Fixed John's list of defects.
hol353 Feb 4, 2013
cc865af
Multi experiments that Chris has forced us to do...
ionathan Feb 4, 2013
96508db
Multi experiments that Chris has forced us to do... (2nd part)
ionathan Feb 4, 2013
fa78e56
Merge branch 'master' of https://github.com/agmip/translator-apsim
ionathan Feb 4, 2013
bda66b3
Fixed icrn bug.
ionathan Feb 4, 2013
46e3b63
Restored weather.json, which is required for WeatherTest.java
ionathan Feb 4, 2013
ea2b933
added folder
ionathan Feb 4, 2013
70a746a
Perfecting my ninja skills...
ionathan Feb 4, 2013
0815cb9
Got multi experiment .apsim files working properly.
hol353 Feb 5, 2013
230e3b8
Added ACMO output file to translator template
hol353 Feb 5, 2013
9978897
Merge branch 'master' of github.com:agmip/translator-apsim into develop
frostbytten Feb 5, 2013
fc3647c
Removed decompress call
frostbytten Feb 5, 2013
b77100d
Minor fixes for defaults PH and SWCON
hol353 Feb 6, 2013
7cf8e47
Attempt to fix problem where the AgMIP map doesn't have any experiments,
hol353 Feb 6, 2013
69cc1cf
Attempt to fix problem where the AgMIP map doesn't have any experiments,
hol353 Feb 6, 2013
026012b
Merge branch 'master' of https://github.com/agmip/translator-apsim.git
hol353 Feb 6, 2013
ef81d39
Another fix for ensuring empty experiments collection is tolerated
hol353 Feb 6, 2013
2d8fcd9
Separate Initial Conditions into Inital Water and Initial Nitrogen in
hol353 Feb 6, 2013
e6ae2a8
Minor change to planting rule to not log a cultivar message if
hol353 Feb 6, 2013
c60866e
Added vtd-xml for fast xml processing.
ionathan Feb 7, 2013
9cae6f3
Added setters and JsonIgnore where appropriate.
ionathan Feb 7, 2013
c271a91
Merge branch 'master' of https://github.com/agmip/translator-apsim
ionathan Feb 7, 2013
993da4c
SoilReader reads all Soils from apsim xml file. Added some tests code…
ionathan Feb 7, 2013
da18360
fixed local installation of vtd.jar
ionathan Feb 7, 2013
f1eada4
SoilReader can read a sinlge soil now!
ionathan Feb 7, 2013
d76ef51
Added a WeatherReader
hol353 Feb 7, 2013
5999f18
Added simpler test for reading in APSIM weather files
hol353 Feb 8, 2013
ad7d3cb
Simulation reader first implementation. Currently reads Soils and Wea…
ionathan Feb 8, 2013
a9c40ab
Readme updated
ionathan Feb 8, 2013
e1ce8ba
Readme updated
ionathan Feb 8, 2013
5cff6cd
Readme updated
ionathan Feb 8, 2013
a03d21b
Changed weather to look for CO2Y variable.
hol353 Feb 19, 2013
c2f4100
Fixed weather only processing and removed static lib
frostbytten Feb 28, 2013
07e1941
Merge branch 'develop' of github.com:agmip/translator-apsim into develop
frostbytten Feb 28, 2013
7885370
Fixed some minor issues reported by John
hol353 Mar 12, 2013
d741285
Merged in new file from Dean.
frostbytten Mar 15, 2013
ecd57fb
Fixed planting depth multiplier
frostbytten Mar 23, 2013
584fa4d
Added support for LookupCodes (ace-lookup)
frostbytten Mar 23, 2013
c02dbbe
Removed ZIP compression
frostbytten Mar 25, 2013
32c3d08
Update dependencies to release version
MengZhang May 6, 2013
9f3128c
[maven-release-plugin] prepare release translator-apsim-1.3
MengZhang May 6, 2013
0807ad4
[maven-release-plugin] prepare for next development iteration
MengZhang May 6, 2013
083a898
Merge branch 'release-1.3' into develop
MengZhang May 6, 2013
2929fd0
Update dependencies version
MengZhang May 9, 2013
4232d56
Major refactor + removed all assumptions
hol353 Jun 5, 2013
72bcee0
Added test for Maize which runs in APSIM
hol353 Jun 5, 2013
0c5c5f7
Got translator working for wheat and sorghum
hol353 Jun 7, 2013
bafaaf6
Added cotton, millet, rice, sugar
hol353 Jun 11, 2013
089c889
Update to rice and added bund_height
hol353 Jun 11, 2013
fe609e1
Changed to use PLFTN and Rice transplant date
hol353 Jun 17, 2013
87d78f3
update the following variable name
MengZhang Jul 17, 2013
b481a73
Add new feature that splitting the large data set into multiple small…
MengZhang Jul 18, 2013
3a62d13
Fix version number
MengZhang Jul 18, 2013
69099de
roll back the previous two commit
MengZhang Jul 25, 2013
174fe3c
Added KSAT to translator
hol353 Jul 25, 2013
7300413
update the template to keep KS in the generated file when its value i…
MengZhang Jul 25, 2013
2efcc27
Changed tests from apsim_airdry to sladr
hol353 Jul 26, 2013
8ee4278
Add batch file generator for APSIM 74 and 75. The batch file will aut…
MengZhang Aug 1, 2013
72fe93b
Update to use value from Data set for SummerU, WinterU, SummerCona an…
MengZhang Aug 14, 2013
35937ed
Add some commented code for the case that requiring to read some soil…
MengZhang Aug 16, 2013
2d96845
Add handling for summer start date and winter start date
MengZhang Aug 19, 2013
7ba33c9
Update date format handling for SummerDate and WinterDate (MM-dd -> d…
MengZhang Aug 20, 2013
9b07b17
Bug fix:
MengZhang Aug 22, 2013
4bd8cb1
Update the CO2Y and ACO2 handling to avoid translate blank string to 0.0
MengZhang Aug 30, 2013
455c21d
Fix the bug for incorrectly converting the foramt of SummerDate and W…
MengZhang Oct 7, 2013
3e35a80
Added nplsb as a required variable when doing rice paddy simulations
hol353 Nov 17, 2013
daf4cef
To support CRAFT, use CUL_ID when APSIM_CUL_ID is missing.
MengZhang Nov 22, 2013
8e51cbe
Merge branch 'develop' of github.com:agmip/translator-apsim.git into …
MengZhang Nov 22, 2013
86fbaa2
Change to not do do the error report timing for NPLS all the time but…
MengZhang Nov 25, 2013
8a6b64d
update to use new released translator BOM
MengZhang Nov 26, 2013
c6609d3
Fixed rice flowering and maturity dates in ACMO file plus ensured a l…
hol353 Jan 14, 2014
f7e8692
Change the error message handling
MengZhang Jan 23, 2014
f7b6ffb
update the handling for set crop name for soil data to avoid the exce…
MengZhang Jan 23, 2014
05a54ce
[maven-release-plugin] prepare release translator-apsim-1.3.1
MengZhang Jan 31, 2014
97b0a32
[maven-release-plugin] prepare for next development iteration
MengZhang Jan 31, 2014
6992d2e
Fix the issue that illegal character for Windows file name used in th…
MengZhang Mar 30, 2014
5dbc47b
Add SLFAC and SLFIC
MengZhang Mar 30, 2014
ceb4456
Add debug information for SLFAC and SLFIC
MengZhang Mar 30, 2014
4abd52c
[maven-release-plugin] prepare release translator-apsim-1.3.2
MengZhang Mar 30, 2014
36e3d5a
[maven-release-plugin] prepare for next development iteration
MengZhang Mar 30, 2014
9deadba
Add support for SLDRL which could provide value for SWCON by layer
MengZhang Apr 20, 2014
8a8a836
[maven-release-plugin] prepare release translator-apsim-1.3.3
MengZhang Apr 20, 2014
964d9d5
[maven-release-plugin] prepare for next development iteration
MengZhang Apr 20, 2014
4c454d2
Add new class to let APSIM translator jar could run standalone in the…
MengZhang May 15, 2014
52a8f35
Add SLRGF for XF
MengZhang May 20, 2014
d170ea8
Add auto folder rename function for stand alone jar
MengZhang May 20, 2014
e9cb8d6
Change XF to get value from data set
MengZhang May 20, 2014
5652902
[maven-release-plugin] prepare release translator-apsim-1.3.4
MengZhang May 20, 2014
ffcb613
[maven-release-plugin] prepare for next development iteration
MengZhang May 20, 2014
202e419
Add logback.xml to avoid debug log
MengZhang May 24, 2014
5aff0e0
Add logback.xml to avoid debug log
MengZhang May 24, 2014
422abff
Update simple translator UI to fulfill the requirements of FACE-IT
MengZhang Jun 2, 2014
5fdd049
Update command line mode for translator-apsim
MengZhang Jul 14, 2014
dd9a683
[maven-release-plugin] prepare release translator-apsim-1.3.5
MengZhang Jul 14, 2014
db9b7cd
[maven-release-plugin] prepare for next development iteration
MengZhang Jul 14, 2014
3f9b612
Add unsupported event type to avoid unrecognizable data error.
MengZhang Aug 13, 2014
99e3345
[maven-release-plugin] prepare release translator-apsim-1.3.6
MengZhang Aug 13, 2014
61e27e0
[maven-release-plugin] prepare for next development iteration
MengZhang Aug 13, 2014
7824ded
Active APSIM reader for *.met weather file
MengZhang Apr 17, 2015
9b38669
Update to add more comment info for weahter meta data
MengZhang May 3, 2015
b599569
[maven-release-plugin] prepare release translator-apsim-1.3.7
MengZhang May 4, 2015
1de1776
[maven-release-plugin] prepare for next development iteration
MengZhang May 4, 2015
6bef1db
temporary solution for PADDY function issue
MengZhang May 19, 2015
1b97a56
temporary solution for support adjustment feature
MengZhang Jun 22, 2015
5c2adb7
Add support for generating the run batch file for APSIM 7.7
MengZhang Aug 2, 2015
faa1612
Let the weather file name come from wst_id instead of wst_name
MengZhang Oct 30, 2015
52cd270
Change the XF get value from SLXF instead of SLRGF, and if nor provid…
MengZhang Oct 30, 2015
691f7e9
minor fix
MengZhang Oct 31, 2015
edbeffa
Changed ACMO anthesis date to be first day of flowering rather than l…
hol353 Dec 4, 2015
eb067ac
Fixed ES, EP and ET variables in template.
hol353 Dec 8, 2015
53560f6
Update agmip common function version
MengZhang Feb 26, 2016
a537b5d
1. Change the yield variable from "yield" to "openwt" for cotton
MengZhang May 3, 2016
e68e65e
Revise calculation for soil carbon variables
MengZhang May 3, 2016
f4199bf
Revise the translation for rice paddy management
MengZhang May 3, 2016
05e495a
Revise the translation for rice paddy management
MengZhang May 3, 2016
fdc66be
Change skiprow from 1 to 0 for cotton
MengZhang May 3, 2016
8cb25d0
Add handling to support original name of cultivar file for rice and c…
MengZhang May 3, 2016
55db84a
minor fix
MengZhang May 3, 2016
0b89070
Working on issue-14
frostbytten May 25, 2016
560ed26
Minor changes to the irrigation script
frostbytten Jun 7, 2016
1daa9b5
Some revise for the paddy function code and template
MengZhang Jun 9, 2016
afa5b33
1, Revise paddy function
MengZhang Aug 4, 2016
eae9520
1, Revise paddy function
MengZhang Aug 4, 2016
6a640cb
1, Revise paddy function
MengZhang Aug 4, 2016
c796938
1, Revise paddy function
MengZhang Aug 11, 2016
6bb9626
Merge origin_AG/apsim_acmofix into develop
MengZhang Aug 11, 2016
15a56d4
Add dividable feature to APSIM
MengZhang Oct 3, 2016
75445c5
update input file to match the latest ACMO requirements
MengZhang Oct 3, 2016
f3dd535
update the version of dependencies
MengZhang Oct 3, 2016
8b86225
update version to 1.3.8-SNAPSHOT
MengZhang Oct 3, 2016
1257d83
update dependency version
MengZhang Oct 3, 2016
54aaf62
[maven-release-plugin] prepare release translator-apsim-1.3.8
MengZhang Oct 3, 2016
7642284
[maven-release-plugin] prepare for next development iteration
MengZhang Oct 3, 2016
3e8bfcd
Update for mathcing CRAFT project requirements
MengZhang Oct 23, 2017
1c24446
minor update
MengZhang Oct 23, 2017
60ea96e
update for auto irrigation
MengZhang Oct 23, 2017
9dccceb
Add craft template
MengZhang Oct 23, 2017
64a64ae
Update irrigation and ACMO output
MengZhang Oct 23, 2017
1be698d
update dependency version
MengZhang Jan 21, 2022
449d17c
update release package
MengZhang Jan 21, 2022
54a2577
move to release version 1.3.9
MengZhang Jan 21, 2022
02bdb50
move to the next develop version
MengZhang Jan 21, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions .classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType">
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="org.maven.ide.eclipse.maven2Builder"/>
<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/>
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
</launchConfiguration>
10 changes: 9 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
target/*
*.swp
*.sw?
/.settings
/bin
/target
/.classpath
*.DS_Store
src/test/resources/UFGA8201MZ.apsim
src/test/resources/UFGA8201MZ.met
src/test/resources/default.met
34 changes: 34 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>APSIM_Translator</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
<triggers>full,incremental,</triggers>
<arguments>
<dictionary>
<key>LaunchConfigHandle</key>
<value>&lt;project&gt;/.externalToolBuilders/org.maven.ide.eclipse.maven2Builder.launch</value>
</dictionary>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
</natures>
</projectDescription>
9 changes: 8 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
#translator-apsim#

TODO
This translator for [APSIM](http://www.apsim.info) reads from AgMIP standard json file, converts it to a set of POJOs, and serializes to [APSIM](http://www.apsim.info) files using [Apache Velocity](http://velocity.apache.org).

It has been developed during the [2nd AgMIP Development Sprint](http://research.agmip.org/display/itwiki/July+9-13%2C+2012+Rapid+Development+Workshop), in Gainesville, FL, by Dean Holzworth and [Ioannis N. Athanasiadis](http://www.athanasiadis.info).

The translator has been updated to read APSIM XML files and convert them into the AgMIP common format using [VTD-XML](http://vtd-xml.sourceforge.net). Currently reads only weather and soil information.

It has been updated during the [4th AgMIP Development Sprint](http://research.agmip.org/display/itwiki/Austin+Hackathon%2C+February+4-8%2C+2013), in Austin, TX, by Dean Holzworth and and [Ioannis N. Athanasiadis](http://www.athanasiadis.info).

Loading