Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
r2ogs6
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
ogs
OpenGeoSys Tools
r2ogs6
Commits
0b2ed1a3
Commit
0b2ed1a3
authored
4 years ago
by
Ruben Heinrich
Browse files
Options
Downloads
Patches
Plain Diff
[docs] added missing roxygen docs
parent
e74380db
No related branches found
No related tags found
1 merge request
!6
Merge branch 7 fixed functionality into master
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
R/prj_medium.R
+4
-0
4 additions, 0 deletions
R/prj_medium.R
R/prj_porous_medium.R
+19
-6
19 additions, 6 deletions
R/prj_porous_medium.R
with
23 additions
and
6 deletions
R/prj_medium.R
+
4
−
0
View file @
0b2ed1a3
...
...
@@ -13,6 +13,10 @@ r2ogs6_medium <- function(phases = NULL,
properties
=
NULL
,
id
=
NULL
)
{
if
(
is.character
(
phases
)){
phases
<-
NULL
}
new_r2ogs6_medium
(
phases
,
properties
,
id
)
...
...
This diff is collapsed.
Click to expand it.
R/prj_porous_medium.R
+
19
−
6
View file @
0b2ed1a3
...
...
@@ -172,12 +172,12 @@ new_r2ogs6_capillary_pressure <- function(type,
#'r2ogs6_relative_permeability
#'@description tag: relative_permeability
#'@param
id
#'@param
type
#'@param s
r
#'@param
smax
#'@param
m
#'@param
krel_min
#'@param
type string:
#'@param
sr string | number:
#'@param s
max string | number:
#'@param
m string | number:
#'@param
krel_min string | number:
#'@param
id string: Optional:
r2ogs6_relative_permeability
<-
function
(
type
,
sr
,
smax
,
...
...
@@ -187,6 +187,11 @@ r2ogs6_relative_permeability <- function(type,
# Add coercing utility here
sr
<-
coerce_string_to_numeric
(
sr
)
smax
<-
coerce_string_to_numeric
(
smax
)
m
<-
coerce_string_to_numeric
(
m
)
krel_min
<-
coerce_string_to_numeric
(
krel_min
)
new_r2ogs6_relative_permeability
(
type
,
sr
,
smax
,
...
...
@@ -202,6 +207,14 @@ new_r2ogs6_relative_permeability <- function(type,
m
,
krel_min
,
id
=
NULL
)
{
validate_is_string
(
type
)
validate_is_null_or_string
(
id
)
validate_is_number
(
sr
,
smax
,
m
,
krel_min
)
structure
(
list
(
type
=
type
,
sr
=
sr
,
smax
=
smax
,
...
...
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