Rename Z-serial assert function

Author: ZedThree

include/bout/fft.hxx

@@ -121,9 +121,9 @@ Array<BoutReal> irfft(const Array<dcomplex>& in, int length);
 /// Generally, FFTs must be done over the full Z domain. Currently, most
 /// methods using FFTs don't handle parallelising in Z
 #if BOUT_CHECK_LEVEL > 0
-void checkZSerial(const Mesh& mesh, std::string_view name);
+void assertZSerial(const Mesh& mesh, std::string_view name);
 #else
-inline void checkZSerial([[maybe_unused]] const Mesh& mesh,
+inline void assertZSerial([[maybe_unused]] const Mesh& mesh,
                          [[maybe_unused]] std::string_view name) {}
 #endif
 } // namespace fft

src/field/field3d.cxx

@@ -637,7 +637,7 @@ FieldPerp pow(const Field3D& lhs, const FieldPerp& rhs, const std::string& rgn)
 Field3D filter(const Field3D& var, int N0, const std::string& rgn) {
   TRACE("filter(Field3D, int)");
 
-  bout::fft::checkZSerial(*var.getMesh(), "`filter`");
+  bout::fft::assertZSerial(*var.getMesh(), "`filter`");
   checkData(var);
 
   int ncz = var.getNz();
@@ -684,7 +684,7 @@ Field3D filter(const Field3D& var, int N0, const std::string& rgn) {
 Field3D lowPass(const Field3D& var, int zmax, bool keep_zonal, const std::string& rgn) {
   TRACE("lowPass(Field3D, {}, {})", zmax, keep_zonal);
 
-  bout::fft::checkZSerial(*var.getMesh(), "`lowPass`");
+  bout::fft::assertZSerial(*var.getMesh(), "`lowPass`");
   checkData(var);
   int ncz = var.getNz();
 
@@ -735,7 +735,7 @@ Field3D lowPass(const Field3D& var, int zmax, bool keep_zonal, const std::string
 void shiftZ(Field3D& var, int jx, int jy, double zangle) {
   TRACE("shiftZ");
 
-  bout::fft::checkZSerial(*var.getMesh(), "`shiftZ`");
+  bout::fft::assertZSerial(*var.getMesh(), "`shiftZ`");
   checkData(var);
   var.allocate(); // Ensure that var is unique
   Mesh* localmesh = var.getMesh();

src/invert/fft_fftw.cxx

@@ -535,7 +535,7 @@ Array<BoutReal> irfft(const Array<dcomplex>& in, int length) {
 }
 
 #if BOUT_CHECK_LEVEL > 0
-void checkZSerial(const Mesh& mesh, std::string_view name) {
+void assertZSerial(const Mesh& mesh, std::string_view name) {
   if (mesh.getNZPE() != 1) {
     throw BoutException("{} uses FFTs which are currently incompatible with multiple "
                         "processors in Z (using {})",

src/invert/laplace/impls/cyclic/cyclic_laplace.cxx

@@ -57,7 +57,7 @@ LaplaceCyclic::LaplaceCyclic(Options* opt, const CELL_LOC loc, Mesh* mesh_in,
                              Solver* UNUSED(solver))
     : Laplacian(opt, loc, mesh_in), Acoef(0.0), C1coef(1.0), C2coef(1.0), Dcoef(1.0) {
 
-  bout::fft::checkZSerial(*localmesh, "`cyclic` inversion");
+  bout::fft::assertZSerial(*localmesh, "`cyclic` inversion");
 
   Acoef.setLocation(location);
   C1coef.setLocation(location);

src/invert/laplace/impls/iterative_parallel_tri/iterative_parallel_tri.cxx

@@ -67,7 +67,7 @@ LaplaceIPT::LaplaceIPT(Options* opt, CELL_LOC loc, Mesh* mesh_in, Solver* UNUSED
       au(ny, nmode), bu(ny, nmode), rl(nmode), ru(nmode), r1(ny, nmode), r2(ny, nmode),
       first_call(ny), x0saved(ny, 4, nmode), converged(nmode), fine_error(4, nmode) {
 
-  bout::fft::checkZSerial(*localmesh, "`ipt` inversion");
+  bout::fft::assertZSerial(*localmesh, "`ipt` inversion");
 
   A.setLocation(location);
   C.setLocation(location);

src/invert/laplace/impls/pcr/pcr.cxx

@@ -67,7 +67,7 @@ LaplacePCR::LaplacePCR(Options* opt, CELL_LOC loc, Mesh* mesh_in, Solver* UNUSED
       ncx(localmesh->LocalNx), ny(localmesh->LocalNy), avec(ny, nmode, ncx),
       bvec(ny, nmode, ncx), cvec(ny, nmode, ncx) {
 
-  bout::fft::checkZSerial(*localmesh, "`pcr` inversion");
+  bout::fft::assertZSerial(*localmesh, "`pcr` inversion");
 
   Acoef.setLocation(location);
   C1coef.setLocation(location);

src/invert/laplace/impls/pcr_thomas/pcr_thomas.cxx

@@ -65,7 +65,7 @@ LaplacePCR_THOMAS::LaplacePCR_THOMAS(Options* opt, CELL_LOC loc, Mesh* mesh_in,
       ncx(localmesh->LocalNx), ny(localmesh->LocalNy), avec(ny, nmode, ncx),
       bvec(ny, nmode, ncx), cvec(ny, nmode, ncx) {
 
-  bout::fft::checkZSerial(*localmesh, "`pcr_thomas` inversion");
+  bout::fft::assertZSerial(*localmesh, "`pcr_thomas` inversion");
 
   Acoef.setLocation(location);
   C1coef.setLocation(location);

src/invert/laplace/impls/serial_band/serial_band.cxx

@@ -46,7 +46,7 @@ LaplaceSerialBand::LaplaceSerialBand(Options* opt, const CELL_LOC loc, Mesh* mes
                                      Solver* UNUSED(solver))
     : Laplacian(opt, loc, mesh_in), Acoef(0.0), Ccoef(1.0), Dcoef(1.0) {
 
-  bout::fft::checkZSerial(*localmesh, "`band` inversion");
+  bout::fft::assertZSerial(*localmesh, "`band` inversion");
 
   Acoef.setLocation(location);
   Ccoef.setLocation(location);

src/invert/laplace/impls/serial_tri/serial_tri.cxx

@@ -40,7 +40,7 @@ LaplaceSerialTri::LaplaceSerialTri(Options* opt, CELL_LOC loc, Mesh* mesh_in,
                                    Solver* UNUSED(solver))
     : Laplacian(opt, loc, mesh_in), A(0.0), C(1.0), D(1.0) {
 
-  bout::fft::checkZSerial(*localmesh, "`tri` inversion");
+  bout::fft::assertZSerial(*localmesh, "`tri` inversion");
 
   A.setLocation(location);
   C.setLocation(location);

src/invert/laplace/impls/spt/spt.cxx

@@ -46,7 +46,7 @@ LaplaceSPT::LaplaceSPT(Options* opt, const CELL_LOC loc, Mesh* mesh_in,
                        Solver* UNUSED(solver))
     : Laplacian(opt, loc, mesh_in), Acoef(0.0), Ccoef(1.0), Dcoef(1.0) {
 
-  bout::fft::checkZSerial(*localmesh, "`spt` inversion");
+  bout::fft::assertZSerial(*localmesh, "`spt` inversion");
 
   Acoef.setLocation(location);
   Ccoef.setLocation(location);