boutproject · bendudson · Feb 23, 2024 · Feb 23, 2024
diff --git a/include/bout/array.hxx b/include/bout/array.hxx
@@ -23,8 +23,8 @@
  *     o Added Umpire support, in multiple iterations/variations
  */
 
-#ifndef __ARRAY_H__
-#define __ARRAY_H__
+#ifndef BOUT_ARRAY_H
+#define BOUT_ARRAY_H
 
 #include <algorithm>
 #include <map>
@@ -486,4 +486,4 @@ bool operator==(const Array<T, B1>& lhs, const Array<T, B2>& rhs) {
   return std::equal(lhs.begin(), lhs.end(), rhs.begin());
 }
 
-#endif // __ARRAY_H__
+#endif // BOUT_ARRAY_H
diff --git a/include/bout/assert.hxx b/include/bout/assert.hxx
@@ -14,8 +14,8 @@
  * 
  */
 
-#ifndef __BOUT_ASSERT_H__
-#define __BOUT_ASSERT_H__
+#ifndef BOUT_ASSERT_H
+#define BOUT_ASSERT_H
 
 #include "bout/boutexception.hxx"
 
@@ -65,4 +65,4 @@
 #define ASSERT3(condition)
 #endif
 
-#endif // __BOUT_ASSERT_H__
+#endif // BOUT_ASSERT_H
diff --git a/include/bout/boundary_factory.hxx b/include/bout/boundary_factory.hxx
@@ -1,8 +1,8 @@
 
 class BoundaryFactory;
 
-#ifndef __BNDRY_FACTORY_H__
-#define __BNDRY_FACTORY_H__
+#ifndef BOUT_BNDRY_FACTORY_H
+#define BOUT_BNDRY_FACTORY_H
 
 #include "bout/boundary_op.hxx"
 #include "bout/boundary_region.hxx"
@@ -126,4 +126,4 @@ private:
   // BoundaryModifier* findBoundaryMod(const string &s);
 };
 
-#endif // __BNDRY_FACTORY_H__
+#endif // BOUT_BNDRY_FACTORY_H
diff --git a/include/bout/boundary_region.hxx b/include/bout/boundary_region.hxx
@@ -1,8 +1,8 @@
 
 class BoundaryRegion;
 
-#ifndef __BNDRY_REGION_H__
-#define __BNDRY_REGION_H__
+#ifndef BOUT_BNDRY_REGION_H
+#define BOUT_BNDRY_REGION_H
 
 #include <string>
 #include <utility>
@@ -142,4 +142,4 @@ private:
   int xs, xe;
 };
 
-#endif // __BNDRY_REGION_H__
+#endif // BOUT_BNDRY_REGION_H
diff --git a/include/bout/boundary_standard.hxx b/include/bout/boundary_standard.hxx
@@ -1,7 +1,7 @@
 /// Some standard boundary conditions
 
-#ifndef __BNDRY_STD_H__
-#define __BNDRY_STD_H__
+#ifndef BOUT_BNDRY_STD_H
+#define BOUT_BNDRY_STD_H
 
 #include "bout/boundary_op.hxx"
 #include "bout/bout_types.hxx"
@@ -516,4 +516,4 @@ public:
 private:
 };
 
-#endif // __BNDRY_STD_H__
+#endif // BOUT_BNDRY_STD_H
diff --git a/include/bout/bout_enum_class.hxx b/include/bout/bout_enum_class.hxx
@@ -19,8 +19,8 @@
  * along with BOUT++.  If not, see <http://www.gnu.org/licenses/>.
  **************************************************************************/
 
-#ifndef __BOUT_ENUM_CLASS_H__
-#define __BOUT_ENUM_CLASS_H__
+#ifndef BOUT_ENUM_CLASS_H
+#define BOUT_ENUM_CLASS_H
 
 #include "bout/boutexception.hxx"
 #include "bout/macro_for_each.hxx"
@@ -100,4 +100,4 @@
     return out << toString(e);                                                 \
   }
 
