diff --git a/dumux/geomechanics/poroelastic/couplingmanager.hh b/dumux/geomechanics/poroelastic/couplingmanager.hh index 1a40e6073e09dad46083677684d2c4be36d5c960..ad3bef3d551153fc6dc1f44f555db9608c96ea23 100644 --- a/dumux/geomechanics/poroelastic/couplingmanager.hh +++ b/dumux/geomechanics/poroelastic/couplingmanager.hh @@ -335,15 +335,15 @@ public: template< class PoroMechLocalAssembler > typename LocalResidual<PoroMechId>::ElementResidualVector evalCouplingResidual(Dune::index_constant<PoroMechId> poroMechDomainId, - const PoroMechLocalAssembler& pmFlowLocalAssembler, + const PoroMechLocalAssembler& poroMechLocalAssembler, Dune::index_constant<PMFlowId> pmFlowDomainId, GridIndexType<PMFlowId> dofIdxGlobalJ) { - return pmFlowLocalAssembler.localResidual().evalFluxAndSource(pmFlowLocalAssembler.element(), - pmFlowLocalAssembler.fvGeometry(), - pmFlowLocalAssembler.curElemVolVars(), - pmFlowLocalAssembler.elemFluxVarsCache(), - pmFlowLocalAssembler.elemBcTypes()); + return poroMechLocalAssembler.localResidual().evalFluxAndSource(poroMechLocalAssembler.element(), + poroMechLocalAssembler.fvGeometry(), + poroMechLocalAssembler.curElemVolVars(), + poroMechLocalAssembler.elemFluxVarsCache(), + poroMechLocalAssembler.elemBcTypes()); } //! Return a const reference to one of the problems diff --git a/dumux/geomechanics/poroelastic/localresidual.hh b/dumux/geomechanics/poroelastic/localresidual.hh index c8c4657500b8e7652cfd043ba26d8fa7c91086d7..387dd75fd53b8e39e049893fd89d7b414d2b8f85 100644 --- a/dumux/geomechanics/poroelastic/localresidual.hh +++ b/dumux/geomechanics/poroelastic/localresidual.hh @@ -53,9 +53,6 @@ class PoroElasticLocalResidual: public ElasticLocalResidual<TypeTag> using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView; using VolumeVariables = typename ElementVolumeVariables::VolumeVariables; - // class assembling the stress tensor - using StressType = GetPropType<TypeTag, Properties::StressType>; - public: using ParentType::ParentType; diff --git a/test/multidomain/poromechanics/el1p/CMakeLists.txt b/test/multidomain/poromechanics/el1p/CMakeLists.txt index 13ac69da9ad45513f3419c268bed97f27fdec32f..254d68d1e349f250061ae11eb118d8086eff0dab 100644 --- a/test/multidomain/poromechanics/el1p/CMakeLists.txt +++ b/test/multidomain/poromechanics/el1p/CMakeLists.txt @@ -10,4 +10,5 @@ dune_add_test(NAME test_md_poromechanics_el1p ${CMAKE_SOURCE_DIR}/test/references/test_md_poromechanics_el1p_poroelastic-reference.vtu ${CMAKE_CURRENT_BINARY_DIR}/test_md_poromechanics_el1p_poroelastic-00001.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_poromechanics_el1p params.input - -Vtk.OutputName test_md_poromechanics_el1p") + -Vtk.OutputName test_md_poromechanics_el1p" + --zeroThreshold {"u":1e-14}) diff --git a/test/multidomain/poromechanics/el1p/params.input b/test/multidomain/poromechanics/el1p/params.input index 539aa41c1f9e704911859273025d493d4ed111af..ee1e6b08bd968282b49a2dd379b7e7484bb2c402 100644 --- a/test/multidomain/poromechanics/el1p/params.input +++ b/test/multidomain/poromechanics/el1p/params.input @@ -21,6 +21,9 @@ InitialPorosity = 0.2 # [-] ResidualReduction = 1e-20 MaxIterations = 2000 +[Newton] +MaxRelativeShift = 1e-10 + [Component] SolidDensity = 2700 LiquidDensity = 1.0 diff --git a/test/multidomain/poromechanics/el2p/CMakeLists.txt b/test/multidomain/poromechanics/el2p/CMakeLists.txt index 88f0c53f053572136acb43b8b0e0474e8d5e3fe3..840e147da8043187700546a6548c4e122c9f9d91 100644 --- a/test/multidomain/poromechanics/el2p/CMakeLists.txt +++ b/test/multidomain/poromechanics/el2p/CMakeLists.txt @@ -11,4 +11,5 @@ dune_add_test(NAME test_md_poromechanics_el2p ${CMAKE_SOURCE_DIR}/test/references/test_md_poromechanics_el2p_poroelastic-reference.vtu ${CMAKE_CURRENT_BINARY_DIR}/test_md_poromechanics_el2p_poroelastic-00010.vtu --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_poromechanics_el2p params.input - -Vtk.OutputName test_md_poromechanics_el2p") + -Vtk.OutputName test_md_poromechanics_el2p" + --zeroThreshold {"u":1e-14}) diff --git a/test/multidomain/poromechanics/el2p/params.input b/test/multidomain/poromechanics/el2p/params.input index 8cc7c6f5ad1e00803c93b59d26679c83494c1dad..7c96b619fa01347afaa96ac8afd69ed2bc62e7db 100644 --- a/test/multidomain/poromechanics/el2p/params.input +++ b/test/multidomain/poromechanics/el2p/params.input @@ -26,6 +26,11 @@ InitialPorosity = 0.2 # [-] ResidualReduction = 1e-20 MaxIterations = 2000 +[Newton] +MaxSteps = 25 +TargetSteps = 15 +MaxRelativeShift = 1e-10 + [Component] SolidDensity = 2650 diff --git a/test/multidomain/poromechanics/el2p/problem_2p.hh b/test/multidomain/poromechanics/el2p/problem_2p.hh index f479cd43cd11b6f623a0ee2cee8edec45fbef912..57a869a288725b73e3ce51ef15e89dfe4d1dfc9a 100644 --- a/test/multidomain/poromechanics/el2p/problem_2p.hh +++ b/test/multidomain/poromechanics/el2p/problem_2p.hh @@ -110,6 +110,7 @@ public: const std::string& paramGroup = "TwoP") : ParentType(fvGridGeometry, spatialParams, paramGroup) { + FluidSystem::init(); problemName_ = getParam<std::string>("Vtk.OutputName") + "_" + getParamFromGroup<std::string>(this->paramGroup(), "Problem.Name"); } diff --git a/test/references/test_md_poromechanics_el1p_poroelastic-reference.vtu b/test/references/test_md_poromechanics_el1p_poroelastic-reference.vtu index 77b36dacfb7e4bdc12656c46a487a87f66bfdd0b..5f3cdb1c971e3267ebff5ddd18cce4460403361a 100644 --- a/test/references/test_md_poromechanics_el1p_poroelastic-reference.vtu +++ b/test/references/test_md_poromechanics_el1p_poroelastic-reference.vtu @@ -4,17 +4,17 @@ <Piece NumberOfCells="100" NumberOfPoints="121"> <PointData Scalars="porosity" Vectors="u"> <DataArray type="Float32" Name="porosity" NumberOfComponents="1" format="ascii"> - 0.19998 0.199952 0.199952 0.199961 0.199936 0.199968 0.199924 0.199974 0.199916 0.199978 0.199914 0.199975 - 0.199917 0.199968 0.199927 0.19996 0.199941 0.199953 0.199961 0.199944 0.19998 0.199952 0.199936 0.199968 - 0.199997 0.200026 0.200046 0.200042 0.20002 0.199994 0.199966 0.199937 0.199936 0.199924 0.199974 0.200026 - 0.200082 0.200136 0.200132 0.20008 0.20003 0.199981 0.199934 0.199924 0.199916 0.199978 0.200046 0.200136 - 0.200272 0.200284 0.200156 0.200061 0.199991 0.199932 0.199916 0.199914 0.199975 0.200042 0.200132 0.200284 - 0.200296 0.200153 0.200058 0.199989 0.199929 0.199914 0.199917 0.199968 0.20002 0.20008 0.200156 0.200153 - 0.200078 0.200024 0.199975 0.199927 0.199917 0.199927 0.19996 0.199994 0.20003 0.200061 0.200058 0.200024 - 0.19999 0.199959 0.199929 0.199927 0.199941 0.199953 0.199966 0.199981 0.199991 0.199989 0.199975 0.199959 - 0.199945 0.199933 0.199941 0.199961 0.199944 0.199937 0.199934 0.199932 0.199929 0.199927 0.199929 0.199933 - 0.199941 0.199961 0.19998 0.199952 0.199936 0.199924 0.199916 0.199914 0.199917 0.199927 0.199941 0.199961 - 0.19998 + 0.199922 0.199806 0.199806 0.199846 0.199742 0.19987 0.199695 0.199896 0.199664 0.199911 0.199654 0.1999 + 0.19967 0.199871 0.199708 0.199841 0.199762 0.199813 0.199843 0.199776 0.199922 0.199806 0.199742 0.19987 + 0.19999 0.200103 0.200182 0.200169 0.20008 0.199975 0.199865 0.199749 0.199742 0.199695 0.199896 0.200103 + 0.20033 0.200542 0.200528 0.200321 0.20012 0.199923 0.199735 0.199695 0.199664 0.199911 0.200182 0.200542 + 0.201087 0.201134 0.200624 0.200244 0.199965 0.199726 0.199664 0.199654 0.1999 0.200169 0.200528 0.201134 + 0.201181 0.20061 0.200231 0.199954 0.199717 0.199654 0.19967 0.199871 0.20008 0.200321 0.200624 0.20061 + 0.200313 0.200097 0.199898 0.19971 0.19967 0.199708 0.199841 0.199975 0.20012 0.200244 0.200231 0.200097 + 0.199959 0.199835 0.199714 0.199708 0.199762 0.199813 0.199865 0.199923 0.199965 0.199954 0.199898 0.199835 + 0.199781 0.199732 0.199762 0.199843 0.199776 0.199749 0.199735 0.199726 0.199717 0.19971 0.199714 0.199732 + 0.199765 0.199843 0.199922 0.199806 0.199742 0.199695 0.199664 0.199654 0.19967 0.199708 0.199762 0.199843 + 0.199922 </DataArray> <DataArray type="Float32" Name="u" NumberOfComponents="3" format="ascii"> 0 0 0 0 0 0 0 0 0 -1.96011e-05 -1.96011e-05 0 diff --git a/test/references/test_md_poromechanics_el2p_poroelastic-reference.vtu b/test/references/test_md_poromechanics_el2p_poroelastic-reference.vtu index 288fbf0d3653bfe9b77d5e7da93c53584563d123..a8b7bb53a5a8967cc29bbb3f4af55d2b90fdc4ea 100644 --- a/test/references/test_md_poromechanics_el2p_poroelastic-reference.vtu +++ b/test/references/test_md_poromechanics_el2p_poroelastic-reference.vtu @@ -18,29 +18,29 @@ </DataArray> <DataArray type="Float32" Name="u" NumberOfComponents="3" format="ascii"> 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 -7.40626e-06 -7.40626e-06 -7.40625e-06 - 0 0 0 0 0 0 0 0 0 -2.46659e-12 -1.27379e-05 -1.27379e-05 - 0 0 0 0 0 0 0 0 0 7.40626e-06 -7.40626e-06 -7.40626e-06 + 0 0 0 0 0 0 0 0 0 -7.41448e-06 -7.41448e-06 -7.41448e-06 + 0 0 0 0 0 0 0 0 0 -2.95919e-15 -1.27515e-05 -1.27515e-05 + 0 0 0 0 0 0 0 0 0 7.41448e-06 -7.41448e-06 -7.41448e-06 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 0 0 0 -1.27379e-05 -3.00893e-12 -1.27379e-05 - 0 0 0 -1.23457e-12 -2.92265e-12 -2.30867e-05 0 0 0 1.27379e-05 -1.29976e-12 -1.27379e-05 + 0 0 0 0 0 0 0 0 0 -1.27515e-05 5.54018e-14 -1.27515e-05 + 0 0 0 -2.30069e-15 6.79714e-14 -2.31085e-05 0 0 0 1.27515e-05 2.71535e-14 -1.27515e-05 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 -7.40626e-06 7.40626e-06 -7.40626e-06 0 0 0 4.04873e-14 1.27379e-05 -1.27379e-05 - 0 0 0 7.40626e-06 7.40626e-06 -7.40626e-06 0 0 0 0 0 0 + 0 0 0 -7.41448e-06 7.41448e-06 -7.41448e-06 0 0 0 -2.33167e-14 1.27515e-05 -1.27515e-05 + 0 0 0 7.41448e-06 7.41448e-06 -7.41448e-06 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 -1.27379e-05 -1.27379e-05 -3.99074e-12 0 0 0 7.12071e-14 -2.30867e-05 -2.43727e-12 - 0 0 0 1.27379e-05 -1.27379e-05 3.69187e-13 0 0 0 0 0 0 - 0 0 0 -2.30867e-05 -1.98923e-12 -1.10791e-12 1.59704e-12 -1.57776e-12 2.38859e-13 2.30867e-05 -1.87765e-12 6.78184e-13 - 0 0 0 0 0 0 -1.27379e-05 1.27379e-05 1.11563e-13 1.21118e-12 2.30867e-05 1.52881e-12 - 1.27379e-05 1.27379e-05 6.60304e-13 0 0 0 0 0 0 0 0 0 + 0 0 0 -1.27515e-05 -1.27515e-05 4.04532e-14 0 0 0 1.69178e-15 -2.31085e-05 4.08255e-14 + 0 0 0 1.27515e-05 -1.27515e-05 2.5728e-14 0 0 0 0 0 0 + 0 0 0 -2.31085e-05 6.13031e-14 4.08955e-14 3.0484e-14 6.97951e-14 3.50766e-14 2.31085e-05 4.31379e-14 3.74653e-14 + 0 0 0 0 0 0 -1.27515e-05 1.27515e-05 1.21806e-14 -3.49545e-15 2.31085e-05 2.80989e-14 + 1.27515e-05 1.27515e-05 4.02227e-14 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 - 0 0 0 0 0 0 -7.40626e-06 -7.40626e-06 7.40626e-06 0 0 0 - 9.97752e-13 -1.27379e-05 1.27379e-05 0 0 0 7.40626e-06 -7.40626e-06 7.40626e-06 0 0 0 - 0 0 0 0 0 0 -1.27379e-05 3.08884e-13 1.27379e-05 2.21592e-12 1.51379e-12 2.30867e-05 - 1.27379e-05 -2.94281e-13 1.27379e-05 0 0 0 0 0 0 -7.40626e-06 7.40626e-06 7.40626e-06 - 1.68563e-12 1.27379e-05 1.27379e-05 7.40626e-06 7.40626e-06 7.40626e-06 0 0 0 0 0 0 + 0 0 0 0 0 0 -7.41448e-06 -7.41448e-06 7.41448e-06 0 0 0 + 1.5632e-14 -1.27515e-05 1.27515e-05 0 0 0 7.41448e-06 -7.41448e-06 7.41448e-06 0 0 0 + 0 0 0 0 0 0 -1.27515e-05 1.21722e-14 1.27515e-05 3.82396e-14 1.4547e-14 2.31085e-05 + 1.27515e-05 2.73105e-14 1.27515e-05 0 0 0 0 0 0 -7.41448e-06 7.41448e-06 7.41448e-06 + 2.06957e-14 1.27515e-05 1.27515e-05 7.41448e-06 7.41448e-06 7.41448e-06 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0