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

Rm unused variables and equations #239

Merged
merged 63 commits into from
Jul 22, 2024
Merged

Rm unused variables and equations #239

merged 63 commits into from
Jul 22, 2024

Commits on Jul 4, 2024

  1. remove unused var botmSoilLevel

    @SarahAlidoost
    SarahAlidoost committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    b4d7944 View commit details
    Browse the repository at this point in the history

  2. comment unused definitions of SS, SY and indxAqLay

    @SarahAlidoost
    SarahAlidoost committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    93c542e View commit details
    Browse the repository at this point in the history

  3. comment unused definition of SY, SS, S and sy

    @SarahAlidoost
    SarahAlidoost committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    58ef5c9 View commit details
    Browse the repository at this point in the history

  4. comment unused modflow variables

    @SarahAlidoost
    SarahAlidoost committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    8448d3e View commit details
    Browse the repository at this point in the history

  5. re generate exe file

    @SarahAlidoost
    SarahAlidoost committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    7d65b27 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. move soil layer thickness calculations to a sparate script

    @SarahAlidoost
    SarahAlidoost committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    5c6a88f View commit details
    Browse the repository at this point in the history

  2. add a function to calculate soil layer thickness

    @SarahAlidoost
    SarahAlidoost committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    7c2593c View commit details
    Browse the repository at this point in the history

  3. move calculations of indxBotmLayer to a function

    @SarahAlidoost
    SarahAlidoost committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    3c7d3a2 View commit details
    Browse the repository at this point in the history

  4. move calculation of indxAqLay to a separate function, polish readGrou… 

    …ndwaterSettings
    @SarahAlidoost
    SarahAlidoost committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    4b7b59a View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. polish codes in groundwater

    @SarahAlidoost
    SarahAlidoost committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    7e22e80 View commit details
    Browse the repository at this point in the history

  2. rm aqLayers and keep topLevel in readGroundwaterSettings

    @SarahAlidoost
    SarahAlidoost committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    e29c9db View commit details
    Browse the repository at this point in the history

  3. fix var names in calculateIndexBottomLayer

    @SarahAlidoost
    SarahAlidoost committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    b483139 View commit details
    Browse the repository at this point in the history

  4. refactor inputs of findPhreaticSurface

    @SarahAlidoost
    SarahAlidoost committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    02f7a19 View commit details
    Browse the repository at this point in the history

  5. move calculation of gw_Dep to a new function

    @SarahAlidoost
    SarahAlidoost committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    beb15f0 View commit details
    Browse the repository at this point in the history

  6. move updating Dunnian runoff to a function

    @SarahAlidoost
    SarahAlidoost committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    de99a9f View commit details
    Browse the repository at this point in the history

  7. add init and update codes for groundwater coupling

    @SarahAlidoost
    SarahAlidoost committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    58e04b0 View commit details
    Browse the repository at this point in the history

  8. fix minor bugs

    @SarahAlidoost
    SarahAlidoost committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    5ae8fbb View commit details
    Browse the repository at this point in the history

  9. remove duplicated codes

    @SarahAlidoost
    SarahAlidoost committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    be505be View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. add soilThick as an input and add a line to define the ModelSettings

    @MostafaGomaa93
    MostafaGomaa93 authored Jul 10, 2024
    Configuration menu
    Copy the full SHA
    eb790ed View commit details
    Browse the repository at this point in the history

  2. Update definitions

    @MostafaGomaa93
    MostafaGomaa93 authored Jul 10, 2024
    Configuration menu
    Copy the full SHA
    d9ad0d2 View commit details
    Browse the repository at this point in the history

  3. Update calculateIndexAquifer.m

    @MostafaGomaa93
    MostafaGomaa93 authored Jul 10, 2024
    Configuration menu
    Copy the full SHA
    1ed46cf View commit details
    Browse the repository at this point in the history

  4. Change function name and update Precip_msr

    @MostafaGomaa93
    MostafaGomaa93 authored Jul 10, 2024
    Configuration menu
    Copy the full SHA
    cef5858 View commit details
    Browse the repository at this point in the history

  5. Add an if condition to calculate Dunnian runoff only in case of no gr… 

    …oundwater coupling

