Skip to content

Commit

Permalink
Use neighbor data when _neighbor in Material
Browse files Browse the repository at this point in the history
  • Loading branch information
lindsayad committed Dec 7, 2023
1 parent d450a50 commit f5e95e7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 5 additions & 3 deletions framework/src/materials/Material.C
Expand Up @@ -35,9 +35,11 @@ Material::Material(const InputParameters & parameters)
MaterialPropertyInterface(this, blockIDs(), boundaryIDs()),
_bnd(_material_data_type != Moose::BLOCK_MATERIAL_DATA),
_neighbor(_material_data_type == Moose::NEIGHBOR_MATERIAL_DATA),
_q_point(_bnd ? _assembly.qPointsFace() : _assembly.qPoints()),
_qrule(_bnd ? _assembly.qRuleFace() : _assembly.qRule()),
_JxW(_bnd ? _assembly.JxWFace() : _assembly.JxW()),
_q_point(_bnd ? (_neighbor ? _assembly.qPointsFaceNeighbor() : _assembly.qPointsFace())
: _assembly.qPoints()),
_qrule(_bnd ? (_neighbor ? _assembly.qRuleNeighbor() : _assembly.qRuleFace())
: _assembly.qRule()),
_JxW(_bnd ? (_neighbor ? _assembly.JxWNeighbor() : _assembly.JxWFace()) : _assembly.JxW()),
_current_elem(_neighbor ? _assembly.neighbor() : _assembly.elem()),
_current_subdomain_id(_neighbor ? _assembly.currentNeighborSubdomainID()
: _assembly.currentSubdomainID()),
Expand Down
2 changes: 1 addition & 1 deletion framework/src/problems/FEProblemBase.C
Expand Up @@ -3580,7 +3580,7 @@ FEProblemBase::reinitMaterialsNeighbor(const SubdomainID blk_id,
"The provided blk_id " << blk_id << " and neighbor subdomain ID "
<< neighbor->subdomain_id() << " do not match.");

unsigned int n_points = _assembly[tid][0]->qRuleFace()->n_points();
unsigned int n_points = _assembly[tid][0]->qRuleNeighbor()->n_points();

auto & neighbor_material_data = _neighbor_material_props.getMaterialData(tid);
neighbor_material_data.resize(n_points);
Expand Down

0 comments on commit f5e95e7

Please sign in to comment.