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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ogs
OpenGeoSys Tools
r2ogs6
Commits
8e6774ef
Commit
8e6774ef
authored
Nov 14, 2021
by
phit0
Browse files
Options
Downloads
Patches
Plain Diff
[base] deleted unused keyword parameters for v6.4.1
parent
14ccd507
No related branches found
No related tags found
3 merge requests
!38
Draft: standardize files references during prj import/export
,
!35
Resolve "Manual CI job to run all benchmarks"
,
!33
Resolve "Update to OGSv6.4.1"
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
R/prj_process.R
+0
-107
0 additions, 107 deletions
R/prj_process.R
man/prj_process.Rd
+0
-42
0 additions, 42 deletions
man/prj_process.Rd
with
0 additions
and
149 deletions
R/prj_process.R
+
0
−
107
View file @
8e6774ef
...
...
@@ -13,7 +13,6 @@
#' @param solid_density Optional:
#' @param dimension Optional:
#' @param coupling_scheme Optional:
#' @param darcy_gravity Optional:
#' @param reference_temperature Optional:
#' @param fracture_model Optional:
#' @param jacobian_assembler Optional:
...
...
@@ -50,24 +49,11 @@
#' @param material_property Optional:
#' @param diffusion_coeff_component_b Optional:
#' @param diffusion_coeff_component_a Optional:
#' @param hydro_crack_scheme Optional:
#' @param at_num Optional:
#' @param initial_stress Optional:
#' @param split_method Optional:
#' @param reg_param Optional:
#' @param thermal_parameters Optional:
#' @param non_advective_form Optional:
#' @param fluid Optional:
#' @param porous_medium Optional:
#' @param decay_rate Optional:
#' @param fluid_reference_density Optional:
#' @param retardation_factor Optional:
#' @param solute_dispersivity_longitudinal Optional:
#' @param solute_dispersivity_transverse Optional:
#' @param molecular_diffusion_coefficient Optional:
#' @param density_solid Optional:
#' @param latent_heat_evaporation Optional:
#' @param pf_irrv Optional:
#' @param micro_porosity Optional:
#' @param explicit_hm_coupling_in_unsaturated_zone Optional:
#' @param simplified_elasticity Optional: character
...
...
@@ -90,7 +76,6 @@ prj_process <- function(name,
solid_density
=
NULL
,
dimension
=
NULL
,
coupling_scheme
=
NULL
,
darcy_gravity
=
NULL
,
reference_temperature
=
NULL
,
fracture_model
=
NULL
,
jacobian_assembler
=
NULL
,
...
...
@@ -127,24 +112,11 @@ prj_process <- function(name,
material_property
=
NULL
,
diffusion_coeff_component_b
=
NULL
,
diffusion_coeff_component_a
=
NULL
,
hydro_crack_scheme
=
NULL
,
at_num
=
NULL
,
initial_stress
=
NULL
,
split_method
=
NULL
,
reg_param
=
NULL
,
thermal_parameters
=
NULL
,
non_advective_form
=
NULL
,
fluid
=
NULL
,
porous_medium
=
NULL
,
decay_rate
=
NULL
,
fluid_reference_density
=
NULL
,
retardation_factor
=
NULL
,
solute_dispersivity_longitudinal
=
NULL
,
solute_dispersivity_transverse
=
NULL
,
molecular_diffusion_coefficient
=
NULL
,
density_solid
=
NULL
,
latent_heat_evaporation
=
NULL
,
pf_irrv
=
NULL
,
micro_porosity
=
NULL
,
explicit_hm_coupling_in_unsaturated_zone
=
NULL
,
simplified_elasticity
=
NULL
,
...
...
@@ -183,10 +155,6 @@ prj_process <- function(name,
coerce_string_to_numeric
(
characteristic_temperature
)
characteristic_vapour_mass_fraction
<-
coerce_string_to_numeric
(
characteristic_vapour_mass_fraction
)
at_num
<-
coerce_string_to_numeric
(
at_num
)
split_method
<-
coerce_string_to_numeric
(
split_method
)
reg_param
<-
coerce_string_to_numeric
(
reg_param
)
pf_irrv
<-
coerce_string_to_numeric
(
pf_irrv
)
irreversible_threshold
<-
coerce_string_to_numeric
(
irreversible_threshold
)
ellipsis_list
<-
list
(
...
)
...
...
@@ -208,7 +176,6 @@ prj_process <- function(name,
solid_density
,
dimension
,
coupling_scheme
,
darcy_gravity
,
reference_temperature
,
fracture_model
,
fracture_properties
,
...
...
@@ -246,24 +213,11 @@ prj_process <- function(name,
material_property
,
diffusion_coeff_component_b
,
diffusion_coeff_component_a
,
hydro_crack_scheme
,
at_num
,
initial_stress
,
split_method
,
reg_param
,
thermal_parameters
,
non_advective_form
,
fluid
,
porous_medium
,
decay_rate
,
fluid_reference_density
,
retardation_factor
,
solute_dispersivity_longitudinal
,
solute_dispersivity_transverse
,
molecular_diffusion_coefficient
,
density_solid
,
latent_heat_evaporation
,
pf_irrv
,
micro_porosity
,
explicit_hm_coupling_in_unsaturated_zone
,
simplified_elasticity
,
...
...
@@ -288,7 +242,6 @@ new_prj_process <- function(name,
solid_density
=
NULL
,
dimension
=
NULL
,
coupling_scheme
=
NULL
,
darcy_gravity
=
NULL
,
reference_temperature
=
NULL
,
fracture_model
=
NULL
,
fracture_properties
=
NULL
,
...
...
@@ -326,24 +279,11 @@ new_prj_process <- function(name,
material_property
=
NULL
,
diffusion_coeff_component_b
=
NULL
,
diffusion_coeff_component_a
=
NULL
,
hydro_crack_scheme
=
NULL
,
at_num
=
NULL
,
initial_stress
=
NULL
,
split_method
=
NULL
,
reg_param
=
NULL
,
thermal_parameters
=
NULL
,
non_advective_form
=
NULL
,
fluid
=
NULL
,
porous_medium
=
NULL
,
decay_rate
=
NULL
,
fluid_reference_density
=
NULL
,
retardation_factor
=
NULL
,
solute_dispersivity_longitudinal
=
NULL
,
solute_dispersivity_transverse
=
NULL
,
molecular_diffusion_coefficient
=
NULL
,
density_solid
=
NULL
,
latent_heat_evaporation
=
NULL
,
pf_irrv
=
NULL
,
micro_porosity
=
NULL
,
explicit_hm_coupling_in_unsaturated_zone
=
NULL
,
simplified_elasticity
=
NULL
,
...
...
@@ -373,10 +313,6 @@ new_prj_process <- function(name,
"prj_constitutive_relation"
)
}
if
(
!
is.null
(
darcy_gravity
)){
darcy_gravity
<-
coerce_names
(
darcy_gravity
,
c
(
"axis_id"
,
"g"
))
}
is_null_or_has_class
(
fracture_model
,
"prj_fracture_model"
)
...
...
@@ -417,12 +353,7 @@ new_prj_process <- function(name,
"residual_thermal_conductivity"
))
}
if
(
!
is.null
(
porous_medium
)){
is_wrapper_list
(
porous_medium
,
"prj_porous_medium"
)
}
fluid
<-
validate_fluid
(
fluid
)
are_null_or_strings
(
coupling_scheme
,
solid_density
,
...
...
@@ -436,14 +367,7 @@ new_prj_process <- function(name,
temperature
,
diffusion_coeff_component_b
,
diffusion_coeff_component_a
,
hydro_crack_scheme
,
initial_stress
,
decay_rate
,
fluid_reference_density
,
retardation_factor
,
solute_dispersivity_longitudinal
,
solute_dispersivity_transverse
,
molecular_diffusion_coefficient
,
density_solid
,
latent_heat_evaporation
,
porosity
,
...
...
@@ -473,10 +397,6 @@ new_prj_process <- function(name,
characteristic_pressure
,
characteristic_temperature
,
characteristic_vapour_mass_fraction
,
at_num
,
split_method
,
reg_param
,
pf_irrv
,
irreversible_threshold
)
if
(
!
is.null
(
mass_lumping
)){
...
...
@@ -498,7 +418,6 @@ new_prj_process <- function(name,
solid_density
=
solid_density
,
dimension
=
dimension
,
coupling_scheme
=
coupling_scheme
,
darcy_gravity
=
darcy_gravity
,
reference_temperature
=
reference_temperature
,
fracture_model
=
fracture_model
,
fracture_properties
=
fracture_properties
,
...
...
@@ -540,24 +459,11 @@ new_prj_process <- function(name,
material_property
=
material_property
,
diffusion_coeff_component_b
=
diffusion_coeff_component_b
,
diffusion_coeff_component_a
=
diffusion_coeff_component_a
,
hydro_crack_scheme
=
hydro_crack_scheme
,
at_num
=
at_num
,
initial_stress
=
initial_stress
,
split_method
=
split_method
,
reg_param
=
reg_param
,
thermal_parameters
=
thermal_parameters
,
non_advective_form
=
non_advective_form
,
fluid
=
fluid
,
porous_medium
=
porous_medium
,
decay_rate
=
decay_rate
,
fluid_reference_density
=
fluid_reference_density
,
retardation_factor
=
retardation_factor
,
solute_dispersivity_longitudinal
=
solute_dispersivity_longitudinal
,
solute_dispersivity_transverse
=
solute_dispersivity_transverse
,
molecular_diffusion_coefficient
=
molecular_diffusion_coefficient
,
density_solid
=
density_solid
,
latent_heat_evaporation
=
latent_heat_evaporation
,
pf_irrv
=
pf_irrv
,
micro_porosity
=
micro_porosity
,
explicit_hm_coupling_in_unsaturated_zone
=
explicit_hm_coupling_in_unsaturated_zone
,
...
...
@@ -1086,7 +992,6 @@ new_prj_phasefield_parameters <- function(residual_stiffness,
#See prj_material_property.R
#===== prj_porous_medium =====
#See prj_porous_medium.R
...
...
@@ -1191,18 +1096,6 @@ validate_secondary_variables <- function(secondary_variables){
}
validate_fluid
<-
function
(
fluid
){
if
(
!
is.null
(
fluid
)){
fluid
<-
coerce_names
(
fluid
,
c
(
"density"
,
"viscosity"
))
fluid
[[
1
]]
<-
coerce_names
(
fluid
[[
1
]],
c
(
"type"
,
"value"
))
fluid
[[
2
]]
<-
coerce_names
(
fluid
[[
2
]],
c
(
"type"
,
"value"
))
}
return
(
invisible
(
fluid
))
}
validate_process_nls
<-
function
(
nonlinear_solver
,
nullable
=
T
){
...
...
This diff is collapsed.
Click to expand it.
man/prj_process.Rd
+
0
−
42
View file @
8e6774ef
...
...
@@ -14,7 +14,6 @@ prj_process(
solid_density = NULL,
dimension = NULL,
coupling_scheme = NULL,
darcy_gravity = NULL,
reference_temperature = NULL,
fracture_model = NULL,
jacobian_assembler = NULL,
...
...
@@ -51,24 +50,11 @@ prj_process(
material_property = NULL,
diffusion_coeff_component_b = NULL,
diffusion_coeff_component_a = NULL,
hydro_crack_scheme = NULL,
at_num = NULL,
initial_stress = NULL,
split_method = NULL,
reg_param = NULL,
thermal_parameters = NULL,
non_advective_form = NULL,
fluid = NULL,
porous_medium = NULL,
decay_rate = NULL,
fluid_reference_density = NULL,
retardation_factor = NULL,
solute_dispersivity_longitudinal = NULL,
solute_dispersivity_transverse = NULL,
molecular_diffusion_coefficient = NULL,
density_solid = NULL,
latent_heat_evaporation = NULL,
pf_irrv = NULL,
micro_porosity = NULL,
explicit_hm_coupling_in_unsaturated_zone = NULL,
simplified_elasticity = NULL,
...
...
@@ -101,8 +87,6 @@ prj_process(
\item{coupling_scheme}{Optional:}
\item{darcy_gravity}{Optional:}
\item{reference_temperature}{Optional:}
\item{fracture_model}{Optional:}
...
...
@@ -175,42 +159,16 @@ prj_process(
\item{diffusion_coeff_component_a}{Optional:}
\item{hydro_crack_scheme}{Optional:}
\item{at_num}{Optional:}
\item{initial_stress}{Optional:}
\item{split_method}{Optional:}
\item{reg_param}{Optional:}
\item{thermal_parameters}{Optional:}
\item{non_advective_form}{Optional:}
\item{fluid}{Optional:}
\item{porous_medium}{Optional:}
\item{decay_rate}{Optional:}
\item{fluid_reference_density}{Optional:}
\item{retardation_factor}{Optional:}
\item{solute_dispersivity_longitudinal}{Optional:}
\item{solute_dispersivity_transverse}{Optional:}
\item{molecular_diffusion_coefficient}{Optional:}
\item{density_solid}{Optional:}
\item{latent_heat_evaporation}{Optional:}
\item{pf_irrv}{Optional:}
\item{micro_porosity}{Optional:}
\item{explicit_hm_coupling_in_unsaturated_zone}{Optional:}
...
...
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