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

Update the code to count for groundwater (SSM v.0.3.2) #234

Merged

SarahAlidoost merged 90 commits into main from SSM_v.0.3.2

Jun 21, 2024

Contributor

MostafaGomaa93 commented Jun 12, 2024 •

edited by SarahAlidoost

Loading

Description

A description of the changes is in issue 233

Checklist

Add a reference to related issues.
@mentions of the person or team responsible for reviewing proposed changes.
This pull request has a descriptive title.
Code is written according to the guidelines.
The checks by MISS_HIT style checker and linter, below the pull request, are successful (green).
Documentation is available.
Add changes to the changelog file under section Unreleased.
Model runs successfully.
Ask a meinatainer to re-generate exe file if matlab codes are changed. About how to create an exe file, see exe readme.

MostafaGomaa93 added 4 commits

June 12, 2024 14:55


          add groundwater table

27208b0


          modify to count for groundwater

2a27ca7


          modify to count for groundwater

5bb5dee


          modify to count for groundwater

1df36f2

MostafaGomaa93 requested a review from SarahAlidoost

June 17, 2024 09:28

SarahAlidoost reviewed

View reviewed changes

src/+conductivity/calculateVaporVariables.m Outdated Show resolved Hide resolved

SarahAlidoost reviewed

View reviewed changes

src/+dryair/assembleCoefficientMatrices.m Outdated Show resolved Hide resolved

SarahAlidoost reviewed

View reviewed changes

src/+dryair/calculateDryAirParameters.m Outdated Show resolved Hide resolved

SarahAlidoost reviewed

View reviewed changes

src/+energy/assembleCoefficientMatrices.m Outdated Show resolved Hide resolved

SarahAlidoost reviewed

View reviewed changes

src/+energy/calculateEnergyParameters.m Outdated Show resolved Hide resolved

SarahAlidoost reviewed

View reviewed changes

src/+energy/calculateEnergyParameters.m Outdated Show resolved Hide resolved

SarahAlidoost reviewed

View reviewed changes

src/+energy/calculateEnergyParameters.m Outdated Show resolved Hide resolved

SarahAlidoost reviewed

View reviewed changes

src/+energy/calculateEnergyParameters.m Outdated Show resolved Hide resolved

SarahAlidoost reviewed

View reviewed changes

src/+energy/solveEnergyBalanceEquations.m Outdated Show resolved Hide resolved

SarahAlidoost reviewed

View reviewed changes

src/+energy/solveEnergyBalanceEquations.m Outdated Show resolved Hide resolved

SarahAlidoost reviewed

View reviewed changes

src/+energy/solveTridiagonalMatrixEquations.m Outdated Show resolved Hide resolved


          Update STEMMUS_SCOPE.m

d838eb5

Just removed the local path that i add during testing

SarahAlidoost reviewed

View reviewed changes

src/+groundwater/calculateGroundwaterRecharge.m Outdated Show resolved Hide resolved

SarahAlidoost reviewed

View reviewed changes

src/+groundwater/calculateGroundwaterRecharge.m Outdated Show resolved Hide resolved

SarahAlidoost reviewed

View reviewed changes

src/+groundwater/calculateGroundwaterRecharge.m Outdated Show resolved Hide resolved

SarahAlidoost reviewed

View reviewed changes

src/+groundwater/calculateGroundwaterRecharge.m Outdated Show resolved Hide resolved

SarahAlidoost reviewed

View reviewed changes

src/+groundwater/calculateGroundwaterRecharge.m Outdated Show resolved Hide resolved

SarahAlidoost reviewed

View reviewed changes

src/+groundwater/calculateGroundwaterRecharge.m Outdated Show resolved Hide resolved

SarahAlidoost reviewed

View reviewed changes

src/+groundwater/calculateGroundwaterRecharge.m Outdated Show resolved Hide resolved

SarahAlidoost reviewed

View reviewed changes

src/+groundwater/calculateGroundwaterRecharge.m Outdated Show resolved Hide resolved

