Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixups for 14124 #14216

Merged
merged 2 commits into from
Oct 23, 2019
Merged

Fixups for 14124 #14216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
136f139
Restrict split mesh test to non-debug modes
lindsayad Oct 22, 2019
61b27de
Smarter check for stateful properties for InterfaceMaterial
lindsayad Oct 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions framework/src/problems/FEProblemBase.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6239,22 +6239,7 @@ FEProblemBase::needBoundaryMaterialOnSide(BoundaryID bnd_id, THREAD_ID tid)
bool
FEProblemBase::needInterfaceMaterialOnSide(BoundaryID bnd_id, THREAD_ID tid)
{
if (_bnd_mat_side_cache[tid].find(bnd_id) == _bnd_mat_side_cache[tid].end())
{
_bnd_mat_side_cache[tid][bnd_id] = false;

if (_nl->needInterfaceMaterialOnSide(bnd_id, tid))
_bnd_mat_side_cache[tid][bnd_id] = true;
else if (theWarehouse()
.query()
.condition<AttribThread>(tid)
.condition<AttribInterfaces>(Interfaces::InterfaceUserObject)
.condition<AttribBoundaries>(bnd_id)
.count() > 0)
_bnd_mat_side_cache[tid][bnd_id] = true;
}

return _bnd_mat_side_cache[tid][bnd_id];
return _residual_interface_materials.hasActiveBoundaryObjects(bnd_id, tid);
}

bool
Expand Down
2 changes: 2 additions & 0 deletions test/tests/materials/interface_material/tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
requirement = 'The system shall be able to grab face and neighboring face variable values and material properties in a single material object that lives on an interface when the mesh is split'
mesh_mode = 'REPLICATED'
recover = false
method = '!dbg' # issue 12033
[]
[jump_split_stateful]
type = Exodiff
Expand All @@ -26,5 +27,6 @@
requirement = 'The system shall be able to calculate stateful material properties in an interface material object'
mesh_mode = 'REPLICATED'
recover = false
method = '!dbg' # issue 12033
[]
[]