Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RedModRphree
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Marco De Lucia
RedModRphree
Commits
b92d58ca
Commit
b92d58ca
authored
2 years ago
by
Marco De Lucia
Browse files
Options
Downloads
Patches
Plain Diff
Cosmetic changes + fixed roxygen documentation
parent
66205812
Branches
3-port-RcppTUG
No related tags found
1 merge request
!6
3 port rcpp tug
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
R/Rphree_Diffusion.R
+4
-3
4 additions, 3 deletions
R/Rphree_Diffusion.R
man/BTCS.Rd
+2
-0
2 additions, 0 deletions
man/BTCS.Rd
man/FTCS.Rd
+1
-1
1 addition, 1 deletion
man/FTCS.Rd
with
7 additions
and
4 deletions
R/Rphree_Diffusion.R
+
4
−
3
View file @
b92d58ca
## Functions for RT simulations using through RcppBTCS's diffusion
### Marco De Lucia, delucia@gfz-potsdam.de, 2009-2022
### Time-stamp: "Last modified 2022-10-04 1
6:00:31
delucia"
### Time-stamp: "Last modified 2022-10-04 1
7:24:58
delucia"
##' This function is somehow equivalent to
##' \code{phreeqc::phrGetSelectedOutput} but it won't call
...
...
@@ -351,7 +351,7 @@ DiffusionScheme <- function(conc, inflow, dx, dt, alpha, scheme, transported) {
cnew
[,
sp
]
<-
FTCS
(
tmp
,
dx
,
dt
,
alpha
,
bc_left
=
inflow
[
sp
])
}
}
else
{
msg
(
"Diffusing totrans="
,
paste
(
totrans
,
collapse
=
"; "
))
##
msg("Diffusing totrans=", paste(totrans, collapse = "; "))
for
(
sp
in
totrans
)
{
## msg("Diffusing names(inflow[sp])", names(inflow[sp]), "bc_left=", inflow[sp])
## msg("Colnames(cnew)=", paste(colnames(cnew), collapse = "; "))
...
...
@@ -387,6 +387,7 @@ DiffusionScheme <- function(conc, inflow, dx, dt, alpha, scheme, transported) {
##' @param dt the required time step in s
##' @param alpha diffusion coefficient in m^2/s (constant,
##' homogeneous)
##' @param bc_left Dirichlet boundary condition at the left inlet
##' @return updated concentration vector
##' @author MDL
##' @export
...
...
@@ -412,7 +413,7 @@ BTCS <- function(field, dx, dt, alpha, bc_left) {
##' @param dt the required time step in s
##' @param alpha diffusion coefficient in m^2/s (constant,
##' homogeneous)
##' @param bc_left Dirichlet boundary conditions
on
the left
margin
##' @param bc_left Dirichlet boundary conditions
at
the left
inlet
##' @return updated concentration vector
##' @author MDL
##' @export
...
...
This diff is collapsed.
Click to expand it.
man/BTCS.Rd
+
2
−
0
View file @
b92d58ca
...
...
@@ -15,6 +15,8 @@ BTCS(field, dx, dt, alpha, bc_left)
\item{alpha}{diffusion coefficient in m^2/s (constant,
homogeneous)}
\item{bc_left}{Dirichlet boundary condition at the left inlet}
}
\value{
updated concentration vector
...
...
This diff is collapsed.
Click to expand it.
man/FTCS.Rd
+
1
−
1
View file @
b92d58ca
...
...
@@ -16,7 +16,7 @@ FTCS(field, dx, dt, alpha, bc_left)
\item{alpha}{diffusion coefficient in m^2/s (constant,
homogeneous)}
\item{bc_left}{Dirichlet boundary conditions
on
the left
margin
}
\item{bc_left}{Dirichlet boundary conditions
at
the left
inlet
}
}
\value{
updated concentration vector
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment