Skip to content

fix missing last flow/substance record #2

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

Open
fenclmar wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix missing last flow/substance record #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions SPG/R/functions.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,10 @@ pump.trans <- function(flow, V.max, V.min=0, pump.rate) {
temp.res.sim <- attr(flow, "temp.res.sim")

## V = Volume of water in 'tank'
V <- rep(0, nrow(flow))
V <- rep(0, nrow(flow) + 1)

## S = mass of substance in 'tank'
S <- rep(0, nrow(flow))
S <- rep(0, nrow(flow) + 1)

## water flow out of pump
Q.out <- rep(0, nrow(flow))
Expand All @@ -215,7 +216,7 @@ pump.trans <- function(flow, V.max, V.min=0, pump.rate) {
## state of pump
state <- 'off'
## mass balances
for(t in 2:nrow(flow)) {
for(t in 2 : (nrow(flow) + 1)) {
## switch pump 'on' if volume is larger than V.max
if(V[t-1] > V.max) {
state <- 'on'
Expand Down Expand Up @@ -251,7 +252,7 @@ pump.trans <- function(flow, V.max, V.min=0, pump.rate) {
dimnames(flow.out) <- dimnames(flow)
class(flow.out) <- "flow"
attr(flow.out, "temp.res.sim") <- temp.res.sim # store resolution as attribute

attr(flow.out, "V.sump.left") <- V[t] # store volume left in a pum sump as attribute
return(flow.out)

}
Expand Down