diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsFEM-impl.h b/ProcessLib/ThermoMechanics/ThermoMechanicsFEM-impl.h index cfd6b0048b0ab49daa48ec549d5d9b857ccb23f2..3b2ead2e11dacf464353281777bdb0feee977265 100644 --- a/ProcessLib/ThermoMechanics/ThermoMechanicsFEM-impl.h +++ b/ProcessLib/ThermoMechanics/ThermoMechanicsFEM-impl.h @@ -127,13 +127,13 @@ void ThermoMechanicsLocalAssembler<ShapeFunction, IntegrationMethod, auto& state = _ip_data[ip].material_state_variables; - const double T = N.dot(local_T); // T at integration point - double const dT = T - N.dot(local_T0); + const double T_ip = N.dot(local_T); // T at integration point + double const dT_ip = T_ip - N.dot(local_T0); // calculate thermally induced strain // assume isotropic thermal expansion auto const alpha = _process_data.linear_thermal_expansion_coefficient( t, x_position)[0]; - double const linear_thermal_strain_increment = alpha * dT; + double const linear_thermal_strain_increment = alpha * dT_ip; // // displacement equation, displacement part @@ -150,7 +150,7 @@ void ThermoMechanicsLocalAssembler<ShapeFunction, IntegrationMethod, linear_thermal_strain_increment * Invariants::identity2; auto&& solution = _ip_data[ip].solid_material.integrateStress( - t, x_position, dt, eps_m_prev, eps_m, sigma_prev, *state, T); + t, x_position, dt, eps_m_prev, eps_m, sigma_prev, *state, T_ip); if (!solution) { @@ -258,8 +258,8 @@ void ThermoMechanicsLocalAssembler<ShapeFunction, IntegrationMethod, auto const alpha = _process_data.linear_thermal_expansion_coefficient( t, x_position)[0]; - double const dT = N.dot(local_dT); - double const linear_thermal_strain_increment = alpha * dT; + double const dT_ip = N.dot(local_dT); + double const linear_thermal_strain_increment = alpha * dT_ip; rho_s = _ip_data[ip].solid_density_prev / (1 + 3 * linear_thermal_strain_increment); auto const c_p = _process_data.specific_heat_capacity(t, x_position)[0]; diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.cpp b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.cpp index ec69da0d59d60c76a31e5f50e6735c86aeb1abcd..5de891465fa24418c0bccb336d4b43869c3cea0d 100644 --- a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.cpp +++ b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.cpp @@ -286,9 +286,9 @@ void ThermoMechanicsProcess<DisplacementDim>::initializeBoundaryConditions() { if (_use_monolithic_scheme) { - const int process_id_of_thermomechancs = 0; + const int process_id_of_thermomechanics = 0; initializeProcessBoundaryConditionsAndSourceTerms( - *_local_to_global_index_map, process_id_of_thermomechancs); + *_local_to_global_index_map, process_id_of_thermomechanics); return; } @@ -429,8 +429,7 @@ void ThermoMechanicsProcess<DisplacementDim>::preTimestepConcreteProcess( assert(process_id < 2); - if (_use_monolithic_scheme || - process_id == _process_data.mechanics_process_id) + if (process_id == _process_data.mechanics_process_id) { GlobalExecutor::executeSelectedMemberOnDereferenced( &ThermoMechanicsLocalAssemblerInterface::preTimestep,