From f870310c01fa0dfb6c323ee52fd702de1ca06d41 Mon Sep 17 00:00:00 2001
From: Guanyang Xue <playlego@gmail.com>
Date: Sat, 17 Feb 2024 00:39:36 -0500
Subject: [PATCH 1/2] OF-v2306 compatible

---
 src/Make/linux64GccDPInt32Debug/options       | 64 -------------------
 src/Make/linux64GccDPInt32Debug/sourceFiles   |  5 --
 src/Make/linux64GccDPInt32Debug/variables     |  1 -
 src/Make/linux64GccDPInt32Opt/options         | 64 -------------------
 src/Make/linux64GccDPInt32Opt/sourceFiles     |  5 --
 src/Make/linux64GccDPInt32Opt/variables       |  1 -
 src/Make/options                              |  8 +--
 .../dynamicRefine2DFvMesh.C                   | 28 ++++----
 .../dynamicRefine2DFvMesh.H                   |  7 +-
 src/hexRef2D/hexRef2D.C                       | 26 ++++----
 10 files changed, 35 insertions(+), 174 deletions(-)
 delete mode 100644 src/Make/linux64GccDPInt32Debug/options
 delete mode 100644 src/Make/linux64GccDPInt32Debug/sourceFiles
 delete mode 100644 src/Make/linux64GccDPInt32Debug/variables
 delete mode 100644 src/Make/linux64GccDPInt32Opt/options
 delete mode 100644 src/Make/linux64GccDPInt32Opt/sourceFiles
 delete mode 100644 src/Make/linux64GccDPInt32Opt/variables

diff --git a/src/Make/linux64GccDPInt32Debug/options b/src/Make/linux64GccDPInt32Debug/options
deleted file mode 100644
index 60509bc..0000000
--- a/src/Make/linux64GccDPInt32Debug/options
+++ /dev/null
@@ -1,64 +0,0 @@
-# 1 "Make/options"
-# 1 "<built-in>"
-# 1 "<command-line>"
-# 10 "<command-line>"
-# 1 "/usr/include/stdc-predef.h" 1 3 4
-
-# 17 "/usr/include/stdc-predef.h" 3 4
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# 10 "<command-line>" 2
-# 1 "Make/options"
-EXE_INC = -I$(LIB_SRC)/finiteVolume/lnInclude -I$(LIB_SRC)/surfMesh/lnInclude -I$(LIB_SRC)/meshTools/lnInclude -I$(LIB_SRC)/mesh/extrudeModel/lnInclude 	-I$(LIB_SRC)/dynamicMesh/lnInclude 	-I$(LIB_SRC)/dynamicFvMesh/lnInclude
-
-
-
-
-
-
-
-LIB_LIBS = -lfiniteVolume -lsurfMesh -lextrudeModel 	-ldynamicMesh 	-ldynamicFvMesh
diff --git a/src/Make/linux64GccDPInt32Debug/sourceFiles b/src/Make/linux64GccDPInt32Debug/sourceFiles
deleted file mode 100644
index 2060dfe..0000000
--- a/src/Make/linux64GccDPInt32Debug/sourceFiles
+++ /dev/null
@@ -1,5 +0,0 @@
-SOURCE = \
-hexRef2D.C \
-dynamicRefineFvMesh2D.C \
-
-# sources
diff --git a/src/Make/linux64GccDPInt32Debug/variables b/src/Make/linux64GccDPInt32Debug/variables
deleted file mode 100644
index 8fadb31..0000000
--- a/src/Make/linux64GccDPInt32Debug/variables
+++ /dev/null
@@ -1 +0,0 @@
-LIB = $(FOAM_USER_LIBBIN)/libTest2dDynamicRefine
diff --git a/src/Make/linux64GccDPInt32Opt/options b/src/Make/linux64GccDPInt32Opt/options
deleted file mode 100644
index 60509bc..0000000
--- a/src/Make/linux64GccDPInt32Opt/options
+++ /dev/null
@@ -1,64 +0,0 @@
-# 1 "Make/options"
-# 1 "<built-in>"
-# 1 "<command-line>"
-# 10 "<command-line>"
-# 1 "/usr/include/stdc-predef.h" 1 3 4
-
-# 17 "/usr/include/stdc-predef.h" 3 4
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-# 10 "<command-line>" 2
-# 1 "Make/options"
-EXE_INC = -I$(LIB_SRC)/finiteVolume/lnInclude -I$(LIB_SRC)/surfMesh/lnInclude -I$(LIB_SRC)/meshTools/lnInclude -I$(LIB_SRC)/mesh/extrudeModel/lnInclude 	-I$(LIB_SRC)/dynamicMesh/lnInclude 	-I$(LIB_SRC)/dynamicFvMesh/lnInclude
-
-
-
-
-
-
-
-LIB_LIBS = -lfiniteVolume -lsurfMesh -lextrudeModel 	-ldynamicMesh 	-ldynamicFvMesh
diff --git a/src/Make/linux64GccDPInt32Opt/sourceFiles b/src/Make/linux64GccDPInt32Opt/sourceFiles
deleted file mode 100644
index 42c43d6..0000000
--- a/src/Make/linux64GccDPInt32Opt/sourceFiles
+++ /dev/null
@@ -1,5 +0,0 @@
-SOURCE = \
-hexRef2D/hexRef2D.C \
-dynamicRefine2DFvMesh/dynamicRefine2DFvMesh.C \
-
-# sources
diff --git a/src/Make/linux64GccDPInt32Opt/variables b/src/Make/linux64GccDPInt32Opt/variables
deleted file mode 100644
index 53ff138..0000000
--- a/src/Make/linux64GccDPInt32Opt/variables
+++ /dev/null
@@ -1 +0,0 @@
-LIB = $(FOAM_USER_LIBBIN)/libdynamicRefine2D
diff --git a/src/Make/options b/src/Make/options
index f929b06..e6b8407 100644
--- a/src/Make/options
+++ b/src/Make/options
@@ -3,12 +3,12 @@ EXE_INC = \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/mesh/extrudeModel/lnInclude \
-	-I$(LIB_SRC)/dynamicMesh/lnInclude \
-	-I$(LIB_SRC)/dynamicFvMesh/lnInclude
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/dynamicFvMesh/lnInclude
 
 LIB_LIBS = \
     -lfiniteVolume \
     -lsurfMesh \
     -lextrudeModel \
-	-ldynamicMesh \
-	-ldynamicFvMesh
+    -ldynamicMesh \
+    -ldynamicFvMesh
diff --git a/src/dynamicRefine2DFvMesh/dynamicRefine2DFvMesh.C b/src/dynamicRefine2DFvMesh/dynamicRefine2DFvMesh.C
index 691fde3..c3d586a 100644
--- a/src/dynamicRefine2DFvMesh/dynamicRefine2DFvMesh.C
+++ b/src/dynamicRefine2DFvMesh/dynamicRefine2DFvMesh.C
@@ -296,12 +296,12 @@ autoPtr<mapPolyMesh> dynamicRefine2DFvMesh::refine
             (
                 lookupObject<surfaceScalarField>(correctFluxes_[i][0])
             );
-            surfaceScalarField phiU =
+            surfaceScalarField phiU(
                 fvc::interpolate
                 (
                     lookupObject<volVectorField>(correctFluxes_[i][1])
                 )
-              & Sf();
+              & Sf());
 
             // Recalculate new internal faces.
             for (label faceI = 0; faceI < nInternalFaces(); faceI++)
@@ -487,12 +487,12 @@ autoPtr<mapPolyMesh> dynamicRefine2DFvMesh::unrefine
             (
                 lookupObject<surfaceScalarField>(correctFluxes_[i][0])
             );
