Skip to content
Snippets Groups Projects
Commit 3f624088 authored by Dmitri Naumov's avatar Dmitri Naumov
Browse files

Merge branch 'rename-is-linear' into 'master'

Renamed tag <is_linear> to <linear>

See merge request ogs/ogs!4747
parents 68cb1637 67b83b92
No related branches found
No related tags found
No related merge requests found
Showing
with 13 additions and 13 deletions
......@@ -4,13 +4,13 @@ the linear solver will only do the `compute()`<sup>\*</sup> step if the timestep
changes.
This flag is a further optimization on top of the
[\<is_linear\>](@ref ogs_file_param__prj__processes__process__ComponentTransport__is_linear)
[\<linear\>](@ref ogs_file_param__prj__processes__process__ComponentTransport__linear)
flag.
So the requirements of `<is_linear>` apply to this flag, too!
So the requirements of `<linear>` apply to this flag, too!
\attention
This is an expert option. It comes with a number of further **requirements above
those of `<is_linear>`**. These are:
those of `<linear>`**. These are:
- The linear solver used to solve the process equations must be exclusively used
for a single process (or for a single `process_id` in the case of staggered
......
......@@ -253,8 +253,8 @@ std::unique_ptr<Process> createComponentTransportProcess(
}
auto const is_linear =
//! \ogs_file_param{prj__processes__process__ComponentTransport__is_linear}
config.getConfigParameter("is_linear", false);
//! \ogs_file_param{prj__processes__process__ComponentTransport__linear}
config.getConfigParameter("linear", false);
auto const ls_compute_only_upon_timestep_change =
//! \ogs_file_param{prj__processes__process__ComponentTransport__linear_solver_compute_only_upon_timestep_change}
......
......@@ -791,18 +791,18 @@ if (NOT OGS_USE_MPI)
# several variations of 1d_decay_chain_GIA
OgsTest(PROJECTFILE Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/1d_decay_chain_GIA.prj RUNTIME 40)
OgsTest(PROJECTFILE Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/is_linear/1d_decay_chain_GIA.xml RUNTIME 10)
OgsTest(PROJECTFILE Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/is_linear_compute_only_on_dt_change/1d_decay_chain_GIA.xml RUNTIME 4)
OgsTest(PROJECTFILE Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/linear/1d_decay_chain_GIA.xml RUNTIME 10)
OgsTest(PROJECTFILE Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/linear_compute_only_on_dt_change/1d_decay_chain_GIA.xml RUNTIME 4)
# further variations of 1d_decay_chain_GIA with Eigen's SparseLU solver
OgsTest(PROJECTFILE Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/SparseLU/1d_decay_chain_GIA.xml RUNTIME 40)
OgsTest(PROJECTFILE Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/SparseLU_is_linear/1d_decay_chain_GIA.xml RUNTIME 10)
OgsTest(PROJECTFILE Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/SparseLU_is_linear_compute_only_on_dt_change/1d_decay_chain_GIA.xml RUNTIME 4)
OgsTest(PROJECTFILE Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/SparseLU_linear/1d_decay_chain_GIA.xml RUNTIME 10)
OgsTest(PROJECTFILE Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/SparseLU_linear_compute_only_on_dt_change/1d_decay_chain_GIA.xml RUNTIME 4)
# variation with changing timestep size
OgsTest(PROJECTFILE Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/varying_dt/1d_decay_chain_GIA.xml RUNTIME 40)
OgsTest(PROJECTFILE Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/varying_dt_is_linear/1d_decay_chain_GIA.xml RUNTIME 10)
OgsTest(PROJECTFILE Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/varying_dt_is_linear_compute_only_on_dt_change/1d_decay_chain_GIA.xml RUNTIME 4)
OgsTest(PROJECTFILE Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/varying_dt_linear/1d_decay_chain_GIA.xml RUNTIME 10)
OgsTest(PROJECTFILE Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/varying_dt_linear_compute_only_on_dt_change/1d_decay_chain_GIA.xml RUNTIME 4)
OgsTest(PROJECTFILE Parabolic/ComponentTransport/ThermalDiffusion/TemperatureField_transport.prj RUNTIME 27)
endif()
......
<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProjectDiff base_file="../1d_decay_chain_GIA.prj">
<add sel="/*/processes/process">
<is_linear>true</is_linear>
<linear>true</linear>
</add>
<remove sel="/*/linear_solvers/linear_solver/eigen" />
......
<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProjectDiff base_file="../1d_decay_chain_GIA.prj">
<add sel="/*/processes/process">
<is_linear>true</is_linear>
<linear>true</linear>
<linear_solver_compute_only_upon_timestep_change>true</linear_solver_compute_only_upon_timestep_change>
</add>
......
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