Namespace and formatting changes

lib/algorithms/approx/Chebyshev.h

@@ -1,4 +1,4 @@
-    /*************************************************************************************
+/*************************************************************************************
 
     Grid physics library, www.github.com/paboyle/Grid 
 
@@ -25,14 +25,14 @@ Author: Christoph Lehner <clehner@bnl.gov>
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
     See the full license in the file "LICENSE" in the top level distribution directory
-    *************************************************************************************/
-    /*  END LEGAL */
+*************************************************************************************/
+/*  END LEGAL */
 #ifndef GRID_CHEBYSHEV_H
 #define GRID_CHEBYSHEV_H
 
 #include <Grid/algorithms/LinearOperator.h>
 
-namespace Grid {
+NAMESPACE_BEGIN(Grid);
 
 struct ChebyParams : Serializable {
   GRID_SERIALIZABLE_CLASS_MEMBERS(ChebyParams,
@@ -41,18 +41,18 @@ struct ChebyParams : Serializable {
 				  int, Npoly);
 };
 
-  ////////////////////////////////////////////////////////////////////////////////////////////
-  // Generic Chebyshev approximations
-  ////////////////////////////////////////////////////////////////////////////////////////////
-  template<class Field>
-  class Chebyshev : public OperatorFunction<Field> {
-  private:
+////////////////////////////////////////////////////////////////////////////////////////////
+// Generic Chebyshev approximations
+////////////////////////////////////////////////////////////////////////////////////////////
+template<class Field>
+class Chebyshev : public OperatorFunction<Field> {
+private:
   std::vector<RealD> Coeffs;
   int order;
   RealD hi;
   RealD lo;
 
-  public:
+public:
   void csv(std::ostream &out){
     RealD diff = hi-lo;
     RealD delta = (hi-lo)*1.0e-9;
@@ -80,7 +80,7 @@ struct ChebyParams : Serializable {
   ////////////////////////////////////////////////////////////////////////////////////////////////////
   // c.f. numerical recipes "chebft"/"chebev". This is sec 5.8 "Chebyshev approximation".
   ////////////////////////////////////////////////////////////////////////////////////////////////////
-// CJ: the one we need for Lanczos
+  // CJ: the one we need for Lanczos
   void Init(RealD _lo,RealD _hi,int _order)
   {
     lo=_lo;
@@ -254,19 +254,19 @@ struct ChebyParams : Serializable {
 	  
     }
   }
-  };
+};
 
 
-  template<class Field>
-  class ChebyshevLanczos : public Chebyshev<Field> {
-  private:
+template<class Field>
+class ChebyshevLanczos : public Chebyshev<Field> {
+private:
   std::vector<RealD> Coeffs;
   int order;
   RealD alpha;
   RealD beta;
   RealD mu;
 
-  public:
+public:
   ChebyshevLanczos(RealD _alpha,RealD _beta,RealD _mu,int _order) :
     alpha(_alpha),
     beta(_beta),
@@ -372,6 +372,6 @@ struct ChebyParams : Serializable {
 	  
     }
   }
-  };
-}
+};
+NAMESPACE_END(Grid);
 #endif

lib/algorithms/approx/Forecast.h

@@ -26,31 +26,31 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 See the full license in the file "LICENSE" in the top level distribution directory
 *************************************************************************************/
-/*  END LEGAL */
+			   /*  END LEGAL */
 
 #ifndef INCLUDED_FORECAST_H
 #define INCLUDED_FORECAST_H
 
-namespace Grid {
+NAMESPACE_BEGIN(Grid);
 
-  // Abstract base class.
-  // Takes a matrix (Mat), a source (phi), and a vector of Fields (chi)
-  // and returns a forecasted solution to the system D*psi = phi (psi).
-  template<class Matrix, class Field>
-  class Forecast
-  {
-    public:
+// Abstract base class.
+// Takes a matrix (Mat), a source (phi), and a vector of Fields (chi)
+// and returns a forecasted solution to the system D*psi = phi (psi).
+template<class Matrix, class Field>
+class Forecast
+{
+public:
   virtual Field operator()(Matrix &Mat, const Field& phi, const std::vector<Field>& chi) = 0;
-  };
+};
 
-  // Implementation of Brower et al.'s chronological inverter (arXiv:hep-lat/9509012),
-  // used to forecast solutions across poles of the EOFA heatbath.
-  //
-  // Modified from CPS (cps_pp/src/util/dirac_op/d_op_base/comsrc/minresext.C)
-  template<class Matrix, class Field>
-  class ChronoForecast : public Forecast<Matrix,Field>
-  {
-    public:
+// Implementation of Brower et al.'s chronological inverter (arXiv:hep-lat/9509012),
+// used to forecast solutions across poles of the EOFA heatbath.
+//
+// Modified from CPS (cps_pp/src/util/dirac_op/d_op_base/comsrc/minresext.C)
+template<class Matrix, class Field>
+class ChronoForecast : public Forecast<Matrix,Field>
+{
+public:
   Field operator()(Matrix &Mat, const Field& phi, const std::vector<Field>& prev_solns)
   {
     int degree = prev_solns.size();
@@ -145,8 +145,8 @@ namespace Grid {
 
     return chi;
   };
-  };
+};
 
-}
+NAMESPACE_END(Grid);
 
 #endif

lib/algorithms/approx/MultiShiftFunction.cc

@@ -27,7 +27,8 @@ Author: Azusa Yamaguchi <ayamaguc@staffmail.ed.ac.uk>
     /*  END LEGAL */
 #include <Grid/GridCore.h>
 
-namespace Grid {
+NAMESPACE_BEGIN(Grid);
+
 double MultiShiftFunction::approx(double x)
 {
   double a = norm;
@@ -53,4 +54,4 @@ void MultiShiftFunction::csv(std::ostream &out)
   }
   return;
 }
-}
+NAMESPACE_END(Grid);

lib/algorithms/approx/MultiShiftFunction.h

@@ -29,7 +29,7 @@ Author: Peter Boyle <paboyle@ph.ed.ac.uk>
 #ifndef MULTI_SHIFT_FUNCTION
 #define MULTI_SHIFT_FUNCTION
 
-namespace Grid {
+NAMESPACE_BEGIN(Grid);
 
 class MultiShiftFunction {
 public:
@@ -63,5 +63,5 @@ public:
   }
 
 };
-}
+NAMESPACE_END(Grid);
 #endif

lib/algorithms/approx/Zolotarev.cc

@@ -58,8 +58,8 @@
 
 /* Compute the partial fraction expansion coefficients (alpha) from the
  * factored form */
-namespace Grid {
-namespace Approx {
+NAMESPACE_BEGIN(Grid);
+NAMESPACE_BEGIN(Approx);
 
 static void construct_partfrac(izd *z) {
   int dn = z -> dn, dd = z -> dd, type = z -> type;
@@ -723,5 +723,6 @@ int main(int argc, char** argv) {
   return EXIT_SUCCESS;
 }
 
-
 #endif /* TEST */
+NAMESPACE_END(Approx);
+NAMESPACE_END(Grid);

lib/algorithms/approx/Zolotarev.h

@@ -1,13 +1,13 @@
 /* -*- Mode: C; comment-column: 22; fill-column: 79; -*- */
 
 #ifdef __cplusplus
-namespace Grid {
-namespace Approx {
+#include <Grid/Namespace.h>
+NAMESPACE_BEGIN(Grid);
+NAMESPACE_BEGIN(Approx);
 #endif
 
 #define HVERSION Header Time-stamp: <14-OCT-2004 09:26:51.00 adk@MISSCONTRARY>
 
-
 #ifndef ZOLOTAREV_INTERNAL
 #ifndef PRECISION
 #define PRECISION double
@@ -83,5 +83,6 @@ void zolotarev_free(zolotarev_data *zdata);
 #endif
 
 #ifdef __cplusplus
-}}
+NAMESPACE_END(Approx);
+NAMESPACE_END(Grid);
 #endif