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.

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

Jump to bottom

Sorghum #823

Merged
merged 21 commits into from
May 9, 2016
Merged

Sorghum #823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
94621fd
Initial Sorghum model validation
Jan 6, 2016
c3c37f1
Sorghum Val update - WORKING
Jan 6, 2016
befdab8
add data to Sorg Validation
Jan 7, 2016
072a63e
Further changes to sorghum model
Jan 21, 2016
304aeee
Changes to sorg model
Jan 21, 2016
e29fd12
Name changes to sorghum phenology
Jan 25, 2016
78aeaf8
Fixed refeerences to underscored phase names
Jan 25, 2016
20afd7a
Fixed underscores in phase references - Part 2
Jan 25, 2016
fefa96d
Changes to sorghum structure - not working
Jan 25, 2016
17e662b
Changes to Sorghum model - Working canopy simple leaf
Jan 25, 2016
74ae5a2
Changes to leaf object - added te and svp functions
Jan 26, 2016
3c6ac6d
Sorghum Canopy fix
Jan 27, 2016
cb47bd6
Added demand functions to organs - first pass
Jan 27, 2016
623d533
Fixed Leaf demand bug in XML
Jan 27, 2016
e633385
Added leaf dm
Jan 27, 2016
9987d13
Grain demand function
Jan 27, 2016
6feb6f9
Fixed crashing from -ve stem demand
Jan 28, 2016
134d5d4
Changes to sorghum for BiomassN models
aldoherty May 8, 2016
2cb28b0
New Graph
May 9, 2016
2ca98c0
Deleted extraneous apsimx files
aldoherty May 9, 2016
4832284
Added missing met files
aldoherty May 9, 2016
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
161 changes: 161 additions & 0 deletions Prototypes/Sorghum/HE5.met
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
[weather.met.weather]
!experiment number = 10
!experiment = HE5
!station name = Hermitage Logger
latitude = -28.21 (DECIMAL DEGREES)
longitude = 152.1 (DECIMAL DEGREES)
tav = 16.37 (oC) ! annual average ambient temperature
amp = 11.52 (oC) ! annual amplitude in mean monthly temperature

