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

Adjust to let total soil thickness and max root depth be varied and not fixed #238

Merged
merged 7 commits into from
Jul 5, 2024
Merged

Adjust to let total soil thickness and max root depth be varied and not fixed #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
64fa7b8
adjust to let total soil thickness and max root depth not fixed in th…
MostafaGomaa93 Jul 3, 2024
3fa65aa
adjust to let total soil thickness and max root depth not fixed in th…
MostafaGomaa93 Jul 3, 2024
f96ca1c
adjust to let total soil thickness and max root depth not fixed in th…
MostafaGomaa93 Jul 3, 2024
2b0fae5
Update calculateBoundaryConditions.m
MostafaGomaa93 Jul 5, 2024
4f02845
Update CHANGELOG.md
MostafaGomaa93 Jul 5, 2024
4a7150a
Update CHANGELOG.md
MostafaGomaa93 Jul 5, 2024
612634c
re genertae exe file
SarahAlidoost Jul 5, 2024
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
5 changes: 4 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@
- The bug in the QVT calculations discussed in
[#230](https://github.com/EcoExtreML/STEMMUS_SCOPE/issues/230) and fixed in
[#234](https://github.com/EcoExtreML/STEMMUS_SCOPE/pull/234)
- The bug in activating the dry air calculations discussed in
- The bug in activating the dry air calculations discussed in
[#227](https://github.com/EcoExtreML/STEMMUS_SCOPE/issues/230) and fixed in
[#234](https://github.com/EcoExtreML/STEMMUS_SCOPE/pull/227)
- Defining the indices of the first four layers discussed in
[#237](https://github.com/EcoExtreML/STEMMUS_SCOPE/issues/237) and fixed in
[#238](https://github.com/EcoExtreML/STEMMUS_SCOPE/pull/238)


<a name="1.5.0"></a>
Expand Down
Binary file modified run_model_on_snellius/exe/STEMMUS_SCOPE
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion src/+soilmoisture/calculateBoundaryConditions.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
% Check applied infiltration doesn't exceed infiltration capacity
topThick = 5; % first 5 cm of the soil
satCap = SoilProperties.theta_s0 * topThick; % saturation capacity represented by saturated water content of the top 5 cm of the soil
actTheta = ModelSettings.DeltZ(51:54) * SoilVariables.Theta_UU(51:54, 1); % actual moisture of the top 5 cm of the soil
actTheta = ModelSettings.DeltZ(end - 3:end) * SoilVariables.Theta_UU(end - 4:end - 1, 1); % actual moisture of the top 5 cm of the soil
infCap = (satCap - actTheta) / TimeProperties.DELT; % (cm/sec)
infCap_min = min(Ks0, infCap);

Expand Down
2 changes: 1 addition & 1 deletion src/calc_rsoil.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
% load Constants
Constants = io.define_constants();

SMC = SoilVariables.Theta_LL(1:54, 2);
SMC = SoilVariables.Theta_LL(1:end - 1, 2);
Se = (SMC - VanGenuchten.Theta_r') ./ (VanGenuchten.Theta_s' - VanGenuchten.Theta_r');
Ksoil = SoilVariables.Ks' .* Se.^Constants.l .* (1 - (1 - Se.^(1 ./ VanGenuchten.m')).^(VanGenuchten.m')).^2;

Expand Down
2 changes: 1 addition & 1 deletion src/calc_sfactor.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
function [sfactor] = calc_sfactor(Rl, Theta_s, Theta_r, Theta_LL, bbx, Ta, Theta_f)
SMC = Theta_LL(1:54, 1); % soil surface moisture
SMC = Theta_LL(1:end - 1, 1); % soil surface moisture
wfrac = 1 ./ (1 + exp((-100 .* Theta_s') .* (SMC - (Theta_f' + Theta_r') / 2))) .* bbx; % The soil water stress factor in each layer
RL = Rl .* bbx;
RLfrac = RL ./ (sum(sum(RL))); % root fraction in each layer
Expand Down
Loading