diff --git a/Documentation/ProjectFile/prj/processes/process/ComponentTransport/t_linear_solver_compute_only_upon_timestep_change.md b/Documentation/ProjectFile/prj/processes/process/ComponentTransport/t_linear_solver_compute_only_upon_timestep_change.md index dc4e00b0f4a35cbe6c12d7ff902624a0e56da5e1..2160affa1b3003c8de92dca881c5910c015360f3 100644 --- a/Documentation/ProjectFile/prj/processes/process/ComponentTransport/t_linear_solver_compute_only_upon_timestep_change.md +++ b/Documentation/ProjectFile/prj/processes/process/ComponentTransport/t_linear_solver_compute_only_upon_timestep_change.md @@ -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 diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/SparseLU_is_linear/1d_decay_chain_GIA.xml b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/SparseLU_is_linear/1d_decay_chain_GIA.xml index 1c821430cdefb9bd5d63d36961bd1d8506606b3f..4c14f5288bacb6e6c5a0e3ed8560a0a34ced271a 100644 --- a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/SparseLU_is_linear/1d_decay_chain_GIA.xml +++ b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/SparseLU_is_linear/1d_decay_chain_GIA.xml @@ -1,7 +1,7 @@ <?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" /> diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/SparseLU_is_linear_compute_only_on_dt_change/1d_decay_chain_GIA.xml b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/SparseLU_is_linear_compute_only_on_dt_change/1d_decay_chain_GIA.xml index 55a5907a6c19490da9451daf100ee400f39a75b4..47e2f124dfa87512ef7c3a452459ff4aabae9c56 100644 --- a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/SparseLU_is_linear_compute_only_on_dt_change/1d_decay_chain_GIA.xml +++ b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/SparseLU_is_linear_compute_only_on_dt_change/1d_decay_chain_GIA.xml @@ -1,7 +1,7 @@ <?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> diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/is_linear/1d_decay_chain_GIA.xml b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/is_linear/1d_decay_chain_GIA.xml index 35a742eda51958d12409e5d8b2fb03992a4d937a..da4454fc483c17d1bbe712c5aad47a77c59c2c14 100644 --- a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/is_linear/1d_decay_chain_GIA.xml +++ b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/is_linear/1d_decay_chain_GIA.xml @@ -1,6 +1,6 @@ <?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> </OpenGeoSysProjectDiff> diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/is_linear_compute_only_on_dt_change/1d_decay_chain_GIA.xml b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/is_linear_compute_only_on_dt_change/1d_decay_chain_GIA.xml index 55aaf9b19f68251f21824cfa0b0e76b240cbb904..f6f2423fdd6e4253397aae9d6120a5561e636ebf 100644 --- a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/is_linear_compute_only_on_dt_change/1d_decay_chain_GIA.xml +++ b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/is_linear_compute_only_on_dt_change/1d_decay_chain_GIA.xml @@ -1,7 +1,7 @@ <?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> </OpenGeoSysProjectDiff> diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/performance_measurements.ipynb b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/performance_measurements.ipynb index 85d9a2f7a8963f159b85011f8e3f432c56c7a1de..73ddf389e3bc21fc5848c4e29728dac84e96be1d 100644 --- a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/performance_measurements.ipynb +++ b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/performance_measurements.ipynb @@ -88,12 +88,12 @@ "# Considered cases\n", "\n", "1. base case\n", - "2. `<is_linear>true</is_linear>`\n", + "2. `<linear>true</linear>`\n", " * requires that global matrices `M`, `K` and right-hand side vector `b` assembled by the `ComponentTransport` process do not change over time (and do not depend on the solution)\n", " * requires that BCs and STs do not depend on the solution\n", " * performs only **one non-linear iteration per timestep**\n", " * `ComponentTransport` process **caches assembled global matrices** (no re-assembly necessary)\n", - "3. `<is_linear>true</is_linear>` and `<linear_solver_compute_only_upon_timestep_change>true</linear_solver_compute_only_upon_timestep_change>`\n", + "3. `<linear>true</linear>` and `<linear_solver_compute_only_upon_timestep_change>true</linear_solver_compute_only_upon_timestep_change>`\n", " * requires additionally, that also the BC and ST contributions to the global matrices do not change over time (no time- or solution-dependent BCs or STs!)\n", " * LU decomposition or preconditioner is **computed only upon timestep change**\n", " * only implemented for linear solvers from the Eigen library, so far\n", @@ -115,19 +115,19 @@ "source": [ "cases = [\n", " [\"1 base\", \"./1d_decay_chain_GIA.prj\"],\n", - " [\"2 linear\", \"is_linear/1d_decay_chain_GIA.xml\"],\n", - " [\"3 linear & dt\", \"is_linear_compute_only_on_dt_change/1d_decay_chain_GIA.xml\"],\n", + " [\"2 linear\", \"linear/1d_decay_chain_GIA.xml\"],\n", + " [\"3 linear & dt\", \"linear_compute_only_on_dt_change/1d_decay_chain_GIA.xml\"],\n", " [\"4 LU\", \"SparseLU/1d_decay_chain_GIA.xml\"],\n", - " [\"5 LU & linear\", \"SparseLU_is_linear/1d_decay_chain_GIA.xml\"],\n", + " [\"5 LU & linear\", \"SparseLU_linear/1d_decay_chain_GIA.xml\"],\n", " [\n", " \"6 LU & linear & dt\",\n", - " \"SparseLU_is_linear_compute_only_on_dt_change/1d_decay_chain_GIA.xml\",\n", + " \"SparseLU_linear_compute_only_on_dt_change/1d_decay_chain_GIA.xml\",\n", " ],\n", " [\"7 varying dt\", \"varying_dt/1d_decay_chain_GIA.xml\"],\n", - " [\"8 varying dt & linear\", \"varying_dt_is_linear/1d_decay_chain_GIA.xml\"],\n", + " [\"8 varying dt & linear\", \"varying_dt_linear/1d_decay_chain_GIA.xml\"],\n", " [\n", " \"9 varying dt & linear & dt\",\n", - " \"varying_dt_is_linear_compute_only_on_dt_change/1d_decay_chain_GIA.xml\",\n", + " \"varying_dt_linear_compute_only_on_dt_change/1d_decay_chain_GIA.xml\",\n", " ],\n", "]" ] @@ -155,14 +155,14 @@ "output_type": "stream", "text": [ "running case ./1d_decay_chain_GIA.prj\n", - "running case is_linear/1d_decay_chain_GIA.xml\n", - "running case is_linear_compute_only_on_dt_change/1d_decay_chain_GIA.xml\n", + "running case linear/1d_decay_chain_GIA.xml\n", + "running case linear_compute_only_on_dt_change/1d_decay_chain_GIA.xml\n", "running case SparseLU/1d_decay_chain_GIA.xml\n", - "running case SparseLU_is_linear/1d_decay_chain_GIA.xml\n", - "running case SparseLU_is_linear_compute_only_on_dt_change/1d_decay_chain_GIA.xml\n", + "running case SparseLU_linear/1d_decay_chain_GIA.xml\n", + "running case SparseLU_linear_compute_only_on_dt_change/1d_decay_chain_GIA.xml\n", "running case varying_dt/1d_decay_chain_GIA.xml\n", - "running case varying_dt_is_linear/1d_decay_chain_GIA.xml\n", - "running case varying_dt_is_linear_compute_only_on_dt_change/1d_decay_chain_GIA.xml\n" + "running case varying_dt_linear/1d_decay_chain_GIA.xml\n", + "running case varying_dt_linear_compute_only_on_dt_change/1d_decay_chain_GIA.xml\n" ] } ], @@ -501,7 +501,7 @@ "id": "058305aa-e717-4dcf-989b-b58591494d87", "metadata": {}, "source": [ - "* with `<is_linear>true<is_linear>` only one non-linear iteration is done per timestep." + "* with `<linear>true<linear>` only one non-linear iteration is done per timestep." ] }, { diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/varying_dt_is_linear/1d_decay_chain_GIA.xml b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/varying_dt_is_linear/1d_decay_chain_GIA.xml index c68801d2a628cc8769bde37721260f18fceace83..f2d747af71ab2d59711fdf265bbdebe8414fee6a 100644 --- a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/varying_dt_is_linear/1d_decay_chain_GIA.xml +++ b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/varying_dt_is_linear/1d_decay_chain_GIA.xml @@ -1,7 +1,7 @@ <?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="/*/time_loop/processes/process/time_stepping/timesteps"/> diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/varying_dt_is_linear_compute_only_on_dt_change/1d_decay_chain_GIA.xml b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/varying_dt_is_linear_compute_only_on_dt_change/1d_decay_chain_GIA.xml index 4ec9cc4fc40a7a636781720d822abf40c35490f1..58e1864d759e35f3c21e5ebd569ea89ecefa36b1 100644 --- a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/varying_dt_is_linear_compute_only_on_dt_change/1d_decay_chain_GIA.xml +++ b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/DecayChain/GlobalImplicitApproach/varying_dt_is_linear_compute_only_on_dt_change/1d_decay_chain_GIA.xml @@ -1,7 +1,7 @@ <?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>