From 0ce201efbe77f2400f4d6d8f09953bd366b3bc3f Mon Sep 17 00:00:00 2001 From: Peter Boyle Date: Thu, 9 Oct 2025 13:35:16 -0400 Subject: [PATCH] IcosahedralVerted() checks --- Grid/cartesian/CartesianCrossIcosahedron.h | 6 +++--- Grid/cartesian/Cartesian_base.h | 6 +++--- Grid/cshift/Cshift_mpi.h | 2 +- Grid/cshift/Cshift_none.h | 2 +- Grid/lattice/Lattice_base.h | 2 +- Grid/lattice/Lattice_coordinate.h | 8 ++++---- Grid/lattice/Lattice_peekpoke.h | 8 ++++---- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Grid/cartesian/CartesianCrossIcosahedron.h b/Grid/cartesian/CartesianCrossIcosahedron.h index c3e6702d..d8b1d44b 100644 --- a/Grid/cartesian/CartesianCrossIcosahedron.h +++ b/Grid/cartesian/CartesianCrossIcosahedron.h @@ -107,9 +107,9 @@ public: int northPoleOsites; int southPoleOsites; - virtual int Icosahedral(void) override { return 1;} - virtual int IcosahedralVertices(void) override { return meshType==IcosahedralVertices;} - virtual int IcosahedralEdges (void) override { return meshType==IcosahedralEdges;} + virtual int isIcosahedral(void) override { return 1;} + virtual int isIcosahedralVertex(void) override { return meshType==IcosahedralVertices;} + virtual int isIcosahedralEdge (void) override { return meshType==IcosahedralEdges;} virtual int ownsNorthPole(void) const override { return hasNorthPole; }; virtual int NorthPoleOsite(void) const override { return northPoleOsite; }; virtual int NorthPoleOsites(void) const override { return northPoleOsites; }; diff --git a/Grid/cartesian/Cartesian_base.h b/Grid/cartesian/Cartesian_base.h index c9480cf6..2559e30b 100644 --- a/Grid/cartesian/Cartesian_base.h +++ b/Grid/cartesian/Cartesian_base.h @@ -87,9 +87,9 @@ public: public: // Icosahedral decisions - virtual int Icosahedral(void) { return 0;} - virtual int IcosahedralVertices(void) { return 0;} - virtual int IcosahedralEdges (void) { return 0;} + virtual int isIcosahedral(void) { return 0;} + virtual int isIcosahedralVertex(void) { return 0;} + virtual int isIcosahedralEdge (void) { return 0;} virtual int ownsNorthPole(void) const { return 0; }; virtual int ownsSouthPole(void) const { return 0; }; virtual int NorthPoleOsite(void) const { return 0; }; diff --git a/Grid/cshift/Cshift_mpi.h b/Grid/cshift/Cshift_mpi.h index b74ef958..750d41fd 100644 --- a/Grid/cshift/Cshift_mpi.h +++ b/Grid/cshift/Cshift_mpi.h @@ -34,7 +34,7 @@ NAMESPACE_BEGIN(Grid); const int Cshift_verbose=0; template Lattice Cshift(const Lattice &rhs,int dimension,int shift) { - assert(!rhs.Grid()->Icosahedral()); + assert(!rhs.Grid()->isIcosahedral()); typedef typename vobj::vector_type vector_type; typedef typename vobj::scalar_type scalar_type; diff --git a/Grid/cshift/Cshift_none.h b/Grid/cshift/Cshift_none.h index 79a360b4..fd8e27ac 100644 --- a/Grid/cshift/Cshift_none.h +++ b/Grid/cshift/Cshift_none.h @@ -30,7 +30,7 @@ Author: Peter Boyle NAMESPACE_BEGIN(Grid); template Lattice Cshift(const Lattice &rhs,int dimension,int shift) { - assert(!rhs.Grid()->Icosahedral()); + assert(!rhs.Grid()->isIcosahedral()); Lattice ret(rhs.Grid()); ret.Checkerboard() = rhs.Grid()->CheckerBoardDestination(rhs.Checkerboard(),shift,dimension); Cshift_local(ret,rhs,dimension,shift); diff --git a/Grid/lattice/Lattice_base.h b/Grid/lattice/Lattice_base.h index e6b0603f..3291064d 100644 --- a/Grid/lattice/Lattice_base.h +++ b/Grid/lattice/Lattice_base.h @@ -391,7 +391,7 @@ template std::ostream& operator<< (std::ostream& stream, const Latti stream<<"]\t"; stream<Icosahedral() ) { + if ( o.Grid()->isIcosahedral() ) { uint64_t psites=1; Coordinate perpdims; for(int d=2;d_ndimension-1;d++){ diff --git a/Grid/lattice/Lattice_coordinate.h b/Grid/lattice/Lattice_coordinate.h index b4292ef6..559f87ee 100644 --- a/Grid/lattice/Lattice_coordinate.h +++ b/Grid/lattice/Lattice_coordinate.h @@ -40,7 +40,7 @@ template inline void LatticeCoordinate(Lattice &l,int mu) int Nsimd = grid->iSites(); int cartesian_vol = grid->oSites(); - if ( grid->Icosahedral() ) { + if ( grid->isIcosahedral() ) { cartesian_vol = cartesian_vol - grid->NorthPoleOsites()-grid->SouthPoleOsites(); } { @@ -58,7 +58,7 @@ template inline void LatticeCoordinate(Lattice &l,int mu) }); } - if (grid->IcosahedralVertices()) { + if (grid->isIcosahedralVertex()) { uint64_t psites=1; Coordinate perpdims; typename iobj::scalar_object ss; @@ -95,9 +95,9 @@ template inline void LatticePole(Lattice &l,NorthSouth pole) l=Zero(); - assert(grid->IcosahedralVertices()); + assert(grid->isIcosahedralVertex()); - if (grid->IcosahedralVertices()) { + if (grid->isIcosahedralVertex()) { uint64_t psites=1; Coordinate perpdims; sobj ss; diff --git a/Grid/lattice/Lattice_peekpoke.h b/Grid/lattice/Lattice_peekpoke.h index 42446a13..198adb84 100644 --- a/Grid/lattice/Lattice_peekpoke.h +++ b/Grid/lattice/Lattice_peekpoke.h @@ -159,8 +159,8 @@ void peekPole(sobj &s,const Lattice &l,const Coordinate &orthog,NorthSouth GridBase *grid=l.Grid(); - assert(grid->Icosahedral()); - assert(grid->IcosahedralVertices()); + assert(grid->isIcosahedral()); + assert(grid->isIcosahedralVertex()); int Nsimd = grid->Nsimd(); @@ -220,8 +220,8 @@ void pokePole(const sobj &s,Lattice &l,const Coordinate &orthog,NorthSouth { GridBase *grid=l.Grid(); - assert(grid->Icosahedral()); - assert(grid->IcosahedralVertices()); + assert(grid->isIcosahedral()); + assert(grid->isIcosahedralVertex()); grid->Broadcast(grid->BossRank(),s);