-#endif // __BOUT_ENUM_CLASS_H__
+#endif // BOUT_ENUM_CLASS_H
diff --git a/include/bout/bout_types.hxx b/include/bout/bout_types.hxx
@@ -19,8 +19,8 @@
  * along with BOUT++.  If not, see <http://www.gnu.org/licenses/>.
  **************************************************************************/
 
-#ifndef __BOUT_TYPES_H__
-#define __BOUT_TYPES_H__
+#ifndef BOUT_TYPES_H
+#define BOUT_TYPES_H
 
 #include <limits>
 #include <string>
@@ -140,4 +140,4 @@ struct enumWrapper {
 /// Boundary condition function
 using FuncPtr = BoutReal (*)(BoutReal t, BoutReal x, BoutReal y, BoutReal z);
 
-#endif // __BOUT_TYPES_H__
+#endif // BOUT_TYPES_H
diff --git a/include/bout/boutcomm.hxx b/include/bout/boutcomm.hxx
@@ -27,8 +27,8 @@
 
 class BoutComm;
 
-#ifndef __BOUTCOMM_H__
-#define __BOUTCOMM_H__
+#ifndef BOUT_BOUTCOMM_H
+#define BOUT_BOUTCOMM_H
 
 #include <mpi.h>
 
@@ -68,4 +68,4 @@ private:
   static BoutComm* instance; ///< The only instance of this class (Singleton)
 };
 
-#endif // __BOUTCOMM_H__
+#endif // BOUT_BOUTCOMM_H
diff --git a/include/bout/constants.hxx b/include/bout/constants.hxx
@@ -3,8 +3,8 @@
  * 
  **************************************************************************/
 
-#ifndef __CONSTANTS_H__
-#define __CONSTANTS_H__
+#ifndef BOUT_CONSTANTS_H
+#define BOUT_CONSTANTS_H
 
 #include <bout/bout_types.hxx>
 
@@ -28,4 +28,4 @@ constexpr BoutReal M_Deuterium = 2.01410178 * amu; ///< Mass of a Deuterium atom
 constexpr BoutReal M_Tritium = 3.0160492 * amu;    ///< Mass of a Tritium atom
 } // namespace SI
 
-#endif // __CONSTANTS_H__
+#endif // BOUT_CONSTANTS_H
diff --git a/include/bout/coordinates.hxx b/include/bout/coordinates.hxx
@@ -30,8 +30,8 @@
  *
  **************************************************************************/
 
-#ifndef __COORDINATES_H__
-#define __COORDINATES_H__
+#ifndef BOUT_COORDINATES_H
+#define BOUT_COORDINATES_H
 
 #include "bout/field2d.hxx"
 #include "bout/field3d.hxx"
@@ -262,4 +262,4 @@ private:
 };
 */
 
-#endif // __COORDINATES_H__
+#endif // BOUT_COORDINATES_H
diff --git a/include/bout/cyclic_reduction.hxx b/include/bout/cyclic_reduction.hxx
@@ -38,8 +38,8 @@
  *
  ************************************************************************/
 
-#ifndef __CYCLIC_REDUCE_H__
-#define __CYCLIC_REDUCE_H__
+#ifndef BOUT_CYCLIC_REDUCE_H
+#define BOUT_CYCLIC_REDUCE_H
 
 #ifdef DIAGNOSE
 #undef DIAGNOSE
@@ -640,4 +640,4 @@ private:
   }
 };
 
-#endif // __CYCLIC_REDUCE_H__
+#endif // BOUT_CYCLIC_REDUCE_H
diff --git a/include/bout/dcomplex.hxx b/include/bout/dcomplex.hxx
@@ -29,8 +29,8 @@
  * along with BOUT++.  If not, see <http://www.gnu.org/licenses/>.
  * 
  */
-#ifndef __DCOMPLEX_H__
-#define __DCOMPLEX_H__
+#ifndef BOUT_DCOMPLEX_H
+#define BOUT_DCOMPLEX_H
 
 #include "bout/bout_types.hxx"
 #include <complex>
@@ -44,4 +44,4 @@ struct fcmplx {
   BoutReal r, i;
 };
 
