Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
85 changes: 85 additions & 0 deletions docs/source/refs.bib
Original file line number Diff line number Diff line change
@@ -1,4 +1,89 @@

@article{hodnett_marked_2002,
title = {Marked differences between van Genuchten soil water-retention parameters for temperate and tropical soils: a new water-retention pedo-transfer functions developed for tropical soils},
volume = {108},
issn = {0016-7061},
url = {https://www.sciencedirect.com/science/article/pii/S0016706102001052},
doi = {https://doi.org/10.1016/S0016-7061(02)00105-2},
pages = {155--180},
number = {3},
journal = {Geoderma},
author = {Hodnett, M. G. and Tomasella, J.},
year = {2002},
keywords = {Andosols, Ferralsols, Pedo-transfer function, Tropical soils, van Genuchten parameters, Water-retention curves},
}

@article{su_aerodynamic_2021,
title = {Aerodynamic resistance and Bowen ratio explain the biophysical effects of forest cover on understory air and soil temperatures at the global scale},
volume = {308-309},
issn = {0168-1923},
url = {https://www.sciencedirect.com/science/article/pii/S0168192321003014},
doi = {https://doi.org/10.1016/j.agrformet.2021.108615},
pages = {108615},
journal = {Agricultural and Forest Meteorology},
author = {Su, Yongxian and Zhang, Chaoqun and Chen, Xiuzhi and Liu, Liyang and Ciais, Philippe and Peng, Jian and Wu, Shengbiao and Wu, Jianping and Shang, Jiali and Wang, Yingping and Yuan, Wenping and Yang, Yuanzhi and Wu, Zhifeng and Lafortezza, Raffaele},
year = {2021}
}

@article{saldarriaga_solar_1991,
title={Solar energy conversion efficiencies during succession of a tropical rain forest in Amazonia},
volume={7},
DOI={10.1017/S0266467400005393},
number={2},
journal={Journal of Tropical Ecology},
author={Saldarriaga, Juan Guillermo and Luxmoore, Robert John},
year={1991},
pages={233-242}
}

@article{tao_simplified_2021,
author = {Tao, Gaoliang and Wu, Zhijia and Li, Wentao and Li, Yi and Dong, Heming},
title = {Simplified Relation Model of Soil Saturation Permeability Coefficient and Air-Entry Value and Its Application},
journal = {Fractal and Fractional},
volume = {5},
year = {2021},
number = {4},
article-number = {180},
url = {https://www.mdpi.com/2504-3110/5/4/180},
issn = {2504-3110},
doi = {10.3390/fractalfract5040180}
}


@misc{brink_modelling_2009,
month = {October},
year = {2009},
title = {Modelling the discharge of the Cidanau River in West Java with the HBV model},
author = {F. van den {Brink}},
url = {http://essay.utwente.nl/68862/}
}

@article{reichardt_hydraulic_1993,
title = {Hydraulic variability in space and time in a dark red latosol of the tropics},
volume = {60},
issn = {0016-7061},
url = {https://www.sciencedirect.com/science/article/pii/001670619390024F},
doi = {https://doi.org/10.1016/0016-7061(93)90024-F},
pages = {159--168},
number = {1},
journal = {Geoderma},
author = {Reichardt, Klaus and Bacchi, Osny O. S. and Villagra, Maria de las Mercedes and Turatti, Ariovaldo L. and Pedrosa, Zildene O.},
year = {1993}
}

@article{gupta_global_2022,
title = {Global Soil Hydraulic Properties dataset based on legacy site observations and robust parameterization},
volume = {9},
issn = {2052-4463},
url = {https://doi.org/10.1038/s41597-022-01481-5},
doi = {10.1038/s41597-022-01481-5},
pages = {444},
number = {1},
journal = {Scientific Data},
author = {Gupta, Surya and Papritz, Andreas and Lehmann, Peter and Hengl, Tomislav and Bonetti, Sara and Or, Dani},
year = {2022}
}

@article{geary_guide_2020,
author = {Geary, William and Bode, Michael and Doherty, Tim and Fulton, Elizabeth and Nimmo, Dale and Tulloch, Ayesha and Tulloch, Vivitskaia and Ritchie, Euan},
year = {2020},
Expand Down
2 changes: 1 addition & 1 deletion tests/models/hydrology/test_above_ground.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ def test_calculate_soil_evaporation(dens_air, latvap):
pyrealm_const=PyrealmConst,
)

exp_evap = np.array([2.466861, 0.612504, 0.110356])
exp_evap = np.array([2.18791, 0.521941, 0.090352])
np.testing.assert_allclose(result["soil_evaporation"], exp_evap, rtol=0.01)
exp_ra = np.array([5.0, 10.0, 50.0])
np.testing.assert_allclose(
Expand Down
16 changes: 9 additions & 7 deletions tests/models/hydrology/test_below_ground.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def test_calculate_matric_potential():
)

constants = HydroConsts()
expected_potentials = np.repeat(-17.320508, 3)
expected_potentials = np.repeat(-68.197326, 3)
actual_potentials = calculate_matric_potential(
effective_saturation=np.repeat(0.5, 3),
air_entry_potential_inverse=constants.air_entry_potential_inverse,
Expand Down Expand Up @@ -123,9 +123,11 @@ def test_update_groundwater_storage(dummy_climate_data):
reservoir_const_lower_groundwater=HydroConsts.reservoir_const_lower_groundwater,
)

exp_groundwater = np.array([[453, 457, 459, 459], [450.0, 450.0, 450.0, 450]])
exp_upper_flow = np.array([22.65, 22.85, 22.95, 22.95])
exp_lower_flow = np.array([22.5, 22.5, 22.5, 22.5])
np.testing.assert_allclose(result["groundwater_storage"], exp_groundwater)
np.testing.assert_allclose(result["subsurface_flow"], exp_upper_flow)
np.testing.assert_allclose(result["baseflow"], exp_lower_flow)
exp_groundwat = np.array(
[[451.3, 455.3, 457.3, 457.3], [451.7, 451.7, 451.7, 451.7]]
)
exp_upper_flow = np.array([22.565, 22.765, 22.865, 22.865])
exp_lower_flow = np.array([22.585, 22.585, 22.585, 22.585])
np.testing.assert_allclose(result["groundwater_storage"], exp_groundwat, rtol=1e-05)
np.testing.assert_allclose(result["subsurface_flow"], exp_upper_flow, rtol=1e-05)
np.testing.assert_allclose(result["baseflow"], exp_lower_flow, rtol=1e-5)
16 changes: 8 additions & 8 deletions tests/models/hydrology/test_hydrology_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -303,12 +303,12 @@ def test_setup(
# Test 2d variables
expected_2d = {
"soil_moisture": [
[246.698563, 246.698536, 246.698563, 246.698563],
[218.996509, 218.996509, 218.996509, 218.996509],
[247.25352, 247.25352, 247.25352, 247.25352],
[218.999041, 218.999041, 218.999041, 218.999041],
],
"matric_potential": [
[-76.910901, -76.910929, -76.910901, -76.910901],
[-105.707405, -105.707405, -105.707405, -105.707405],
[-66.550207, -66.550207, -66.550207, -66.550207],
[-217.596714, -217.596714, -217.596714, -217.596714],
],
}

Expand All @@ -325,11 +325,11 @@ def test_setup(

# Test one dimensional variables
expected_1d = {
"vertical_flow": [0.012935, 0.012935, 0.012935, 0.012935],
"vertical_flow": [6.916e-05, 6.916e-05, 6.916e-05, 6.916e-05],
"total_river_discharge": [0, 0, 69035, 22660],
"surface_runoff": [106.654852, 106.654852, 106.654852, 106.654852],
"surface_runoff_accumulated": [0, 0, 9150, 2730],
"soil_evaporation": [7.172842, 7.172842, 7.172842, 7.172842],
"surface_runoff": [122.432417, 122.432417, 122.432417, 122.432417],
"surface_runoff_accumulated": [0, 0, 10530, 3300],
"soil_evaporation": [5.870856, 5.870856, 5.870856, 5.870856],
}

for var_name, expected_vals in expected_1d.items():
Expand Down
Loading