Skip to content
Snippets Groups Projects
Commit b7c8b442 authored by Christoph Lehmann's avatar Christoph Lehmann
Browse files

[PL] adapted LIE to new getIntPt...() signature

parent 9bc737c6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 88 additions and 16 deletions
ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerFracture.h
+ 18
− 0
View file @ b7c8b442
......@@ -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);
......
ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerInterface.h
+ 18
− 0
View file @ b7c8b442
......@@ -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:
......
ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrix.h
+ 18
− 0
View file @ b7c8b442
......@@ -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);
......
ProcessLib/LIE/SmallDeformation/LocalAssembler/SmallDeformationLocalAssemblerMatrixNearFracture.h
+ 18
− 0
View file @ b7c8b442
......@@ -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);
......
ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp
+ 16
− 16
View file @ b7c8b442
......@@ -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));
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment