Skip to content
Snippets Groups Projects
Commit 33ac7aa8 authored by Dmitri Naumov's avatar Dmitri Naumov
Browse files

Merge branch 'PhaseField' into 'master'

A bug fix in PhaseField parallel example

Closes #3224

See merge request ogs/ogs!3898
parents 9f7f695f 639162cd
No related branches found
No related tags found
No related merge requests found
Showing
with 18 additions and 1 deletion
...@@ -57,7 +57,7 @@ void PhaseFieldIrreversibleDamageOracleBoundaryCondition::preTimestep( ...@@ -57,7 +57,7 @@ void PhaseFieldIrreversibleDamageOracleBoundaryCondition::preTimestep(
const auto g_idx = const auto g_idx =
_dof_table.getGlobalIndex(l, _variable_id, _component_id); _dof_table.getGlobalIndex(l, _variable_id, _component_id);
if ((*x[process_id])[node_id] <= irreversibleDamage) if ((*x[process_id])[g_idx] <= irreversibleDamage)
{ {
_bc_values.ids.emplace_back(g_idx); _bc_values.ids.emplace_back(g_idx);
_bc_values.values.emplace_back(0.0); _bc_values.values.emplace_back(0.0);
......
...@@ -42,3 +42,20 @@ AddTest( ...@@ -42,3 +42,20 @@ AddTest(
expected_AT1_vd_tension_ts_10_t_1_000000_0.vtu AT1_vd_tension_ts_10_t_1_000000_0.vtu displacement displacement 1e-5 0 expected_AT1_vd_tension_ts_10_t_1_000000_0.vtu AT1_vd_tension_ts_10_t_1_000000_0.vtu displacement displacement 1e-5 0
expected_AT1_vd_tension_ts_10_t_1_000000_0.vtu AT1_vd_tension_ts_10_t_1_000000_0.vtu phasefield phasefield 1e-6 0 expected_AT1_vd_tension_ts_10_t_1_000000_0.vtu AT1_vd_tension_ts_10_t_1_000000_0.vtu phasefield phasefield 1e-6 0
) )
AddTest(
NAME PhaseField_3D_beam_tens_AT1_vd_2core
PATH PhaseField/beam
EXECUTABLE ogs
EXECUTABLE_ARGS AT1_vd_tensile.prj
WRAPPER mpirun
WRAPPER_ARGS -np 2
TESTER vtkdiff
REQUIREMENTS OGS_USE_MPI
RUNTIME 18
DIFF_DATA
expected_AT1_vd_tension_2core_ts_10_t_1_000000_0.vtu AT1_vd_tension_ts_10_t_1_000000_0.vtu displacement displacement 1e-5 0
expected_AT1_vd_tension_2core_ts_10_t_1_000000_1.vtu AT1_vd_tension_ts_10_t_1_000000_1.vtu displacement displacement 1e-5 0
expected_AT1_vd_tension_2core_ts_10_t_1_000000_0.vtu AT1_vd_tension_ts_10_t_1_000000_0.vtu phasefield phasefield 1e-6 0
expected_AT1_vd_tension_2core_ts_10_t_1_000000_1.vtu AT1_vd_tension_ts_10_t_1_000000_1.vtu phasefield phasefield 1e-6 0
)
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
File added
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment