Skip to content

Commit 0544bd8

Browse files
ajwdewitajwdewit
committed
Fixed documentation problem related to agromanager: irrigation_amount should be just amount.
1 parent e6a7574 commit 0544bd8

File tree

3 files changed

+26
-25
lines changed

3 files changed

+26
-25
lines changed

‎doc/reference_guide.rst‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -465,8 +465,8 @@ An example of an agromanagement definition file::
465465
name: Timed irrigation events
466466
comment: All irrigation amounts in cm
467467
events_table:
468-
- 2000-05-25: {irrigation_amount: 3.0}
469-
- 2000-06-30: {irrigation_amount: 2.5}
468+
- 2000-05-25: {amount: 3.0, efficiency=0.7}
469+
- 2000-06-30: {amount: 2.5, efficiency=0.7}
470470
StateEvents:
471471
- event_signal: apply_npk
472472
event_state: DVS
@@ -494,10 +494,10 @@ An example of an agromanagement definition file::
494494
name: Timed irrigation events
495495
comment: All irrigation amounts in cm
496496
events_table:
497-
- 2001-06-01: {irrigation_amount: 2.0}
498-
- 2001-07-21: {irrigation_amount: 5.0}
499-
- 2001-08-18: {irrigation_amount: 3.0}
500-
- 2001-09-19: {irrigation_amount: 2.5}
497+
- 2001-06-01: {amount: 2.0, efficiency=0.7}
498+
- 2001-07-21: {amount: 5.0, efficiency=0.7}
499+
- 2001-08-18: {amount: 3.0, efficiency=0.7}
500+
- 2001-09-19: {amount: 2.5, efficiency=0.7}
501501
- event_signal: apply_npk
502502
name: Timed N/P/K application table
503503
comment: All fertilizer amounts in kg/ha
@@ -620,9 +620,9 @@ date::
620620
name: Timed irrigation events
621621
comment: All irrigation amounts in cm
622622
events_table:
623-
- 2000-05-01: {irrigation_amount: 2, efficiency: 0.7}
624-
- 2000-06-21: {irrigation_amount: 5, efficiency: 0.7}
625-
- 2000-07-18: {irrigation_amount: 3, efficiency: 0.7}
623+
- 2000-05-01: {amount: 2, efficiency: 0.7}
624+
- 2000-06-21: {amount: 5, efficiency: 0.7}
625+
- 2000-07-18: {amount: 3, efficiency: 0.7}
626626
StateEvents:
627627

628628
In the case that there is no harvest date provided and the crop runs till maturity, the end date from
@@ -645,7 +645,7 @@ of the simulation. Therefore, this definition will lead to an error::
645645
name: irrigation scheduling on volumetric soil moisture content
646646
comment: all irrigation amounts in cm
647647
events_table:
648-
- 0.25: {irrigation_amount: 2, efficiency: 0.7}
648+
- 0.25: {amount: 2, efficiency: 0.7}
649649

650650
Exchanging data between model components
651651
========================================

‎pcse/tests/test_agromanager.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,10 @@ class TestAgroManager4(TestAgroManagerSimpleTestTemplate):
103103
name: Timed irrigation events
104104
comment: All irrigation amounts in cm
105105
events_table:
106-
- 2000-01-01: {irrigation_amount: 2, efficiency: 0.7}
107-
- 2000-01-21: {irrigation_amount: 5, efficiency: 0.7}
108-
- 2000-03-18: {irrigation_amount: 3, efficiency: 0.7}
109-
- 2000-08-19: {irrigation_amount: 2, efficiency: 0.7}
106+
- 2000-01-01: {amount: 2, efficiency: 0.7}
107+
- 2000-01-21: {amount: 5, efficiency: 0.7}
108+
- 2000-03-18: {amount: 3, efficiency: 0.7}
109+
- 2000-08-19: {amount: 2, efficiency: 0.7}
110110
StateEvents:
111111
"""
112112
start_date = date(1999, 8, 1)
@@ -131,10 +131,10 @@ class TestAgroManager5(TestAgroManagerSimpleTestTemplate):
131131
name: Timed irrigation events
132132
comment: All irrigation amounts in cm
133133
events_table:
134-
- 2000-01-01: {irrigation_amount: 2, efficiency: 0.7}
135-
- 2000-01-21: {irrigation_amount: 5, efficiency: 0.7}
136-
- 2000-03-18: {irrigation_amount: 3, efficiency: 0.7}
137-
- 2000-03-19: {irrigation_amount: 2, efficiency: 0.7}
134+
- 2000-01-01: {amount: 2, efficiency: 0.7}
135+
- 2000-01-21: {amount: 5, efficiency: 0.7}
136+
- 2000-03-18: {amount: 3, efficiency: 0.7}
137+
- 2000-03-19: {amount: 2, efficiency: 0.7}
138138
- event_signal: apply_npk
139139
name: Timed N/P/K application table
140140
comment: All fertilizer amounts in kg/ha
@@ -169,7 +169,7 @@ class TestAgroManager5(TestAgroManagerSimpleTestTemplate):
169169
name: Soil moisture driven irrigation scheduling
170170
comment: all irrigation amounts in cm
171171
events_table:
172-
- 0.15: {irrigation_amount: 2, efficiency: 0.7}
172+
- 0.15: {amount: 2, efficiency: 0.7}
173173
- 2001-12-15:
174174
"""
175175

@@ -193,7 +193,7 @@ class TestAgroManager6(unittest.TestCase):
193193
name: Soil moisture driven irrigation scheduling
194194
comment: all irrigation amounts in cm
195195
events_table:
196-
- 0.15: {irrigation_amount: 2, efficiency: 0.7}
196+
- 0.15: {amount: 2, efficiency: 0.7}
197197
"""
198198

199199
def runTest(self):
@@ -219,10 +219,10 @@ class TestAgroManager7(unittest.TestCase):
219219
name: Timed irrigation events
220220
comment: All irrigation amounts in cm
221221
events_table:
222-
- 2000-01-01: {irrigation_amount: 2, efficiency: 0.7}
223-
- 2000-01-21: {irrigation_amount: 5, efficiency: 0.7}
224-
- 2001-03-18: {irrigation_amount: 3, efficiency: 0.7}
225-
- 2000-03-19: {irrigation_amount: 2, efficiency: 0.7}
222+
- 2000-01-01: {amount: 2, efficiency: 0.7}
223+
- 2000-01-21: {amount: 5, efficiency: 0.7}
224+
- 2001-03-18: {amount: 3, efficiency: 0.7}
225+
- 2000-03-19: {amount: 2, efficiency: 0.7}
226226
StateEvents:
227227
- 2001-01-01: null
228228
"""

‎pcse/tests/test_data/lintul3_springwheat.soil‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
WCAD = 0.10 # Water content at air dry
33
WCWP = 0.20 # Water content at wilting point
44
WCFC = 0.40 # Water content at field capacity
5+
WCWET = 0.45 # Water content at above which oxygen stress occurs
56
WCST = 0.50 # Water content at saturation
6-
DRATE = 30. # Maximum drainage rate of the soil (mm/day)
7+
DRATE = 30. # Maximum drainage rate of the soil (mm/day)

0 commit comments

Comments
 (0)