-#endif // __DCOMPLEX_H__
+#endif // BOUT_DCOMPLEX_H
diff --git a/include/bout/derivs.hxx b/include/bout/derivs.hxx
@@ -26,8 +26,8 @@
  *
  **************************************************************************/
 
-#ifndef __DERIVS_H__
-#define __DERIVS_H__
+#ifndef BOUT_DERIVS_H
+#define BOUT_DERIVS_H
 
 #include "bout/field2d.hxx"
 #include "bout/field3d.hxx"
@@ -701,4 +701,4 @@ Coordinates::FieldMetric D2DYDZ(const Field2D& f, CELL_LOC outloc = CELL_DEFAULT
                                 const std::string& method = "DEFAULT",
                                 const std::string& region = "RGN_NOBNDRY");
 
-#endif // __DERIVS_H__
+#endif // BOUT_DERIVS_H
diff --git a/include/bout/difops.hxx b/include/bout/difops.hxx
@@ -33,8 +33,8 @@
  * 
  *******************************************************************************/
 
-#ifndef __DIFOPS_H__
-#define __DIFOPS_H__
+#ifndef BOUT_DIFOPS_H
+#define BOUT_DIFOPS_H
 
 #include "bout/field2d.hxx"
 #include "bout/field3d.hxx"
@@ -310,4 +310,4 @@ Field3D bracket(const Field3D& f, const Field2D& g, BRACKET_METHOD method = BRAC
 Field3D bracket(const Field3D& f, const Field3D& g, BRACKET_METHOD method = BRACKET_STD,
                 CELL_LOC outloc = CELL_DEFAULT, Solver* solver = nullptr);
 
-#endif /* __DIFOPS_H__ */
+#endif /* BOUT_DIFOPS_H */
diff --git a/include/bout/expr.hxx b/include/bout/expr.hxx
@@ -9,8 +9,8 @@
  *
  **************************************************************************/
 
-#ifndef __EXPR_H__
-#define __EXPR_H__
+#ifndef BOUT_EXPR_H
+#define BOUT_EXPR_H
 
 #warning expr.hxx is deprecated. Do not use!
 
@@ -205,4 +205,4 @@ const Field3D eval3D(Expr e) {
   return result;
 }
 
-#endif // __EXPR_H__
+#endif // BOUT_EXPR_H
diff --git a/include/bout/fft.hxx b/include/bout/fft.hxx
@@ -25,8 +25,8 @@
  * 
  *******************************************************************************/
 
-#ifndef __FFT_H__
-#define __FFT_H__
+#ifndef BOUT_FFT_H
+#define BOUT_FFT_H
 
 #include "bout/dcomplex.hxx"
 #include <bout/array.hxx>
@@ -132,4 +132,4 @@ inline void DST_rev(dcomplex* in, int length, BoutReal* out) {
   return bout::fft::DST_rev(in, length, out);
 }
 
-#endif // __FFT_H__
+#endif // BOUT_FFT_H
diff --git a/include/bout/field2d.hxx b/include/bout/field2d.hxx
@@ -27,8 +27,8 @@
 class Field2D;
 
 #pragma once
-#ifndef __FIELD2D_H__
-#define __FIELD2D_H__
+#ifndef BOUT_FIELD2D_H
+#define BOUT_FIELD2D_H
 
 class Mesh;
 #include "bout/field.hxx"
@@ -374,4 +374,4 @@ bool operator==(const Field2D& a, const Field2D& b);
 
 std::ostream& operator<<(std::ostream& out, const Field2D& value);
 
-#endif /* __FIELD2D_H__ */
+#endif /* BOUT_FIELD2D_H */
diff --git a/include/bout/field3d.hxx b/include/bout/field3d.hxx
@@ -23,8 +23,8 @@
 class Field3D;
 
 #pragma once
-#ifndef __FIELD3D_H__
-#define __FIELD3D_H__
+#ifndef BOUT_FIELD3D_H
+#define BOUT_FIELD3D_H
 
 class Mesh; // #include "bout/mesh.hxx"
 #include "bout/bout_types.hxx"
@@ -656,4 +656,4 @@ bool operator==(const Field3D& a, const Field3D& b);
 /// Output a string describing a Field3D to a stream
 std::ostream& operator<<(std::ostream& out, const Field3D& value);
 
-#endif /* __FIELD3D_H__ */
+#endif /* BOUT_FIELD3D_H */
diff --git a/include/bout/field_factory.hxx b/include/bout/field_factory.hxx
@@ -26,8 +26,8 @@
 
 class FieldFactory;
 
-#ifndef __FIELD_FACTORY_H__
-#define __FIELD_FACTORY_H__
+#ifndef BOUT_FIELD_FACTORY_H
+#define BOUT_FIELD_FACTORY_H
 
 #include "bout/mesh.hxx"
 
@@ -165,4 +165,4 @@ public:
   }
 };
 
-#endif // __FIELD_FACTORY_H__
+#endif // BOUT_FIELD_FACTORY_H
diff --git a/include/bout/fieldgroup.hxx b/include/bout/fieldgroup.hxx
@@ -1,5 +1,5 @@
-#ifndef __FIELDGROUP_H__
-#define __FIELDGROUP_H__
+#ifndef BOUT_FIELDGROUP_H
+#define BOUT_FIELDGROUP_H
 
 #include "bout/field_data.hxx"
 #include <bout/field3d.hxx>
@@ -190,4 +190,4 @@ private:
 /// Combine two FieldGroups
 FieldGroup operator+(const FieldGroup& lhs, const FieldGroup& rhs);
 
-#endif // __FIELDGROUP_H__
+#endif // BOUT_FIELDGROUP_H
diff --git a/include/bout/fieldperp.hxx b/include/bout/fieldperp.hxx
@@ -25,8 +25,8 @@
 
 class FieldPerp;
 
-#ifndef __FIELDPERP_H__
-#define __FIELDPERP_H__
+#ifndef BOUT_FIELDPERP_H
+#define BOUT_FIELDPERP_H
 
 #include "bout/field.hxx"
 

diff --git a/include/bout/fv_ops.hxx b/include/bout/fv_ops.hxx
@@ -2,8 +2,8 @@
   Finite-volume discretisation methods. Flux-conservative form
  */
 
-#ifndef __FV_OPS_H__
-#define __FV_OPS_H__
+#ifndef BOUT_FV_OPS_H
+#define BOUT_FV_OPS_H
 
 #include "bout/field3d.hxx"
 #include "bout/globals.hxx"
@@ -525,4 +525,4 @@ const Field3D Div_f_v(const Field3D& n_in, const Vector3D& v, bool bndry_flux) {
    */
 Field3D Div_Perp_Lap(const Field3D& a, const Field3D& f, CELL_LOC outloc = CELL_DEFAULT);
 } // namespace FV
-#endif // __FV_OPS_H__
+#endif // BOUT_FV_OPS_H
diff --git a/include/bout/globalfield.hxx b/include/bout/globalfield.hxx
@@ -6,8 +6,8 @@
 class GlobalField;
 class GlobalField2D;
 
-#ifndef __GLOBALFIELD_H__
-#define __GLOBALFIELD_H__
+#ifndef BOUT_GLOBALFIELD_H
+#define BOUT_GLOBALFIELD_H
 
 #include "mesh.hxx"
 
@@ -257,4 +257,4 @@ private:
   bool data_valid;
 };
 
-#endif // __GLOBALFIELD_H__
+#endif // BOUT_GLOBALFIELD_H
diff --git a/include/bout/globals.hxx b/include/bout/globals.hxx
@@ -24,8 +24,8 @@
  *
  **************************************************************************/
 
-#ifndef __GLOBALS_H__
-#define __GLOBALS_H__
+#ifndef BOUT_GLOBALS_H
+#define BOUT_GLOBALS_H
 
 #include "bout/macro_for_each.hxx"
 
@@ -97,4 +97,4 @@ SETTING(MpiWrapper* mpi, nullptr); ///< The MPI wrapper object
 } // namespace globals
 } // namespace bout
 
-#endif // __GLOBALS_H__
+#endif // BOUT_GLOBALS_H