-            surfaceScalarField phiU =
+            surfaceScalarField phiU(
                 fvc::interpolate
                 (
                     lookupObject<volVectorField>(correctFluxes_[i][1])
                 )
-              & Sf();
+              & Sf());
 
             forAllConstIter(Map<label>, faceToSplitPoint, iter)
             {
@@ -1238,18 +1238,19 @@ bool dynamicRefine2DFvMesh::update()
 
 bool dynamicRefine2DFvMesh::writeObject
 (
-    IOstream::streamFormat fmt,
-    IOstream::versionNumber ver,
-    IOstream::compressionType cmp,
-    const bool valid
+    IOstreamOption streamOpt,
+    const bool writeOnProc
+
 ) const
 {
     // Force refinement data to go to the current time directory.
     const_cast<hexRef2D&>(meshCutter_).setInstance(time().timeName());
 
     bool writeOk =
-        dynamicFvMesh::writeObject(fmt, ver, cmp, valid)
-     && meshCutter_.write();
+    (
+        dynamicFvMesh::writeObject(streamOpt, writeOnProc)
+     && meshCutter_.write()
+    );
 
     if (dumpLevel_)
     {
@@ -1261,11 +1262,12 @@ bool dynamicRefine2DFvMesh::writeObject
                 time().timeName(),
                 *this,
                 IOobject::NO_READ,
-                IOobject::AUTO_WRITE,
-                false
+                IOobject::NO_WRITE,
+                IOobject::NO_REGISTER
             ),
             *this,
-            dimensionedScalar("level", dimless, 0)
+            dimensionedScalar(dimless, Zero)
+
         );
 
         const labelList& cellLevel = meshCutter_.cellLevel();
diff --git a/src/dynamicRefine2DFvMesh/dynamicRefine2DFvMesh.H b/src/dynamicRefine2DFvMesh/dynamicRefine2DFvMesh.H
index 1bfdcc7..2dbb2f1 100644
--- a/src/dynamicRefine2DFvMesh/dynamicRefine2DFvMesh.H
+++ b/src/dynamicRefine2DFvMesh/dynamicRefine2DFvMesh.H
@@ -175,10 +175,9 @@ class dynamicRefine2DFvMesh
 
     //- Write using given format, version and compression
     virtual bool writeObject(
-        IOstream::streamFormat fmt,
-        IOstream::versionNumber ver,
-        IOstream::compressionType cmp,
-        const bool valid) const;
+        IOstreamOption streamOpt,
+        const bool writeOnProc
+    ) const;
 };
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/hexRef2D/hexRef2D.C b/src/hexRef2D/hexRef2D.C
index 9ca780e..cfd0c7b 100644
--- a/src/hexRef2D/hexRef2D.C
+++ b/src/hexRef2D/hexRef2D.C
@@ -529,7 +529,7 @@ Foam::label Foam::hexRef2D::getAnchorCell
 
     if (cellAnchorPoints[cellI].size() > 0)
     {
-        label index = findIndex(cellAnchorPoints[cellI], pointI);
+        label index = cellAnchorPoints[cellI].find(pointI);
 
         if (index != -1)
         {
@@ -552,7 +552,7 @@ Foam::label Foam::hexRef2D::getAnchorCell
 
         forAll(f, fp)
         {
-            label index = findIndex(cellAnchorPoints[cellI], f[fp]);
+            label index = cellAnchorPoints[cellI].find(f[fp]);
 
             if (index != -1)
             {
@@ -801,9 +801,9 @@ void Foam::hexRef2D::checkInternalOrientation
 )
 {
     face compactFace(identity(newFace.size()));
-    pointField compactPoints(IndirectList<point>(meshMod.points(), newFace)());
+    pointField compactPoints(meshMod.points(), newFace);
 
-    vector n(compactFace.normal(compactPoints));
+    vector n(compactFace.areaNormal(compactPoints));
 
     vector dir(neiPt - ownPt);
 
@@ -847,9 +847,9 @@ void Foam::hexRef2D::checkBoundaryOrientation
 )
 {
     face compactFace(identity(newFace.size()));
-    pointField compactPoints(IndirectList<point>(meshMod.points(), newFace)());
+    pointField compactPoints(meshMod.points(), newFace);
 
-    vector n(compactFace.normal(compactPoints));
+    vector n(compactFace.areaNormal(compactPoints));
 
     vector dir(boundaryPt - ownPt);
 
@@ -983,13 +983,13 @@ Foam::label Foam::hexRef2D::storeMidPointInfo
         }
 
         const edge& anchors = midPointToAnchors[edgeMidPointI];
-        label index = findIndex(cellAnchorPoints[cellI], anchorPointI);
+        label index = cellAnchorPoints[cellI].find(anchorPointI);
 
-        if (findIndex(cellAnchorPoints[cellI], anchorPointI) == 0)
+        if (cellAnchorPoints[cellI].find(anchorPointI) == 0)
         {
             index = 4;
         }
-        if (findIndex(cellAnchorPoints[cellI], anchorPointI) == 4)
+        if (cellAnchorPoints[cellI].find(anchorPointI) == 4)
         {
             index = 8;
         }
@@ -1004,7 +1004,7 @@ Foam::label Foam::hexRef2D::storeMidPointInfo
 
         if (faceOrder == (mesh_.faceOwner()[faceI] == cellI))
         {
-            label anch = findIndex(f, point1);
+            label anch = f.find(point1);
 
             if (pointLevel_[f[f.rcIndex(anch)]] <= cellLevel_[cellI])
             {
@@ -1043,7 +1043,7 @@ Foam::label Foam::hexRef2D::storeMidPointInfo
         }
         else
         {
-            label anch = findIndex(f, point1);
+            label anch = f.find(point1);
 
             if (pointLevel_[f[f.fcIndex(anch)]] <= cellLevel_[cellI])
             {
@@ -4464,7 +4464,7 @@ void Foam::hexRef2D::subset
 
         cellLevel_.transfer(newCellLevel);
 
-        if (findIndex(cellLevel_, -1) != -1)
+        if (cellLevel_.find(-1) != -1)
         {
             FatalErrorIn("hexRef2D::subset(..)")
                 << "Problem : "
@@ -4485,7 +4485,7 @@ void Foam::hexRef2D::subset
 
         pointLevel_.transfer(newPointLevel);
 
-        if (findIndex(pointLevel_, -1) != -1)
+        if (pointLevel_.find(-1) != -1)
         {
             FatalErrorIn("hexRef2D::subset(..)")
                 << "Problem : "

From 5b585f89ea173bc1973f3cbc4077391fa584e9d4 Mon Sep 17 00:00:00 2001
From: Guanyang Xue <playlego@gmail.com>
Date: Sat, 17 Feb 2024 00:42:30 -0500
Subject: [PATCH 2/2] Update README.md

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bb67500..f2b5877 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
-## Adaptive mesh refinement in OpenFoam-v1812 for 2-dimensional problems
+## The [original code](https://github.com/krajit/dynamicRefine2DFvMesh) is ported to OpenFOAM-v2306 with minimum modifications
+
+## Adaptive mesh refinement in OpenFOAM-v2306 for 2-dimensional problems
 
 Standard OpenFOAM-v1812 has a module called dynamicRefineFvMesh. This adaptive mesh refinement tool does not seem to be 
 applicable for two dimensional problems. [Shonibare](https://www.academia.edu/16217705/Two-dimensional_adaptive_meshing_in_OpenFOAM) and [Ahmad Baniabedalruhman](https://digitalcommons.mtu.edu/cgi/viewcontent.cgi?referer=&httpsredir=1&article=2008&context=etds)