Skip to content

Commit 1015024

Browse files
DanielYankuraDanielYankura
committed
Minor changes
- Removed commented out code - Changed Map from nodeset to sideset id to a set of boundary IDs - Added function that allows MOOSE to add an id to this set
1 parent 2a9308e commit 1015024

File tree

2 files changed

+7
-41
lines changed

2 files changed

+7
-41
lines changed

‎include/mesh/boundary_info.h‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -386,17 +386,14 @@ class BoundaryInfo : public ParallelObject
386386
*/
387387
void renumber_id (boundary_id_type old_id, boundary_id_type new_id);
388388

389-
/**
390-
* Returns nodeset id to be used when converting a sideset to a nodeset
391-
*/
392-
boundary_id_type check_renumber_nodeset (boundary_id_type bc_id);
393-
394389
/**
395390
* Checks for existing nodeset that matches with this sideset
396391
*/
397392

398393
bool has_equivalent_nodeset(const Elem * side, boundary_id_type bc_id);
399394

395+
void add_equivalent_sideset(boundary_id_type bc_id) {_sideset_to_nodeset_conversion.insert(bc_id); }
396+
400397
/**
401398
* \returns The number of user-specified boundary ids on the
402399
* semilocal part of the mesh.
@@ -1056,9 +1053,9 @@ class BoundaryInfo : public ParallelObject
10561053
std::set<boundary_id_type> _node_boundary_ids;
10571054

10581055
/**
1059-
* Map from sideset id to nodeset id for when a sideset is converted to a nodeset
1056+
* Set of sideset that are equivalent to their corresponding nodeset
10601057
*/
1061-
std::map<boundary_id_type, boundary_id_type> _sideset_to_nodeset_conversion;
1058+
std::set<boundary_id_type> _sideset_to_nodeset_conversion;
10621059

10631060
/**
10641061
* Set of user-specified boundary IDs for shellfaces *only*.

‎src/mesh/boundary_info.C‎

Lines changed: 3 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1195,7 +1195,7 @@ void BoundaryInfo::add_side(const Elem * elem,
11951195
ElemSideBuilder side_builder;
11961196
const Elem * new_side = &side_builder(*elem, side);
11971197
if (has_equivalent_nodeset(new_side, id))
1198-
_sideset_to_nodeset_conversion.emplace(id, id);
1198+
_sideset_to_nodeset_conversion.insert(id);
11991199
}
12001200

12011201

@@ -1271,7 +1271,7 @@ void BoundaryInfo::add_side(const Elem * elem,
12711271
ElemSideBuilder side_builder;
12721272
const Elem * new_side = &side_builder(*elem, side);
12731273
if (has_equivalent_nodeset(new_side, id))
1274-
_sideset_to_nodeset_conversion.emplace(id, id);
1274+
_sideset_to_nodeset_conversion.insert(id);
12751275
}
12761276
}
12771277

@@ -1916,30 +1916,6 @@ void BoundaryInfo::renumber_id (boundary_id_type old_id,
19161916
this->libmesh_assert_valid_multimaps();
19171917
}
19181918

1919-
boundary_id_type BoundaryInfo::check_renumber_nodeset(boundary_id_type bc_id)
1920-
{
1921-
if (_sideset_to_nodeset_conversion.find(bc_id) != _sideset_to_nodeset_conversion.end())
1922-
// The appropriate sideset->nodeset conversion has already been found and we can skip this check
1923-
return _sideset_to_nodeset_conversion[bc_id];
1924-
// Else search for a nodeset name that matches this sideset's name
1925-
std::string sideset_name = _ss_id_to_name[bc_id];
1926-
for (const auto & ns_id : _node_boundary_ids)
1927-
{
1928-
if (_ns_id_to_name[ns_id] == sideset_name)
1929-
{
1930-
// This sideset and nodeset should be treated the same
1931-
_sideset_to_nodeset_conversion.emplace(bc_id, ns_id);
1932-
return ns_id;
1933-
}
1934-
}
1935-
// Find a suitable id and add to map
1936-
boundary_id_type new_id = _node_boundary_ids.size() + 1;
1937-
while (_node_boundary_ids.find(new_id) != _node_boundary_ids.end())
1938-
new_id++;
1939-
_sideset_to_nodeset_conversion.emplace(bc_id, new_id);
1940-
return new_id;
1941-
}
1942-
19431919
bool BoundaryInfo::has_equivalent_nodeset(const Elem * side, boundary_id_type bc_id)
19441920
{
19451921
bool equivalent_nodeset = false;
@@ -1959,7 +1935,6 @@ bool BoundaryInfo::has_equivalent_nodeset(const Elem * side, boundary_id_type bc
19591935
for (unsigned int i = 0; i < side->n_nodes(); i++)
19601936
{
19611937
const auto node = n_list[i];
1962-
//auto bc_ids = _boundary_node_id.equal_range(node);
19631938
for (const auto & itr : as_range(_boundary_node_id.equal_range(node)))
19641939
{
19651940
if (itr.second == bc_id)
@@ -1969,9 +1944,6 @@ bool BoundaryInfo::has_equivalent_nodeset(const Elem * side, boundary_id_type bc
19691944
}
19701945
else
19711946
equivalent_nodeset = false;
1972-
// no equivalent nodeset exists
1973-
//equivalent_nodeset = false;
1974-
//break;
19751947
}
19761948
if (!equivalent_nodeset)
19771949
break;
@@ -2435,8 +2407,6 @@ BoundaryInfo::build_node_list_from_side_list()
24352407
side = &side_builder(*cur_elem, id_pair.first);
24362408
// Check for equivalent nodeset here. If it has one the next portion can be skipped
24372409
// Add each node node on the side with the side's boundary id
2438-
//if (has_equivalent_nodeset(side, id_pair.second))
2439-
//_sideset_to_nodeset_conversion.emplace(id_pair.second, id_pair.second);
24402410
for (auto i : side->node_index_range())
24412411
{
24422412
const boundary_id_type bcid = id_pair.second;
@@ -2446,8 +2416,7 @@ BoundaryInfo::build_node_list_from_side_list()
24462416
// This sideset overlaps with a nodeset. Throw an error
24472417
libmesh_error_msg("Sideset " << bcid << " has the same ID as a preexisting nodeset. Rename one in order to build a nodeset from this sideset");
24482418
this->add_node(side->node_ptr(i), bcid_renum);
2449-
_sideset_to_nodeset_conversion.emplace(bcid, bcid);
2450-
// _sideset_to_nodeset_conversion.emplace(bcid, bcid_renum);
2419+
_sideset_to_nodeset_conversion.insert(bcid);
24512420
if (!mesh_is_serial)
24522421
{
24532422
const processor_id_type proc_id =

0 commit comments

Comments
 (0)