Year Day maxt mint radn RAIN
() () () () () ()
1997 322 24.3 17.4 10 6.8
1997 323 22.5 13.4 16 0.2
1997 324 27.3 15 21 0
1997 325 26.5 11 28 0
1997 326 26.5 14.2 26 0
1997 327 27.5 11.5 27 0
1997 328 32.4 12.4 29 0
1997 329 33.1 13.6 30 0
1997 330 33.5 12.6 28 0
1997 331 34 14.6 27 0
1997 332 36 16.4 29 0
1997 333 32 18.9 27 20.8
1997 334 33.6 19 25 0
1997 335 32.9 17 28 4.6
1997 336 36.7 18.4 29 0
1997 337 35.6 14 30 0
1997 338 28.6 18.2 25 0
1997 339 31.5 14.2 28 0
1997 340 31.5 18.4 23 0
1997 341 34.8 17 28 0
1997 342 26.2 19.4 13 0.4
1997 343 29.8 19.5 13 0.2
1997 344 24.1 19.7 10 4.4
1997 345 25.5 15.6 20 1.2
1997 346 24.2 14.9 11 0
1997 347 30 12 26 0
1997 348 29.4 14.5 19 0
1997 349 32.3 17.9 26 49
1997 350 33.5 14 30 0
1997 351 34.9 17.5 30 0
1997 352 35.5 18.2 29 0
1997 353 33.4 21.6 19 0
1997 354 33 18.8 23 0.8
1997 355 33.5 19 24 0
1997 356 34.9 19.9 27 0
1997 357 34.6 19.4 24 1.6
1997 358 32.2 18 28 32
1997 359 30.5 19.8 24 1.6
1997 360 31 20.1 27 0
1997 361 30.4 19 21 0
1997 362 28.5 19.4 24 0.8
1997 363 28.2 17.3 26 0
1997 364 27.1 15.1 29 0
1997 365 27.5 12.5 25 0
1998 1 28.9 14.4 24 0
1998 2 29.5 14 28 0
1998 3 32.4 13.5 29 0
1998 4 30.5 16.8 26 0
1998 5 32.9 14.7 29 0
1998 6 27.7 18.2 22 0
1998 7 28.4 16.9 29 0
1998 8 28.7 15 28 0
1998 9 27.6 17.5 15 0
1998 10 26.9 18.3 11 0.2
1998 11 26.2 17 15 0.4
1998 12 27.4 16.3 11 0
1998 13 26.2 17.6 12 0
1998 14 29.2 17.7 17 0.4
1998 15 29.6 20 17 5.8
1998 16 29.5 19.5 24 3.4
1998 17 29.5 19.5 18 0
1998 18 35.3 19.8 23 0
1998 19 31.3 18.5 28 0
1998 20 32.2 16.1 27 0
1998 21 33.6 20 27 0
1998 22 34.1 17.7 27 6
1998 23 35.2 17.8 28 0
1998 24 33.9 17.7 29 0
1998 25 34.2 17.2 17 0
1998 26 35.3 22.3 27 14
1998 27 35.9 11.2 26 0
1998 28 29.6 19.5 17 0
1998 29 33.2 15.5 27 10.4
1998 30 29.6 18.6 19 46.4
1998 31 24.5 19.7 13 1
1998 32 30.4 17.3 27 8
1998 33 33.7 18 28 1.6
1998 34 32.9 19 25 0
1998 35 32.5 17.5 28 5.4
1998 36 31.8 16.4 25 0
1998 37 32.8 19.1 25 0
1998 38 31.5 19.7 24 2.2
1998 39 32.7 20 23 0
1998 40 25.5 22.1 11 4
1998 41 24.2 17.4 13 2.2
1998 42 27.4 20.4 11 7.4
1998 43 30.4 21.3 14 7.6
1998 44 32.5 19.5 25 0.2
1998 45 30.5 19.4 20 0.2
1998 46 30.5 18.8 22 0.4
1998 47 30.4 18 20 9
1998 48 30.3 18.6 25 3.6
1998 49 28 15.5 23 0
1998 50 30.7 15.3 26 0
1998 51 34.1 16.2 26 0
1998 52 35.6 20.3 26 0
1998 53 33.5 20 25 0
1998 54 33 12.2 28 0
1998 55 28.1 17.6 24 0
1998 56 28.9 12.9 26 0
1998 57 26.1 13.6 21 0
1998 58 30 15 23 0
1998 59 30.5 16.2 22 0
1998 60 27.7 16.5 20 0
1998 61 28.6 15.5 23 1.8
1998 62 30.2 11.8 25 0
1998 63 30.4 13.7 24 0
1998 64 32.2 12.6 25 0
1998 65 35 13.8 25 5.8
1998 66 31.4 11.5 24 0
1998 67 28.8 16.5 23 0
1998 68 28.9 16.7 18 0
1998 69 30.4 18.4 21 0
1998 70 30.4 14.7 23 0
1998 71 29.9 12.3 23 0
1998 72 33.2 10.5 25 0
1998 73 37.6 11.6 25 0
1998 74 35.8 15 24 0
1998 75 35.3 17.3 24 0
1998 76 36.1 19.6 22 0
1998 77 35.4 19.2 22 1.2
1998 78 28.4 20.4 21 0
1998 79 30 13.4 24 0
1998 80 33.5 11.5 24 0
1998 81 30.4 11.5 23 0
1998 82 30.4 12.8 22 0
1998 83 33.4 12.7 22 0
1998 84 28.4 11.2 20 0
1998 85 27.6 18.2 21 0.8
1998 86 32.4 16 23 0
1998 87 34.7 12 22 0
1998 88 34.6 15.6 20 0
1998 89 34.1 16.2 22 12
1998 90 33.2 17.4 20 0
1998 91 22.5 14.8 7 0
1998 92 22.7 17.5 8 0
1998 93 25 15.5 15 2.2
1998 94 26.6 15.2 22 0
1998 95 28.3 15.2 21 0
1998 96 27.6 11.4 20 0
1998 97 29.1 12.4 18 0
1998 98 29.6 11.2 20 0
1998 99 30.5 11.7 15 0
1998 100 29.4 13.8 18 0
1998 101 30.2 11 20 0
1998 102 30.1 17 16 0
1998 103 31.4 18 15 0
1998 104 22.9 17.6 8 1.8
1998 105 18.8 15.3 7 12.2

161 changes: 161 additions & 0 deletions Prototypes/Sorghum/HE6.met
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,161 @@
[weather.met.weather]
!experiment number = 11
!experiment = HE6
!station name = Hermitage Logger
latitude = -28.21 (DECIMAL DEGREES)
longitude = 152.1 (DECIMAL DEGREES)
tav = 16.37 (oC) ! annual average ambient temperature
amp = 11.52 (oC) ! annual amplitude in mean monthly temperature

