rename

yoctoyotta1024 · Dec 19, 2023 · 0680ef1 · 0680ef1
1 parent f3521ce
commit 0680ef1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/libs/cartesiandomain/cartesianboundaryconds.hpp b/libs/cartesiandomain/cartesianboundaryconds.hpp
@@ -26,9 +26,9 @@
 #define CARTESIANBOUNDARYCONDS_HPP
 
 /* NOTE: boundary conditions of domain are defined as:
-  z: FINITE   (see cartesian_coord3nghbrs & coord3_beyondz)
-  x: PERIODIC (see cartesian_coord3nghbrs & coord1_beyondx)
-  y: PERIODIC (see cartesian_coord3nghbrs & coord2_beyondy)
+  z: FINITE   (see cartesian_coord3nghbrs & boundarycond_coord3)
+  x: PERIODIC (see cartesian_coord3nghbrs & boundarycond_coord1)
+  y: PERIODIC (see cartesian_coord3nghbrs & boundarycond_coord2)
 */
 
 #include <vector>
@@ -181,9 +181,9 @@ for gridboxes at the edges of the domain is either finite
 }
 
 KOKKOS_INLINE_FUNCTION double
-coord3_beyondz(const double coord3,
-               const double lim1,
-               const double lim2)
+boundarycond_coord3(const double coord3,
+                    const double lim1,
+                    const double lim2)
 /* return value is new coord for a superdroplet given that
 coord3 exceedes the domain's lower or upper boundary in z direction.
 (ie. coord3 is below the lower edge of the lowest gridboxes
@@ -195,9 +195,9 @@ gridboxes in the z direction) */
 };
 
 KOKKOS_INLINE_FUNCTION double
-coord1_beyondx(const double coord1,
-               const double lim1,
-               const double lim2)
+boundarycond_coord1(const double coord1,
+                    const double lim1,
+                    const double lim2)
 /* return value is new coord for a superdroplet given
 that coord1 exceedes the domain's backwardsmost boundary
 in x direction, or given that coord1 exceedes the
@@ -208,9 +208,9 @@ domain's forwardmost boundary in x direction */
 };
 
 KOKKOS_INLINE_FUNCTION double
-coord2_beyondy(const double coord2,
-               const double lim1,
-               const double lim2)
+boundarycond_coord2(const double coord2,
+                    const double lim1,
+                    const double lim2)
 /* return value is new coord for a superdroplet given
 that coord2 exceedes the domain's edge/boundary in y
 leftwards direction, or given that coord2 exceedes the

diff --git a/libs/cartesiandomain/cartesianmotion.hpp b/libs/cartesiandomain/cartesianmotion.hpp
@@ -437,7 +437,7 @@ domain boundary in the backwards coord3 (z) direction
 {
   const auto lim1 = double{gbxmaps.coord3bounds(nghbr).second}; // upper lim of backward neighbour
   const auto lim2 = double{gbxmaps.coord3bounds(idx).first};    // lower lim of current gbx
-  drop.set_coord3(coord3_beyondz(drop.get_coord3(), lim1, lim2));
+  drop.set_coord3(boundarycond_coord3(drop.get_coord3(), lim1, lim2));
 }
 
 KOKKOS_FUNCTION void
@@ -451,7 +451,7 @@ domain boundary in the forwards coord3 (z) direction
 {
   const auto lim1 = double{gbxmaps.coord3bounds(nghbr).first}; // lower lim of forward neighbour
   const auto lim2 = double{gbxmaps.coord3bounds(idx).second};  // upper lim of current gbx
-  drop.set_coord3(coord3_beyondz(drop.get_coord3(), lim1, lim2));
+  drop.set_coord3(boundarycond_coord3(drop.get_coord3(), lim1, lim2));
 }
 
 KOKKOS_FUNCTION void
@@ -465,7 +465,7 @@ domain boundary in the backwards coord1 (x) direction
 {
   const auto lim1 = double{gbxmaps.coord1bounds(nghbr).second}; // upper lim of backward neigghbour
   const auto lim2 = double{gbxmaps.coord1bounds(idx).first};    // lower lim of current gbx
-  drop.set_coord1(coord1_beyondx(drop.get_coord1(), lim1, lim2));
+  drop.set_coord1(boundarycond_coord1(drop.get_coord1(), lim1, lim2));
 }
 
 KOKKOS_FUNCTION void
@@ -479,7 +479,7 @@ domain boundary in the forwards coord1 (x) direction
 {
   const auto lim1 = double{gbxmaps.coord1bounds(nghbr).first}; // lower lim of forward nghbour
   const auto lim2 = double{gbxmaps.coord1bounds(idx).second};  // upper lim of gbx
-  drop.set_coord1(coord1_beyondx(drop.get_coord1(), lim1, lim2));
+  drop.set_coord1(boundarycond_coord1(drop.get_coord1(), lim1, lim2));
 }
 
 KOKKOS_FUNCTION void
@@ -493,7 +493,7 @@ domain boundary in the backwards coord2 (y) direction
 {
   const auto lim1 = double{gbxmaps.coord2bounds(nghbr).second}; // upper lim of backward nghbour
   const auto lim2 = double{gbxmaps.coord2bounds(idx).first};    // lower lim of gbx
-  drop.set_coord2(coord2_beyondy(drop.get_coord2(), lim1, lim2));
+  drop.set_coord2(boundarycond_coord2(drop.get_coord2(), lim1, lim2));
 }
 
 KOKKOS_FUNCTION void
@@ -507,7 +507,7 @@ domain boundary in the forwards coord2 (y) direction
 {
   const auto lim1 = double{gbxmaps.coord2bounds(nghbr).first}; // lower lim of forward nghbour
   const auto lim2 = double{gbxmaps.coord2bounds(idx).second};  // upper lim of gbx
-  drop.set_coord2(coord2_beyondy(drop.get_coord2(), lim1, lim2));
+  drop.set_coord2(boundarycond_coord2(drop.get_coord2(), lim1, lim2));
 }
 
 #endif // CARTESIANMOTION_HPP