The calculations of Dunnian runoff in this function are only for the no-groundwatercoupling case, so I added the if condition. Without the if condition, the Precip_msr will be updated twice (one here in this function and later in the updateDunnianRunoff)
    @MostafaGomaa93
    MostafaGomaa93 authored Jul 10, 2024
    Configuration menu
    Copy the full SHA
    2afb4bf View commit details
    Browse the repository at this point in the history

  6. Add indexAqLay and comment it, update Dunnian function

    @MostafaGomaa93
    MostafaGomaa93 authored Jul 10, 2024
    Configuration menu
    Copy the full SHA
    001fc2d View commit details
    Browse the repository at this point in the history

  7. Update calculateIndexAquifer.m

    @MostafaGomaa93
    MostafaGomaa93 authored Jul 10, 2024
    Configuration menu
    Copy the full SHA
    da0514b View commit details
    Browse the repository at this point in the history

  8. minor fixes in case SY and SS calculations are activated

    @MostafaGomaa93
    MostafaGomaa93 authored Jul 10, 2024
    Configuration menu
    Copy the full SHA
    e3fee7a View commit details
    Browse the repository at this point in the history

  9. Comment all non-used lines

    @MostafaGomaa93
    MostafaGomaa93 authored Jul 10, 2024
    Configuration menu
    Copy the full SHA
    1918e77 View commit details
    Browse the repository at this point in the history

  10. Update GroundwaterSettings.tempBotm

    @MostafaGomaa93
    MostafaGomaa93 authored Jul 10, 2024
    Configuration menu
    Copy the full SHA
    34e543f View commit details
    Browse the repository at this point in the history

  11. Modify for the case of no groundwater temp data available

    @MostafaGomaa93
    MostafaGomaa93 authored Jul 10, 2024
    Configuration menu
    Copy the full SHA
    a5260b6 View commit details
    Browse the repository at this point in the history

  12. Update calculateBoundaryConditions.m

    @MostafaGomaa93
    MostafaGomaa93 authored Jul 10, 2024
    Configuration menu
    Copy the full SHA
    8c5933e View commit details
    Browse the repository at this point in the history

  13. Modify for the case of no groundwater temp data available

    @MostafaGomaa93
    MostafaGomaa93 authored Jul 10, 2024
    Configuration menu
    Copy the full SHA
    8f9699e View commit details
    Browse the repository at this point in the history

  14. Update and rename readGroundwaterSettings.m to initializeGroundwaterS… 

    …ettings.m
    @MostafaGomaa93
    MostafaGomaa93 authored Jul 10, 2024
    Configuration menu
    Copy the full SHA
    95f6394 View commit details
    Browse the repository at this point in the history

  15. Rename updateRunoff.m to updateDunnianRunoff.m

    @MostafaGomaa93
    MostafaGomaa93 authored Jul 10, 2024
    Configuration menu
    Copy the full SHA
    90baaab View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. change isempty to isnan (line 19) for BMI

    @MostafaGomaa93
    MostafaGomaa93 authored Jul 11, 2024
    Configuration menu
    Copy the full SHA
    d84dc4b View commit details
    Browse the repository at this point in the history

  2. change isempty to isnan (line 43) for BMI

    @MostafaGomaa93
    MostafaGomaa93 authored Jul 11, 2024
    Configuration menu
    Copy the full SHA
    ddf61b6 View commit details
    Browse the repository at this point in the history

  3. refactor updateDunnianRunoff function

    @SarahAlidoost
    SarahAlidoost committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    35b52c0 View commit details
    Browse the repository at this point in the history

  4. set tempBotm to NaN as suggested 

    Co-authored-by: Bart Schilperoort <[email protected]>
    @SarahAlidoost @BSchilperoort
    SarahAlidoost and BSchilperoort authored Jul 11, 2024
    Configuration menu
    Copy the full SHA
    0732002 View commit details
    Browse the repository at this point in the history

  5. refactor if else block in calculateBoundaryConditions and solveEnergy… 

    …BalanceEquations
    @SarahAlidoost
    SarahAlidoost committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    86a411e View commit details
    Browse the repository at this point in the history

  6. remove unused function in STEMMUS_SCOPE

    @SarahAlidoost
    SarahAlidoost committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    f333f9e View commit details
    Browse the repository at this point in the history

  7. replace exe with one in main branch

    @SarahAlidoost
    SarahAlidoost committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    a8c4d4a View commit details
    Browse the repository at this point in the history

  8. Merge branch 'main' into rm_unused_vars

    @SarahAlidoost
    SarahAlidoost committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    baf5c72 View commit details
    Browse the repository at this point in the history

  9. add changes to changelog

    @SarahAlidoost
    SarahAlidoost committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    63bc7f9 View commit details
    Browse the repository at this point in the history

  10. fix mh_style errors

    @SarahAlidoost
    SarahAlidoost committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    5c1f45f View commit details
    Browse the repository at this point in the history

  11. re-generate exe file

    @SarahAlidoost
    SarahAlidoost committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    c218d33 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2024

  1. Fix incorrect function name

    @BSchilperoort
    BSchilperoort committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    e5d0292 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2024

  1. regenerate exe file

    @SarahAlidoost
    SarahAlidoost committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    19a7f85 View commit details
    Browse the repository at this point in the history

  2. Remove issue from changelog 

    Co-authored-by: Bart Schilperoort <[email protected]>
    @SarahAlidoost @BSchilperoort
    SarahAlidoost and BSchilperoort authored Jul 15, 2024
    Configuration menu
    Copy the full SHA
    67a2f07 View commit details
    Browse the repository at this point in the history

  3. Remove file creation/writing specifically for groundwater coupling

    @BSchilperoort
    BSchilperoort committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    2ff8788 View commit details
    Browse the repository at this point in the history

  4. remove conversion of waterDepth 

    Co-authored-by: Bart Schilperoort <[email protected]>
    @SarahAlidoost @BSchilperoort
    SarahAlidoost and BSchilperoort authored Jul 15, 2024
    Configuration menu
    Copy the full SHA
    b2e3df9 View commit details
    Browse the repository at this point in the history

  5. regenerate exe file

    @SarahAlidoost
    SarahAlidoost committed Jul 15, 2024
    Configuration menu
    Copy the full SHA
    488f1fe View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2024

  1. correct soil temp above groundwater table

    @MostafaGomaa93
    MostafaGomaa93 authored Jul 17, 2024
    Configuration menu
    Copy the full SHA
    297b6ae View commit details
    Browse the repository at this point in the history

  2. Remove the repeated if statement (same statement in lines 27-30 of so… 

    …lveTridiagonalMatrixEquations)
    @MostafaGomaa93
    MostafaGomaa93 authored Jul 17, 2024
    Configuration menu
    Copy the full SHA
    653ca81 View commit details
    Browse the repository at this point in the history

  3. remove wrong comment

    @MostafaGomaa93
    MostafaGomaa93 authored Jul 17, 2024
    Configuration menu
    Copy the full SHA
    cb50e7b View commit details
    Browse the repository at this point in the history

  4. a change to minimize the running time (doesn't affect simulation)

    @MostafaGomaa93
    MostafaGomaa93 authored Jul 17, 2024
    Configuration menu
    Copy the full SHA
    c107707 View commit details
    Browse the repository at this point in the history

  5. a change to minimize the running time (doesn't affect simulation)

    @MostafaGomaa93
    MostafaGomaa93 authored Jul 17, 2024
    Configuration menu
    Copy the full SHA
    92e45a8 View commit details
    Browse the repository at this point in the history

  6. add a display message to track the running of each time step

    @MostafaGomaa93
    MostafaGomaa93 authored Jul 17, 2024
    Configuration menu
    Copy the full SHA
    a0461c7 View commit details
    Browse the repository at this point in the history

  7. Update STEMMUS_SCOPE.m

    @MostafaGomaa93
    MostafaGomaa93 authored Jul 17, 2024
    Configuration menu
    Copy the full SHA
    f640ef0 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2024

  1. remove unused arguments GroundwaterSettings, gwfluxes from output_dat… 

    …a_binary and create_output_files_binary
    @SarahAlidoost
    SarahAlidoost committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    79ad7ae View commit details
    Browse the repository at this point in the history

  2. correct index in for loop

    @MostafaGomaa93
    MostafaGomaa93 authored Jul 19, 2024
    Configuration menu
    Copy the full SHA
    74efd97 View commit details
    Browse the repository at this point in the history

  3. correct index in for loop

    @MostafaGomaa93
    MostafaGomaa93 authored Jul 19, 2024
    Configuration menu
    Copy the full SHA
    082cee7 View commit details
    Browse the repository at this point in the history

  4. Remove disp line

    @MostafaGomaa93
    MostafaGomaa93 authored Jul 19, 2024
    Configuration menu
    Copy the full SHA
    bb967c5 View commit details
    Browse the repository at this point in the history

  5. correct wrong symbol

    @MostafaGomaa93
    MostafaGomaa93 authored Jul 19, 2024
    Configuration menu
    Copy the full SHA
    f13d455 View commit details
    Browse the repository at this point in the history

  6. regenerate exe file

    @SarahAlidoost
    SarahAlidoost committed Jul 19, 2024
    Configuration menu
    Copy the full SHA
    b2ca883 View commit details
    Browse the repository at this point in the history