Year Day maxt mint radn RAIN
() () () () () ()
1997 322 24.3 17.4 10 6.8
1997 323 22.5 13.4 16 0.2
1997 324 27.3 15 21 0
1997 325 26.5 11 28 0
1997 326 26.5 14.2 26 0
1997 327 27.5 11.5 27 0
1997 328 32.4 12.4 29 0
1997 329 33.1 13.6 30 0
1997 330 33.5 12.6 28 0
1997 331 34 14.6 27 0
1997 332 36 16.4 29 0
1997 333 32 18.9 27 20.8
1997 334 33.6 19 25 0
1997 335 32.9 17 28 4.6
1997 336 36.7 18.4 29 0
1997 337 35.6 14 30 0
1997 338 28.6 18.2 25 0
1997 339 31.5 14.2 28 0
1997 340 31.5 18.4 23 0
1997 341 34.8 17 28 0
1997 342 26.2 19.4 13 0.4
1997 343 29.8 19.5 13 0.2
1997 344 24.1 19.7 10 4.4
1997 345 25.5 15.6 20 1.2
1997 346 24.2 14.9 11 0
1997 347 30 12 26 0
1997 348 29.4 14.5 19 0
1997 349 32.3 17.9 26 49
1997 350 33.5 14 30 0
1997 351 34.9 17.5 30 0
1997 352 35.5 18.2 29 0
1997 353 33.4 21.6 19 0
1997 354 33 18.8 23 0.8
1997 355 33.5 19 24 0
1997 356 34.9 19.9 27 0
1997 357 34.6 19.4 24 1.6
1997 358 32.2 18 28 32
1997 359 30.5 19.8 24 1.6
1997 360 31 20.1 27 0
1997 361 30.4 19 21 0
1997 362 28.5 19.4 24 0.8
1997 363 28.2 17.3 26 0
1997 364 27.1 15.1 29 0
1997 365 27.5 12.5 25 0
1998 1 28.9 14.4 24 0
1998 2 29.5 14 28 0
1998 3 32.4 13.5 29 0
1998 4 30.5 16.8 26 0
1998 5 32.9 14.7 29 0
1998 6 27.7 18.2 22 0
1998 7 28.4 16.9 29 0
1998 8 28.7 15 28 0
1998 9 27.6 17.5 15 0
1998 10 26.9 18.3 11 0.2
1998 11 26.2 17 15 0.4
1998 12 27.4 16.3 11 0
1998 13 26.2 17.6 12 0
1998 14 29.2 17.7 17 0.4
1998 15 29.6 20 17 5.8
1998 16 29.5 19.5 24 3.4
1998 17 29.5 19.5 18 0
1998 18 35.3 19.8 23 0
1998 19 31.3 18.5 28 0
1998 20 32.2 16.1 27 0
1998 21 33.6 20 27 0
1998 22 34.1 17.7 27 6
1998 23 35.2 17.8 28 0
1998 24 33.9 17.7 29 0
1998 25 34.2 17.2 17 0
1998 26 35.3 22.3 27 14
1998 27 35.9 11.2 26 0
1998 28 29.6 19.5 17 0
1998 29 33.2 15.5 27 10.4
1998 30 29.6 18.6 19 46.4
1998 31 24.5 19.7 13 1
1998 32 30.4 17.3 27 8
1998 33 33.7 18 28 1.6
1998 34 32.9 19 25 0
1998 35 32.5 17.5 28 5.4
1998 36 31.8 16.4 25 0
1998 37 32.8 19.1 25 0
1998 38 31.5 19.7 24 2.2
1998 39 32.7 20 23 0
1998 40 25.5 22.1 11 4
1998 41 24.2 17.4 13 2.2
1998 42 27.4 20.4 11 7.4
1998 43 30.4 21.3 14 7.6
1998 44 32.5 19.5 25 0.2
1998 45 30.5 19.4 20 0.2
1998 46 30.5 18.8 22 0.4
1998 47 30.4 18 20 9
1998 48 30.3 18.6 25 3.6
1998 49 28 15.5 23 0
1998 50 30.7 15.3 26 0
1998 51 34.1 16.2 26 0
1998 52 35.6 20.3 26 0
1998 53 33.5 20 25 0
1998 54 33 12.2 28 0
1998 55 28.1 17.6 24 0
1998 56 28.9 12.9 26 0
1998 57 26.1 13.6 21 0
1998 58 30 15 23 0
1998 59 30.5 16.2 22 0
1998 60 27.7 16.5 20 0
1998 61 28.6 15.5 23 1.8
1998 62 30.2 11.8 25 0
1998 63 30.4 13.7 24 0
1998 64 32.2 12.6 25 0
1998 65 35 13.8 25 5.8
1998 66 31.4 11.5 24 0
1998 67 28.8 16.5 23 0
1998 68 28.9 16.7 18 0
1998 69 30.4 18.4 21 0
1998 70 30.4 14.7 23 0
1998 71 29.9 12.3 23 0
1998 72 33.2 10.5 25 0
1998 73 37.6 11.6 25 0
1998 74 35.8 15 24 0
1998 75 35.3 17.3 24 0
1998 76 36.1 19.6 22 0
1998 77 35.4 19.2 22 1.2
1998 78 28.4 20.4 21 0
1998 79 30 13.4 24 0
1998 80 33.5 11.5 24 0
1998 81 30.4 11.5 23 0
1998 82 30.4 12.8 22 0
1998 83 33.4 12.7 22 0
1998 84 28.4 11.2 20 0
1998 85 27.6 18.2 21 0.8
1998 86 32.4 16 23 0
1998 87 34.7 12 22 0
1998 88 34.6 15.6 20 0
1998 89 34.1 16.2 22 12
1998 90 33.2 17.4 20 0
1998 91 22.5 14.8 7 0
1998 92 22.7 17.5 8 0
1998 93 25 15.5 15 2.2
1998 94 26.6 15.2 22 0
1998 95 28.3 15.2 21 0
1998 96 27.6 11.4 20 0
1998 97 29.1 12.4 18 0
1998 98 29.6 11.2 20 0
1998 99 30.5 11.7 15 0
1998 100 29.4 13.8 18 0
1998 101 30.2 11 20 0
1998 102 30.1 17 16 0
1998 103 31.4 18 15 0
1998 104 22.9 17.6 8 1.8
1998 105 18.8 15.3 7 12.2

Loading