SarahAlidoost reviewed

View reviewed changes

src/+groundwater/calculateGroundwaterRecharge.m Outdated Show resolved Hide resolved

SarahAlidoost reviewed

View reviewed changes

src/+groundwater/findPhreaticSurface.m Outdated Show resolved Hide resolved

SarahAlidoost reviewed

View reviewed changes

src/+groundwater/findPhreaticSurface.m Outdated Show resolved Hide resolved

SarahAlidoost reviewed

View reviewed changes

src/+groundwater/findPhreaticSurface.m Outdated Show resolved Hide resolved

SarahAlidoost reviewed

View reviewed changes

src/+groundwater/findPhreaticSurface.m Outdated Show resolved Hide resolved

MostafaGomaa93 and others added 13 commits

June 19, 2024 12:10


          Update calc_rsoil.m

971df7e


          Update calc_rsoil.m

ce4128a


          Update calc_rsoil.m

bc2d222


          Update src/+soilmoisture/calculateBoundaryConditions.m

309c3b4

Co-authored-by: SarahAlidoost <[email protected]>


          Update src/+soilmoisture/calculateBoundaryConditions.m

c4d4915

Co-authored-by: SarahAlidoost <[email protected]>


          Update src/+soilmoisture/calculateBoundaryConditions.m

07a54d1

Co-authored-by: SarahAlidoost <[email protected]>


          Update src/+soilmoisture/calculateBoundaryConditions.m

7bd1260

Co-authored-by: SarahAlidoost <[email protected]>


          Update calculateBoundaryConditions.m

9ba26bf


          Update src/STEMMUS_SCOPE.m

a582473

Co-authored-by: SarahAlidoost <[email protected]>


          modify to count for groundwater

1b3e337


          Update calculateGroundwaterRecharge.m

ac9180e


          Update readGroundwaterSettings.m

fe18914


          Update readGroundwaterSettings.m

SarahAlidoost reviewed

View reviewed changes

src/STEMMUS_SCOPE_exe.m Show resolved Hide resolved

SarahAlidoost reviewed

View reviewed changes

src/STEMMUS_SCOPE_exe.m Outdated Show resolved Hide resolved

SarahAlidoost reviewed

View reviewed changes

src/STEMMUS_SCOPE_exe.m Outdated Show resolved Hide resolved

SarahAlidoost reviewed

View reviewed changes

src/STEMMUS_SCOPE.m Outdated Show resolved Hide resolved

SarahAlidoost requested changes

View reviewed changes

Member

SarahAlidoost left a comment

@MostafaGomaa93 thanks for addressing the comment. Please see my suggestions regarding gwfluxes and R_Hort and R_Dunn. If something is not clear, let me know.

MostafaGomaa93 and others added 10 commits

June 21, 2024 12:04


          Update src/STEMMUS_SCOPE_exe.m

2ce2a5e

Co-authored-by: SarahAlidoost <[email protected]>


          Update src/STEMMUS_SCOPE.m

b2971c1

Co-authored-by: SarahAlidoost <[email protected]>


          Update STEMMUS_SCOPE.m

fbaec06


          Update readGroundwaterSettings.m

dcdb1bb

in case the groundwater level <= 0 cm (groundwater level >= top level of soil), there is no soil profile and the model will crash. To avoid that, assign a minimum groundwater level = of 1 cm


          Update STEMMUS_SCOPE.m

fc9b954

If groundwater depth < 1 cm, soil is fully saturated and no groundwater recharge


          Update readGroundwaterSettings.m

9d2d964


          Update STEMMUS_SCOPE.m

0bee5c4


          add changes to changelog file

cd83ce6


          add initial values for bmi variables

accde11


          regenerate exe file

698f5e4

SarahAlidoost approved these changes

View reviewed changes

Member

SarahAlidoost left a comment

@MostafaGomaa93 thanks for the fixes. I added a minor fix, the changelog and exe file.

SarahAlidoost merged commit 2f9f468 into main

1 check passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet