Commit 0ed92c36 authored by Dmitry Yu. Naumov's avatar Dmitry Yu. Naumov
Browse files

Merge branch 'TM_fixing' into 'master'

[TM] Fixed the integration order for IP data I/O

See merge request ogs/ogs!3464
parents 90b2d585 b8dc9c59
...@@ -49,7 +49,7 @@ ThermoMechanicsProcess<DisplacementDim>::ThermoMechanicsProcess( ...@@ -49,7 +49,7 @@ ThermoMechanicsProcess<DisplacementDim>::ThermoMechanicsProcess(
std::make_unique<IntegrationPointWriter>( std::make_unique<IntegrationPointWriter>(
"sigma_ip", "sigma_ip",
static_cast<int>(mesh.getDimension() == 2 ? 4 : 6) /*n components*/, static_cast<int>(mesh.getDimension() == 2 ? 4 : 6) /*n components*/,
2 /*integration order*/, [this]() { integration_order, [this]() {
// Result containing integration point data for each local // Result containing integration point data for each local
// assembler. // assembler.
std::vector<std::vector<double>> result; std::vector<std::vector<double>> result;
...@@ -69,7 +69,7 @@ ThermoMechanicsProcess<DisplacementDim>::ThermoMechanicsProcess( ...@@ -69,7 +69,7 @@ ThermoMechanicsProcess<DisplacementDim>::ThermoMechanicsProcess(
std::make_unique<IntegrationPointWriter>( std::make_unique<IntegrationPointWriter>(
"epsilon_ip", "epsilon_ip",
static_cast<int>(mesh.getDimension() == 2 ? 4 : 6) /*n components*/, static_cast<int>(mesh.getDimension() == 2 ? 4 : 6) /*n components*/,
2 /*integration order*/, [this]() { integration_order, [this]() {
// Result containing integration point data for each local // Result containing integration point data for each local
// assembler. // assembler.
std::vector<std::vector<double>> result; std::vector<std::vector<double>> result;
...@@ -89,7 +89,7 @@ ThermoMechanicsProcess<DisplacementDim>::ThermoMechanicsProcess( ...@@ -89,7 +89,7 @@ ThermoMechanicsProcess<DisplacementDim>::ThermoMechanicsProcess(
std::make_unique<IntegrationPointWriter>( std::make_unique<IntegrationPointWriter>(
"epsilon_m_ip", "epsilon_m_ip",
static_cast<int>(mesh.getDimension() == 2 ? 4 : 6) /*n components*/, static_cast<int>(mesh.getDimension() == 2 ? 4 : 6) /*n components*/,
2 /*integration order*/, [this]() { integration_order, [this]() {
// Result containing integration point data for each local // Result containing integration point data for each local
// assembler. // assembler.
std::vector<std::vector<double>> result; std::vector<std::vector<double>> result;
......
Markdown is supported
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