Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
56494e2
implementation of simplified lookup table completed
erikkopp Mar 24, 2026
3b5bd8a
perirhizal waterimplementation works
erikkopp Mar 28, 2026
8a8081e
verbose debugging removed
erikkopp Mar 29, 2026
15ed006
added tutorial
erikkopp Mar 29, 2026
bdf709f
upload after meeting
erikkopp Apr 17, 2026
352cee8
fix steady state solute uptake
erikkopp Apr 17, 2026
8381e65
solute implementation works
erikkopp Apr 25, 2026
7e81981
fixed tutorial reading parameter file
erikkopp Apr 25, 2026
6fc69cd
store changes before merge
erikkopp May 2, 2026
721a262
merge from master
erikkopp May 2, 2026
7a67988
debugging 1p2C doesnt work
erikkopp May 12, 2026
64b6d02
dumux simulation for perirhizal test runs
erikkopp May 12, 2026
de83ff0
uptake of solutes and water
erikkopp May 13, 2026
e035069
water perirhizal model test dumux
erikkopp May 18, 2026
e0c46e4
update perirhizal test file
erikkopp May 19, 2026
85440c1
safe changes 260527
erikkopp May 27, 2026
809785e
benchmark waterstress works
erikkopp May 27, 2026
b3ee761
steady rate solute works
erikkopp Jun 2, 2026
5e2662f
subfunction general steady rate
erikkopp Jun 12, 2026
fce5b88
general sr solute uptake implementation
erikkopp Jun 13, 2026
2502ca8
ploting ss, sr and constant
erikkopp Jun 14, 2026
28a6611
fix sign error plot sr_nf
erikkopp Jun 14, 2026
1c2014b
plotting the generalised soluteuptake
erikkopp Jun 15, 2026
94d7966
ss and sr produce realistic distributions
erikkopp Jun 19, 2026
5ccffe8
ss and sr seem ready
erikkopp Jun 19, 2026
0e515e5
general soluteflow produces reasonable results
erikkopp Jun 19, 2026
a644fb3
satisfactory test for general ss solute uptake
erikkopp Jun 20, 2026
cf04e29
moving the test file to the location of test files
erikkopp Jun 24, 2026
d629b7b
rewrote the test skript for soluteflow
erikkopp Jun 24, 2026
cba9f7d
correct Vmax value for the solute uptake
erikkopp Jul 4, 2026
f797a86
simplified steady rate implementaiton
erikkopp Jul 5, 2026
8f3584c
plot of inflow ff approximation
erikkopp Jul 6, 2026
bab7942
debugging: mean works
erikkopp Jul 7, 2026
f994aa8
steady rate water with inflow
erikkopp Jul 8, 2026
dc54f59
steady state solute flow
erikkopp Jul 8, 2026
d68c5e3
multiple outer BC steady rate solute
erikkopp Jul 8, 2026
3715164
implemented test script for Perirhizal solute flow
erikkopp Jul 9, 2026
2806fe0
plotting perirhizal solute implementation
erikkopp Jul 9, 2026
42ab4eb
updated means
erikkopp Jul 12, 2026
1ebed69
prep for merge
erikkopp Jul 14, 2026
626818f
prep for merge
erikkopp Jul 14, 2026
e730e8c
Merge branch 'master' into perirhizal_watersolutes
erikkopp Jul 14, 2026
24d55fc
fix insertion in PlantHydraulicModel
erikkopp Jul 14, 2026
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,4 @@ tutorial/jupyter/.ipynb_checkpoints/
# images
*.png
.vscode/settings.json

870 changes: 870 additions & 0 deletions experimental/analytical_model_perirhizal/test_perirhizal.py

Large diffs are not rendered by default.

1,027 changes: 983 additions & 44 deletions src/functional/Perirhizal.py

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions src/functional/van_genuchten.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,10 @@ def matric_potential_mfp(mfp, sp):
call create_mfp_lookup first, once for each soil parameter @param sp"""


def create_mfp_lookup(sp, wilting_point = -16000, n = 16001):
def create_mfp_lookup(sp, wilting_point = -16000, n = 16001, verbose = True):
""" initializes the look up tables for soil parameter to use fast_mfp, and fast_imfp """
print("initializing look up tables")
if verbose:
print("initializing mfp look up tables")
global fast_mfp
global fast_imfp

Expand All @@ -176,7 +177,8 @@ def create_mfp_lookup(sp, wilting_point = -16000, n = 16001):
imfp[i] = h_[i]
fast_imfp[sp] = interpolate.interp1d(mfp, imfp, bounds_error = False, fill_value = (imfp[0], imfp[-1])) #

print("done")
if verbose:
print("done")

# fast_specific_moisture_storage = {}
# fast_water_content = {}
Expand Down
2 changes: 1 addition & 1 deletion tutorial/chapter7_coupled/example7_3_lookup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
filename = "hydrus_loam"
sp = vg.Parameters(hydrus_loam) # |\label{l73l:soil_end}|
vg.create_mfp_lookup(sp) # |\label{l73l:mfp}|
peri.create_lookup_mpi("results/" + filename, sp) # |\label{l73l:lookup}|
peri.create_lookup("results/" + filename, sp) # |\label{l73l:lookup}|
2 changes: 2 additions & 0 deletions tutorial/chapter7_coupled/results/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
*.vtk
*.vtu
*.npy
*.npz