Skip to content
Snippets Groups Projects
Commit cb4e0e04 authored by Johannes Boog's avatar Johannes Boog
Browse files

[base] add curve as prj_ph_property element

parent d1e7e116
No related branches found
No related tags found
1 merge request!54[bugfix] make all OGS6 benchmarks work.
...@@ -436,6 +436,8 @@ prj_ph_property <- function(name, ...@@ -436,6 +436,8 @@ prj_ph_property <- function(name,
exponents = NULL, exponents = NULL,
lower_saturation_limit = NULL, lower_saturation_limit = NULL,
upper_saturation_limit = NULL, upper_saturation_limit = NULL,
tortuosity = NULL,
curve = NULL,
...) { ...) {
#Coerce input #Coerce input
...@@ -449,6 +451,7 @@ prj_ph_property <- function(name, ...@@ -449,6 +451,7 @@ prj_ph_property <- function(name,
swelling_pressures <- coerce_string_to_numeric(swelling_pressures) swelling_pressures <- coerce_string_to_numeric(swelling_pressures)
lower_saturation_limit <- coerce_string_to_numeric(lower_saturation_limit) lower_saturation_limit <- coerce_string_to_numeric(lower_saturation_limit)
upper_saturation_limit <- coerce_string_to_numeric(upper_saturation_limit) upper_saturation_limit <- coerce_string_to_numeric(upper_saturation_limit)
tortuosity <- (coerce_string_to_numeric(tortuosity))
ellipsis_list <- list(...) ellipsis_list <- list(...)
independent_variable <- independent_variable <-
...@@ -467,7 +470,9 @@ prj_ph_property <- function(name, ...@@ -467,7 +470,9 @@ prj_ph_property <- function(name,
swelling_pressures, swelling_pressures,
exponents, exponents,
lower_saturation_limit, lower_saturation_limit,
upper_saturation_limit) upper_saturation_limit,
tortuosity,
curve)
} }
...@@ -483,7 +488,9 @@ new_prj_ph_property <- function(name, ...@@ -483,7 +488,9 @@ new_prj_ph_property <- function(name,
swelling_pressures = NULL, swelling_pressures = NULL,
exponents = NULL, exponents = NULL,
lower_saturation_limit = NULL, lower_saturation_limit = NULL,
upper_saturation_limit = NULL) { upper_saturation_limit = NULL,
tortuosity = NULL,
curve = NULL) {
are_strings(name, are_strings(name,
type) type)
...@@ -506,13 +513,14 @@ new_prj_ph_property <- function(name, ...@@ -506,13 +513,14 @@ new_prj_ph_property <- function(name,
reference_value, reference_value,
offset, offset,
lower_saturation_limit, lower_saturation_limit,
upper_saturation_limit upper_saturation_limit,
tortuosity
) )
are_null_or_numeric(swelling_pressures, are_null_or_numeric(swelling_pressures,
exponents) exponents)
are_null_or_strings(parameter_name) are_null_or_strings(parameter_name, curve)
if (!is.null(independent_variable)) { if (!is.null(independent_variable)) {
independent_variable <- lapply(independent_variable, function(x){ independent_variable <- lapply(independent_variable, function(x){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment