Skip to content

Commit ee94d5b

Browse files
OpenFOAMFansOpenFOAMFans
authored
Merge pull request #279 from pkuLmq/master
change "hexRef8" to "hexRef8of" to avoid conflict
2 parents 913df41 + 8392bf1 commit ee94d5b

File tree

4 files changed

+59
-59
lines changed

4 files changed

+59
-59
lines changed

‎src/dynamicMesh/Make/files‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ $(hexRef)/hexRefData.C
55
$(hexRef)/dfRefinementHistory.C
66
$(hexRef)/hexRefNew.C
77

8-
$(hexRef)/hexRef8/hexRef8.C
8+
$(hexRef)/hexRef8of/hexRef8of.C
99
$(hexRef)/hexRef4/hexRef4.C
1010
$(hexRef)/hexRef4Axi/hexRef4Axi.C
1111
$(hexRef)/hexRef2/hexRef2.C

src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef/hexRef8/hexRef8.C renamed to src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef/hexRef8of/hexRef8of.C

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ License
2323
2424
\*---------------------------------------------------------------------------*/
2525

26-
#include "hexRef8.H"
26+
#include "hexRef8of.H"
2727

2828
#include "addToRunTimeSelectionTable.H"
2929

@@ -51,18 +51,18 @@ License
5151

5252
namespace Foam
5353
{
54-
defineTypeNameAndDebug(hexRef8, 0);
55-
addToRunTimeSelectionTable(hexRef, hexRef8, mesh);
56-
addToRunTimeSelectionTable(hexRef, hexRef8, levelsHist);
57-
addToRunTimeSelectionTable(hexRef, hexRef8, levels);
54+
defineTypeNameAndDebug(hexRef8of, 0);
55+
addToRunTimeSelectionTable(hexRef, hexRef8of, mesh);
56+
addToRunTimeSelectionTable(hexRef, hexRef8of, levelsHist);
57+
addToRunTimeSelectionTable(hexRef, hexRef8of, levels);
5858
}
5959

6060

6161
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
6262

6363
// Check whether pointi is an anchor on celli.
6464
// If it is not check whether any other point on the face is an anchor cell.
65-
Foam::label Foam::hexRef8::getAnchorCell
65+
Foam::label Foam::hexRef8of::getAnchorCell
6666
(
6767
const labelListList& cellAnchorPoints,
6868
const labelListList& cellAddedCells,
@@ -125,7 +125,7 @@ Foam::label Foam::hexRef8::getAnchorCell
125125
// we add the face. Note that this routine can get called anywhere from
126126
// two times (two unrefined faces) to four times (two refined faces) so
127127
// the first call that adds the information creates the face.
128-
Foam::label Foam::hexRef8::storeMidPointInfo
128+
Foam::label Foam::hexRef8of::storeMidPointInfo
129129
(
130130
const labelListList& cellAnchorPoints,
131131
const labelListList& cellAddedCells,
@@ -356,7 +356,7 @@ Foam::label Foam::hexRef8::storeMidPointInfo
356356

357357

358358
// Creates all the 12 internal faces for celli.
359-
void Foam::hexRef8::createInternalFaces
359+
void Foam::hexRef8of::createInternalFaces
360360
(
361361
const labelListList& cellAnchorPoints,
362362
const labelListList& cellAddedCells,
@@ -643,14 +643,14 @@ void Foam::hexRef8::createInternalFaces
643643
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
644644

645645
// Construct from mesh, read refinement data
646-
Foam::hexRef8::hexRef8(const polyMesh& mesh, const bool readHistory)
646+
Foam::hexRef8of::hexRef8of(const polyMesh& mesh, const bool readHistory)
647647
:
648648
hexRef(mesh, readHistory)
649649
{}
650650

651651

652652
// Construct from components
653-
Foam::hexRef8::hexRef8
653+
Foam::hexRef8of::hexRef8of
654654
(
655655
const polyMesh& mesh,
656656
const labelList& cellLevel,
@@ -664,7 +664,7 @@ Foam::hexRef8::hexRef8
664664

665665

666666
// Construct from components
667-
Foam::hexRef8::hexRef8
667+
Foam::hexRef8of::hexRef8of
668668
(
669669
const polyMesh& mesh,
670670
const labelList& cellLevel,
@@ -679,15 +679,15 @@ Foam::hexRef8::hexRef8
679679
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
680680

681681
// Top level driver to insert topo changes to do all refinement.
682-
Foam::labelListList Foam::hexRef8::setRefinement
682+
Foam::labelListList Foam::hexRef8of::setRefinement
683683
(
684684
const labelList& cellLabels,
685685
polyTopoChange& meshMod
686686
)
687687
{
688688
if (debug)
689689
{
690-
Pout<< "hexRef8::setRefinement :"
690+
Pout<< "hexRef8of::setRefinement :"
691691
<< " Checking initial mesh just to make sure" << endl;
692692

693693
checkMesh();
@@ -716,7 +716,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
716716

717717
if (debug)
718718
{
719-
Pout<< "hexRef8::setRefinement :"
719+
Pout<< "hexRef8of::setRefinement :"
720720
<< " Allocating " << cellLabels.size() << " cell midpoints."
721721
<< endl;
722722
}
@@ -760,7 +760,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
760760
}
761761
}
762762

763-
Pout<< "hexRef8::setRefinement : Dumping " << splitCells.size()
763+
Pout<< "hexRef8of::setRefinement : Dumping " << splitCells.size()
764764
<< " cells to split to cellSet " << splitCells.objectPath()
765765
<< endl;
766766

@@ -774,7 +774,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
774774

775775
if (debug)
776776
{
777-
Pout<< "hexRef8::setRefinement :"
777+
Pout<< "hexRef8of::setRefinement :"
778778
<< " Allocating edge midpoints."
779779
<< endl;
780780
}
@@ -895,7 +895,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
895895
}
896896
}
897897

898-
Pout<< "hexRef8::setRefinement :"
898+
Pout<< "hexRef8of::setRefinement :"
899899
<< " Dumping edge centres to split to file " << str.name() << endl;
900900
}
901901

@@ -906,7 +906,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
906906

907907
if (debug)
908908
{
909-
Pout<< "hexRef8::setRefinement :"
909+
Pout<< "hexRef8of::setRefinement :"
910910
<< " Allocating face midpoints."
911911
<< endl;
912912
}
@@ -1078,7 +1078,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
10781078
}
10791079
}
10801080

1081-
Pout<< "hexRef8::setRefinement : Dumping " << splitFaces.size()
1081+
Pout<< "hexRef8of::setRefinement : Dumping " << splitFaces.size()
10821082
<< " faces to split to faceSet " << splitFaces.objectPath() << endl;
10831083

10841084
splitFaces.write();
@@ -1100,7 +1100,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
11001100

11011101
if (debug)
11021102
{
1103-
Pout<< "hexRef8::setRefinement :"
1103+
Pout<< "hexRef8of::setRefinement :"
11041104
<< " Finding cell anchorPoints (8 per cell)"
11051105
<< endl;
11061106
}
@@ -1183,7 +1183,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
11831183

11841184
if (debug)
11851185
{
1186-
Pout<< "hexRef8::setRefinement :"
1186+
Pout<< "hexRef8of::setRefinement :"
11871187
<< " Adding cells (1 per anchorPoint)"
11881188
<< endl;
11891189
}
@@ -1236,7 +1236,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
12361236

12371237
if (debug)
12381238
{
1239-
Pout<< "hexRef8::setRefinement :"
1239+
Pout<< "hexRef8of::setRefinement :"
12401240
<< " Marking faces to be handled"
12411241
<< endl;
12421242
}
@@ -1286,7 +1286,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
12861286

12871287
if (debug)
12881288
{
1289-
Pout<< "hexRef8::setRefinement : Splitting faces" << endl;
1289+
Pout<< "hexRef8of::setRefinement : Splitting faces" << endl;
12901290
}
12911291

12921292
forAll(faceMidPoint, facei)
@@ -1422,7 +1422,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
14221422

14231423
if (debug)
14241424
{
1425-
Pout<< "hexRef8::setRefinement :"
1425+
Pout<< "hexRef8of::setRefinement :"
14261426
<< " Adding edge splits to unsplit faces"
14271427
<< endl;
14281428
}
@@ -1535,7 +1535,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
15351535

15361536
if (debug)
15371537
{
1538-
Pout<< "hexRef8::setRefinement :"
1538+
Pout<< "hexRef8of::setRefinement :"
15391539
<< " Changing owner/neighbour for otherwise unaffected faces"
15401540
<< endl;
15411541
}
@@ -1580,7 +1580,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
15801580

15811581
if (debug)
15821582
{
1583-
Pout<< "hexRef8::setRefinement :"
1583+
Pout<< "hexRef8of::setRefinement :"
15841584
<< " Create new internal faces for split cells"
15851585
<< endl;
15861586
}
@@ -1664,7 +1664,7 @@ Foam::labelListList Foam::hexRef8::setRefinement
16641664
{
16651665
if (debug)
16661666
{
1667-
Pout<< "hexRef8::setRefinement :"
1667+
Pout<< "hexRef8of::setRefinement :"
16681668
<< " Updating refinement history to " << cellLevel_.size()
16691669
<< " cells" << endl;
16701670
}
@@ -1699,15 +1699,15 @@ Foam::labelListList Foam::hexRef8::setRefinement
16991699
}
17001700

17011701

