Skip to content
This repository has been archived by the owner on Mar 1, 2023. It is now read-only.

add in surface flow component; overland flow model #2174

Merged
merged 1 commit into from
Apr 21, 2021
Merged

add in surface flow component; overland flow model #2174

merged 1 commit into from
Apr 21, 2021

Conversation

kmdeck
Copy link
Member

@kmdeck kmdeck commented Apr 8, 2021

Description

add in a surface flow component to the Land Model. Currently, it supports a NoSurfaceFlow model, which is the default, and also overland flow by solving the shallow water equations under a number of assumptions (St Venant Equations).

  • Code follows the style guidelines OR N/A.
  • Unit tests are included OR N/A.
  • Code is exercised in an integration test OR N/A.
  • Documentation has been added/updated OR N/A.

src/Land/Model/SurfaceFlow.jl Outdated Show resolved Hide resolved
src/Land/Model/SurfaceFlow.jl Outdated Show resolved Hide resolved
src/Land/Model/SurfaceFlow.jl Outdated Show resolved Hide resolved
src/Land/Model/source.jl Outdated Show resolved Hide resolved
.gitignore Outdated Show resolved Hide resolved
@jakebolewski
Copy link
Contributor

bors try

bors bot added a commit that referenced this pull request Apr 9, 2021
@bors
Copy link
Contributor

bors bot commented Apr 9, 2021

try

Build failed:

@jakebolewski
Copy link
Contributor

bors try

bors bot added a commit that referenced this pull request Apr 12, 2021
@bors
Copy link
Contributor

bors bot commented Apr 12, 2021

try

Build failed:

@kmdeck kmdeck changed the title Land/river add in surface flow component; overland flow model Apr 15, 2021
@kmdeck
Copy link
Member Author

kmdeck commented Apr 15, 2021

@jakebolewski I think this looks pretty good except for the difference between the CSV file and the output, and I still am unsure if we should change the variable name to height instead of area and remove the width factor. It doesnt really make sense for this, but I think we would need that if we wanted to model rivers using this type of model. I guess the idea was that a possible river model (using clima solvers) would define a width function, but overland flow would set width = 1, so it doesnt affect the balance law.

@kmdeck kmdeck marked this pull request as ready for review April 20, 2021 17:17
@kmdeck kmdeck force-pushed the land/river branch 2 times, most recently from b3c4884 to fc08411 Compare April 20, 2021 17:48
@kmdeck
Copy link
Member Author

kmdeck commented Apr 20, 2021

bors try

bors bot added a commit that referenced this pull request Apr 20, 2021
@bors
Copy link
Contributor

bors bot commented Apr 20, 2021

try

Build failed:

@kmdeck
Copy link
Member Author

kmdeck commented Apr 20, 2021

bors try

bors bot added a commit that referenced this pull request Apr 20, 2021
@bors
Copy link
Contributor

bors bot commented Apr 20, 2021

@kmdeck
Copy link
Member Author

kmdeck commented Apr 20, 2021

bors r+

@bors
Copy link
Contributor

bors bot commented Apr 20, 2021

👎 Rejected by too few approved reviews

@jakebolewski
Copy link
Contributor

bors r+

@bors
Copy link
Contributor

bors bot commented Apr 20, 2021

Merge conflict.

wip model1

wip model1

wip bc

wip driver

wip river bc

wip river bc

added analytic function to test

both no river and analytic case 1 run

wip cleanup

wip maxwell v catchment

still wip maxwell tilted V

 added in wavespeed method for Rusanov flux

changed names, documentation, added tilted V artifact, kept old River stuff

soil tests seem to pass

overland seems to work

deleted old River.jl and test_no_river.jl files from remote

fixed unit test

removed old file, fixed doc

formatter doesnt do the right thing

move long running tilted v into its own test, run on cluster

fix boundry condition test to match new interface

gpu v catchment test fixes

format

minor doc stuff

more minor doc stuff

fixed precompute method

changed variable name from area to height, removed width

formatting

fixed doc to reflect new name
@kmdeck
Copy link
Member Author

kmdeck commented Apr 21, 2021

bors r+

@bors
Copy link
Contributor

bors bot commented Apr 21, 2021

@bors bors bot merged commit 1a5b7f4 into master Apr 21, 2021
@bors bors bot deleted the land/river branch April 21, 2021 05:54
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants