diff --git a/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerFracture.h b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerFracture.h index cf2058304a43464b1767a2f4b486cc9d818de2d2..6a4a398b18bfd4f72bac6e3b3581c82b1cac55e2 100644 --- a/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerFracture.h +++ b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerFracture.h @@ -158,30 +158,45 @@ public: } std::vector<double> const& getIntPtEpsilonXX( + const double /*t*/, + GlobalVector const& /*current_solution*/, + NumLib::LocalToGlobalIndexMap const& /*dof_table*/, std::vector<double>& cache) const override { return getIntPtEpsilon(cache, 0); } std::vector<double> const& getIntPtEpsilonYY( + const double /*t*/, + GlobalVector const& /*current_solution*/, + NumLib::LocalToGlobalIndexMap const& /*dof_table*/, std::vector<double>& cache) const override { return getIntPtEpsilon(cache, 1); } std::vector<double> const& getIntPtEpsilonZZ( + const double /*t*/, + GlobalVector const& /*current_solution*/, + NumLib::LocalToGlobalIndexMap const& /*dof_table*/, std::vector<double>& cache) const override { return getIntPtEpsilon(cache, 2); } std::vector<double> const& getIntPtEpsilonXY( + const double /*t*/, + GlobalVector const& /*current_solution*/, + NumLib::LocalToGlobalIndexMap const& /*dof_table*/, std::vector<double>& cache) const override { return getIntPtEpsilon(cache, 3); } std::vector<double> const& getIntPtEpsilonXZ( + const double /*t*/, + GlobalVector const& /*current_solution*/, + NumLib::LocalToGlobalIndexMap const& /*dof_table*/, std::vector<double>& cache) const override { assert(DisplacementDim == 3); @@ -189,6 +204,9 @@ public: } std::vector<double> const& getIntPtEpsilonYZ( + const double /*t*/, + GlobalVector const& /*current_solution*/, + NumLib::LocalToGlobalIndexMap const& /*dof_table*/, std::vector<double>& cache) const override { assert(DisplacementDim == 3); diff --git a/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerInterface.h b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerInterface.h index 7d5e91fcbb0c11f88ac59eb2d06489944ea8bbdc..907b70fa56cfb215c81327866c8b6be7a16d4faf 100644 --- a/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerInterface.h +++ b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerInterface.h @@ -119,21 +119,39 @@ public: std::vector<double>& cache) const = 0; virtual std::vector<double> const& getIntPtEpsilonXX( + const double /*t*/, + GlobalVector const& /*current_solution*/, + NumLib::LocalToGlobalIndexMap const& /*dof_table*/, std::vector<double>& cache) const = 0; virtual std::vector<double> const& getIntPtEpsilonYY( + const double /*t*/, + GlobalVector const& /*current_solution*/, + NumLib::LocalToGlobalIndexMap const& /*dof_table*/, std::vector<double>& cache) const = 0; virtual std::vector<double> const& getIntPtEpsilonZZ( + const double /*t*/, + GlobalVector const& /*current_solution*/, + NumLib::LocalToGlobalIndexMap const& /*dof_table*/, std::vector<double>& cache) const = 0; virtual std::vector<double> const& getIntPtEpsilonXY( + const double /*t*/, + GlobalVector const& /*current_solution*/, + NumLib::LocalToGlobalIndexMap const& /*dof_table*/, std::vector<double>& cache) const = 0; virtual std::vector<double> const& getIntPtEpsilonXZ( + const double /*t*/, + GlobalVector const& /*current_solution*/, + NumLib::LocalToGlobalIndexMap const& /*dof_table*/, std::vector<double>& cache) const = 0; virtual std::vector<double> const& getIntPtEpsilonYZ( + const double /*t*/, + GlobalVector const& /*current_solution*/, + NumLib::LocalToGlobalIndexMap const& /*dof_table*/, std::vector<double>& cache) const = 0; private: diff --git a/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrix.h b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrix.h index 132982937dbc871835ab3fab99d6d45272a39084..b8eb7ff4cb96acb08ba67cb87bb3b0f279c63936 100644 --- a/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrix.h +++ b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrix.h @@ -158,30 +158,45 @@ public: } std::vector<double> const& getIntPtEpsilonXX( + const double /*t*/, + GlobalVector const& /*current_solution*/, + NumLib::LocalToGlobalIndexMap const& /*dof_table*/, std::vector<double>& cache) const override { return getIntPtEpsilon(cache, 0); } std::vector<double> const& getIntPtEpsilonYY( + const double /*t*/, + GlobalVector const& /*current_solution*/, + NumLib::LocalToGlobalIndexMap const& /*dof_table*/, std::vector<double>& cache) const override { return getIntPtEpsilon(cache, 1); } std::vector<double> const& getIntPtEpsilonZZ( + const double /*t*/, + GlobalVector const& /*current_solution*/, + NumLib::LocalToGlobalIndexMap const& /*dof_table*/, std::vector<double>& cache) const override { return getIntPtEpsilon(cache, 2); } std::vector<double> const& getIntPtEpsilonXY( + const double /*t*/, + GlobalVector const& /*current_solution*/, + NumLib::LocalToGlobalIndexMap const& /*dof_table*/, std::vector<double>& cache) const override { return getIntPtEpsilon(cache, 3); } std::vector<double> const& getIntPtEpsilonXZ( + const double /*t*/, + GlobalVector const& /*current_solution*/, + NumLib::LocalToGlobalIndexMap const& /*dof_table*/, std::vector<double>& cache) const override { assert(DisplacementDim == 3); @@ -189,6 +204,9 @@ public: } std::vector<double> const& getIntPtEpsilonYZ( + const double /*t*/, + GlobalVector const& /*current_solution*/, + NumLib::LocalToGlobalIndexMap const& /*dof_table*/, std::vector<double>& cache) const override { assert(DisplacementDim == 3); diff --git a/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrixNearFracture.h b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrixNearFracture.h index c78937f96c1f0907e542a78d8eb9e15e9f00bd62..a91d872156526a94ac1bce973df5338d26aba54d 100644 --- a/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrixNearFracture.h +++ b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrixNearFracture.h @@ -160,30 +160,45 @@ public: } std::vector<double> const& getIntPtEpsilonXX( + const double /*t*/, + GlobalVector const& /*current_solution*/, + NumLib::LocalToGlobalIndexMap const& /*dof_table*/, std::vector<double>& cache) const override { return getIntPtEpsilon(cache, 0); } std::vector<double> const& getIntPtEpsilonYY( + const double /*t*/, + GlobalVector const& /*current_solution*/, + NumLib::LocalToGlobalIndexMap const& /*dof_table*/, std::vector<double>& cache) const override { return getIntPtEpsilon(cache, 1); } std::vector<double> const& getIntPtEpsilonZZ( + const double /*t*/, + GlobalVector const& /*current_solution*/, + NumLib::LocalToGlobalIndexMap const& /*dof_table*/, std::vector<double>& cache) const override { return getIntPtEpsilon(cache, 2); } std::vector<double> const& getIntPtEpsilonXY( + const double /*t*/, + GlobalVector const& /*current_solution*/, + NumLib::LocalToGlobalIndexMap const& /*dof_table*/, std::vector<double>& cache) const override { return getIntPtEpsilon(cache, 3); } std::vector<double> const& getIntPtEpsilonXZ( + const double /*t*/, + GlobalVector const& /*current_solution*/, + NumLib::LocalToGlobalIndexMap const& /*dof_table*/, std::vector<double>& cache) const override { assert(DisplacementDim == 3); @@ -191,6 +206,9 @@ public: } std::vector<double> const& getIntPtEpsilonYZ( + const double /*t*/, + GlobalVector const& /*current_solution*/, + NumLib::LocalToGlobalIndexMap const& /*dof_table*/, std::vector<double>& cache) const override { assert(DisplacementDim == 3); diff --git a/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp index 6eb8c4598b5a89d4429f32f915fd4cb7af3fa06b..1035c8e2214c37a8bd46be6d9918a82dec07701b 100644 --- a/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp +++ b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp @@ -212,54 +212,54 @@ void SmallDeformationProcess<DisplacementDim>::initializeConcreteProcess( if (DisplacementDim == 3) { Base::_secondary_variables.addSecondaryVariable( - "sigma_xz", 1, + "sigma_xz", makeExtrapolator( - getExtrapolator(), _local_assemblers, + 1, getExtrapolator(), _local_assemblers, &SmallDeformationLocalAssemblerInterface::getIntPtSigmaXZ)); Base::_secondary_variables.addSecondaryVariable( - "sigma_yz", 1, + "sigma_yz", makeExtrapolator( - getExtrapolator(), _local_assemblers, + 1, getExtrapolator(), _local_assemblers, &SmallDeformationLocalAssemblerInterface::getIntPtSigmaYZ)); } Base::_secondary_variables.addSecondaryVariable( - "epsilon_xx", 1, + "epsilon_xx", makeExtrapolator( - getExtrapolator(), _local_assemblers, + 1, getExtrapolator(), _local_assemblers, &SmallDeformationLocalAssemblerInterface::getIntPtEpsilonXX)); Base::_secondary_variables.addSecondaryVariable( - "epsilon_yy", 1, + "epsilon_yy", makeExtrapolator( - getExtrapolator(), _local_assemblers, + 1, getExtrapolator(), _local_assemblers, &SmallDeformationLocalAssemblerInterface::getIntPtEpsilonYY)); Base::_secondary_variables.addSecondaryVariable( - "epsilon_zz", 1, + "epsilon_zz", makeExtrapolator( - getExtrapolator(), _local_assemblers, + 1, getExtrapolator(), _local_assemblers, &SmallDeformationLocalAssemblerInterface::getIntPtEpsilonZZ)); Base::_secondary_variables.addSecondaryVariable( - "epsilon_xy", 1, + "epsilon_xy", makeExtrapolator( - getExtrapolator(), _local_assemblers, + 1, getExtrapolator(), _local_assemblers, &SmallDeformationLocalAssemblerInterface::getIntPtEpsilonXY)); if (DisplacementDim == 3) { Base::_secondary_variables.addSecondaryVariable( - "epsilon_xz", 1, + "epsilon_xz", makeExtrapolator( - getExtrapolator(), _local_assemblers, + 1, getExtrapolator(), _local_assemblers, &SmallDeformationLocalAssemblerInterface::getIntPtEpsilonXZ)); Base::_secondary_variables.addSecondaryVariable( - "epsilon_yz", 1, + "epsilon_yz", makeExtrapolator( - getExtrapolator(), _local_assemblers, + 1, getExtrapolator(), _local_assemblers, &SmallDeformationLocalAssemblerInterface::getIntPtEpsilonYZ)); }