1702-
Foam::labelList Foam::hexRef8::consistentUnrefinement
1702+
Foam::labelList Foam::hexRef8of::consistentUnrefinement
17031703
(
17041704
const labelList& elemsToUnrefine,
17051705
const bool maxSet
17061706
) const
17071707
{
17081708
if (debug)
17091709
{
1710-
Pout<< "hexRef8::consistentUnrefinement :"
1710+
Pout<< "hexRef8of::consistentUnrefinement :"
17111711
<< " Determining 2:1 consistent unrefinement" << endl;
17121712
}
17131713

@@ -1718,7 +1718,7 @@ Foam::labelList Foam::hexRef8::consistentUnrefinement
17181718
<< abort(FatalError);
17191719
}
17201720

1721-
// For hexRef8, unrefinement is based on points
1721+
// For hexRef8of, unrefinement is based on points
17221722
const labelList& pointsToUnrefine(elemsToUnrefine);
17231723

17241724
// Loop, modifying pointsToUnrefine, until no more changes to due to 2:1
@@ -1875,7 +1875,7 @@ Foam::labelList Foam::hexRef8::consistentUnrefinement
18751875

18761876
if (debug)
18771877
{
1878-
Pout<< "hexRef8::consistentUnrefinement :"
1878+
Pout<< "hexRef8of::consistentUnrefinement :"
18791879
<< " Changed " << nChanged
18801880
<< " refinement levels due to 2:1 conflicts."
18811881
<< endl;
@@ -1935,7 +1935,7 @@ Foam::labelList Foam::hexRef8::consistentUnrefinement
19351935
return newPointsToUnrefine;
19361936
}
19371937

1938-
void Foam::hexRef8::setUnrefinement
1938+
void Foam::hexRef8of::setUnrefinement
19391939
(
19401940
const labelList& splitElemLabels,
19411941
polyTopoChange& meshMod
@@ -1948,12 +1948,12 @@ void Foam::hexRef8::setUnrefinement
19481948
<< abort(FatalError);
19491949
}
19501950

1951-
// For hexRef8, unrefinement is based on points
1951+
// For hexRef8of, unrefinement is based on points
19521952
const labelList& splitPointLabels(splitElemLabels);
19531953

19541954
if (debug)
19551955
{
1956-
Pout<< "hexRef8::setUnrefinement :"
1956+
Pout<< "hexRef8of::setUnrefinement :"
19571957
<< " Checking initial mesh just to make sure" << endl;
19581958

19591959
checkMesh();
@@ -1987,7 +1987,7 @@ void Foam::hexRef8::setUnrefinement
19871987
}
19881988
cSet.write();
19891989

1990-
Pout<< "hexRef8::setRefinement : Dumping " << pSet.size()
1990+
Pout<< "hexRef8of::setRefinement : Dumping " << pSet.size()
19911991
<< " points and "
19921992
<< cSet.size() << " cells for unrefinement to" << nl
19931993
<< " pointSet " << pSet.objectPath() << nl
@@ -2126,7 +2126,7 @@ void Foam::hexRef8::setUnrefinement
21262126
// history_.updateMesh will take care of truncating.
21272127
}
21282128

2129-
void Foam::hexRef8::calcFaceToSplitPoint
2129+
void Foam::hexRef8of::calcFaceToSplitPoint
21302130
(
21312131
const labelList& splitElems,
21322132
Map<label>& faceToSplitPoint
@@ -2135,7 +2135,7 @@ void Foam::hexRef8::calcFaceToSplitPoint
21352135
// Save information on faces that will be combined
21362136
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
21372137

2138-
// For hexRef8, the split elems are points
2138+
// For hexRef8of, the split elems are points
21392139
const labelList& splitPoints(splitElems);
21402140

21412141
faceToSplitPoint.resize(3*splitElems.size());
@@ -2163,7 +2163,7 @@ void Foam::hexRef8::calcFaceToSplitPoint
21632163
}
21642164

21652165

2166-
Foam::labelList Foam::hexRef8::getSplitElems() const
2166+
Foam::labelList Foam::hexRef8of::getSplitElems() const
21672167
{
21682168
if (debug)
21692169
{
@@ -2172,7 +2172,7 @@ Foam::labelList Foam::hexRef8::getSplitElems() const
21722172

21732173
if (debug)
21742174
{
2175-
Pout<< "hexRef8::getSplitPoints :"
2175+
Pout<< "hexRef8of::getSplitPoints :"
21762176
<< " Calculating unrefineable points" << endl;
21772177
}
21782178

@@ -2304,7 +2304,7 @@ Foam::labelList Foam::hexRef8::getSplitElems() const
23042304
}
23052305

23062306

2307-
Foam::labelList Foam::hexRef8::selectUnrefineElems
2307+
Foam::labelList Foam::hexRef8of::selectUnrefineElems
23082308
(
23092309
const scalar unrefineLevel,
23102310
const PackedBoolList& markedCell,

0 commit comments

Comments
 (0)