From 68354e27578b6614d8440522bfa0d9d7998aba4c Mon Sep 17 00:00:00 2001 From: Kilian Weishaupt Date: Mon, 26 Nov 2018 14:35:50 +0100 Subject: [PATCH] [lecture] Use new NewtonSolver to handle priVar switch --- lecture/efm/1p2c_2p_2p2c/lens2p2cexercise3.cc | 5 ++--- lecture/mm/co2plume/co2plumeshapeexercise.cc | 5 ++--- lecture/mm/columnxylene/columnxyleneexercise.cc | 5 ++--- lecture/mm/fuelcell/fuelcell.cc | 5 ++--- lecture/mm/heatpipe/heatpipe.cc | 5 ++--- lecture/mm/heavyoil/sagd/sagd.cc | 4 ++-- lecture/mm/heavyoil/sagdcyclic/sagd_cyclic.cc | 4 ++-- lecture/mm/heavyoil/sagdcyclichyst/sagd_cyclic_hyst.cc | 4 ++-- .../mm/heavyoil/sagdcyclichyst/sagd_cyclic_hyst.cc.SAVE.cc | 2 +- lecture/mm/naplinfiltration/3p3c/naplinfiltration3p3c.cc | 5 ++--- .../mm/remediationscenarios/remediationscenariosexercise.cc | 5 ++--- 11 files changed, 21 insertions(+), 28 deletions(-) diff --git a/lecture/efm/1p2c_2p_2p2c/lens2p2cexercise3.cc b/lecture/efm/1p2c_2p_2p2c/lens2p2cexercise3.cc index fefc1aa..57d55df 100644 --- a/lecture/efm/1p2c_2p_2p2c/lens2p2cexercise3.cc +++ b/lecture/efm/1p2c_2p_2p2c/lens2p2cexercise3.cc @@ -45,7 +45,7 @@ #include #include -#include +#include #include #include @@ -183,8 +183,7 @@ int main(int argc, char** argv) try auto linearSolver = std::make_shared(leafGridView, fvGridGeometry->dofMapper()); // the non-linear solver - using NewtonSolver = PriVarSwitchNewtonSolver; + using NewtonSolver = NewtonSolver; NewtonSolver nonLinearSolver(assembler, linearSolver); // time loop diff --git a/lecture/mm/co2plume/co2plumeshapeexercise.cc b/lecture/mm/co2plume/co2plumeshapeexercise.cc index 39cd143..25c3dcf 100644 --- a/lecture/mm/co2plume/co2plumeshapeexercise.cc +++ b/lecture/mm/co2plume/co2plumeshapeexercise.cc @@ -38,7 +38,7 @@ #include #include -#include +#include #include #include @@ -128,8 +128,7 @@ int main(int argc, char** argv) try auto linearSolver = std::make_shared(leafGridView, fvGridGeometry->dofMapper()); // the non-linear solver - using NewtonSolver = PriVarSwitchNewtonSolver; + using NewtonSolver = NewtonSolver; NewtonSolver nonLinearSolver(assembler, linearSolver); // time loop diff --git a/lecture/mm/columnxylene/columnxyleneexercise.cc b/lecture/mm/columnxylene/columnxyleneexercise.cc index 71c198c..3a6dfe7 100644 --- a/lecture/mm/columnxylene/columnxyleneexercise.cc +++ b/lecture/mm/columnxylene/columnxyleneexercise.cc @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include @@ -152,8 +152,7 @@ int main(int argc, char** argv) try auto linearSolver = std::make_shared(leafGridView, fvGridGeometry->dofMapper()); // the non-linear solver - using NewtonSolver = PriVarSwitchNewtonSolver; + using NewtonSolver = NewtonSolver; NewtonSolver nonLinearSolver(assembler, linearSolver); // time loop diff --git a/lecture/mm/fuelcell/fuelcell.cc b/lecture/mm/fuelcell/fuelcell.cc index 92b617b..55dd238 100644 --- a/lecture/mm/fuelcell/fuelcell.cc +++ b/lecture/mm/fuelcell/fuelcell.cc @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include @@ -166,8 +166,7 @@ int main(int argc, char** argv) try auto linearSolver = std::make_shared(leafGridView, fvGridGeometry->dofMapper()); // the non-linear solver - using NewtonSolver = PriVarSwitchNewtonSolver; + using NewtonSolver = NewtonSolver; NewtonSolver nonLinearSolver(assembler, linearSolver); // time loop diff --git a/lecture/mm/heatpipe/heatpipe.cc b/lecture/mm/heatpipe/heatpipe.cc index 6212782..1602b24 100644 --- a/lecture/mm/heatpipe/heatpipe.cc +++ b/lecture/mm/heatpipe/heatpipe.cc @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include @@ -124,8 +124,7 @@ int main(int argc, char** argv) try auto linearSolver = std::make_shared(); // the non-linear solver - using NewtonSolver = PriVarSwitchNewtonSolver; + using NewtonSolver = NewtonSolver; NewtonSolver nonLinearSolver(assembler, linearSolver); // set some check points for the time loop diff --git a/lecture/mm/heavyoil/sagd/sagd.cc b/lecture/mm/heavyoil/sagd/sagd.cc index 68ce346..d30ad92 100644 --- a/lecture/mm/heavyoil/sagd/sagd.cc +++ b/lecture/mm/heavyoil/sagd/sagd.cc @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include @@ -153,7 +153,7 @@ int main(int argc, char** argv) try auto linearSolver = std::make_shared(leafGridView, fvGridGeometry->dofMapper()); // the non-linear solver - using NewtonSolver = PriVarSwitchNewtonSolver; + using NewtonSolver = NewtonSolver; NewtonSolver nonLinearSolver(assembler, linearSolver); // time loop diff --git a/lecture/mm/heavyoil/sagdcyclic/sagd_cyclic.cc b/lecture/mm/heavyoil/sagdcyclic/sagd_cyclic.cc index 1db76a3..427279c 100644 --- a/lecture/mm/heavyoil/sagdcyclic/sagd_cyclic.cc +++ b/lecture/mm/heavyoil/sagdcyclic/sagd_cyclic.cc @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include @@ -155,7 +155,7 @@ int main(int argc, char** argv) try auto linearSolver = std::make_shared(leafGridView, fvGridGeometry->dofMapper()); // the non-linear solver - using NewtonSolver = PriVarSwitchNewtonSolver; + using NewtonSolver = NewtonSolver; NewtonSolver nonLinearSolver(assembler, linearSolver); // time loop diff --git a/lecture/mm/heavyoil/sagdcyclichyst/sagd_cyclic_hyst.cc b/lecture/mm/heavyoil/sagdcyclichyst/sagd_cyclic_hyst.cc index 06cac02..28a4415 100644 --- a/lecture/mm/heavyoil/sagdcyclichyst/sagd_cyclic_hyst.cc +++ b/lecture/mm/heavyoil/sagdcyclichyst/sagd_cyclic_hyst.cc @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include @@ -155,7 +155,7 @@ int main(int argc, char** argv) try auto linearSolver = std::make_shared(leafGridView, fvGridGeometry->dofMapper()); // the non-linear solver - using NewtonSolver = PriVarSwitchNewtonSolver; + using NewtonSolver = NewtonSolver; NewtonSolver nonLinearSolver(assembler, linearSolver); // time loop diff --git a/lecture/mm/heavyoil/sagdcyclichyst/sagd_cyclic_hyst.cc.SAVE.cc b/lecture/mm/heavyoil/sagdcyclichyst/sagd_cyclic_hyst.cc.SAVE.cc index 4cccd86..6ec113a 100644 --- a/lecture/mm/heavyoil/sagdcyclichyst/sagd_cyclic_hyst.cc.SAVE.cc +++ b/lecture/mm/heavyoil/sagdcyclichyst/sagd_cyclic_hyst.cc.SAVE.cc @@ -38,7 +38,7 @@ #include #include -#include +#include #include #include diff --git a/lecture/mm/naplinfiltration/3p3c/naplinfiltration3p3c.cc b/lecture/mm/naplinfiltration/3p3c/naplinfiltration3p3c.cc index def9f62..0539b83 100644 --- a/lecture/mm/naplinfiltration/3p3c/naplinfiltration3p3c.cc +++ b/lecture/mm/naplinfiltration/3p3c/naplinfiltration3p3c.cc @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include @@ -158,8 +158,7 @@ int main(int argc, char** argv) try auto linearSolver = std::make_shared(); // the non-linear solver - using NewtonSolver = PriVarSwitchNewtonSolver; + using NewtonSolver = NewtonSolver; NewtonSolver nonLinearSolver(assembler, linearSolver); //! set some check points for the time loop diff --git a/lecture/mm/remediationscenarios/remediationscenariosexercise.cc b/lecture/mm/remediationscenarios/remediationscenariosexercise.cc index 8e0f72f..92f6aa9 100644 --- a/lecture/mm/remediationscenarios/remediationscenariosexercise.cc +++ b/lecture/mm/remediationscenarios/remediationscenariosexercise.cc @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include @@ -161,8 +161,7 @@ int main(int argc, char** argv) try auto linearSolver = std::make_shared(leafGridView, fvGridGeometry->dofMapper()); // the non-linear solver - using NewtonSolver = PriVarSwitchNewtonSolver; + using NewtonSolver = NewtonSolver; NewtonSolver nonLinearSolver(assembler, linearSolver); // time loop -- GitLab