ippl/src/DomainMap/CMakeLists.txt

@@ -14,12 +14,3 @@ add_ippl_sources (${_SRCS})
 add_ippl_headers (${_HDRS})
 
 install (FILES ${_HDRS} DESTINATION include/DomainMap)
-
-# vi: set et ts=4 sw=4 sts=4:
-
-# Local Variables:
-# mode: cmake
-# cmake-tab-width: 4
-# indent-tabs-mode: nil
-# require-final-newline: nil
-# End:

ippl/src/FFT/CMakeLists.txt

@@ -7,6 +7,7 @@ set (_HDRS
     FFTBase.h
     FFT.hpp
     FFT.h
+    fftpack.h
     fftpack_FFT.h
     )
 
@@ -16,12 +17,3 @@ include_directories (
 
 add_ippl_sources (${_SRCS})
 add_ippl_headers (${_HDRS})
-
-# vi: set et ts=4 sw=4 sts=4:
-
-# Local Variables:
-# mode: cmake
-# cmake-tab-width: 4
-# indent-tabs-mode: nil
-# require-final-newline: nil
-# End:

ippl/src/FFT/FFT.h

@@ -958,11 +958,3 @@ FFT<SineTransform,1U,T>::transform(
 }
 #include "FFT/FFT.hpp"
 #endif // IPPL_FFT_FFT_H
-
-// vi: set et ts=4 sw=4 sts=4:
-// Local Variables:
-// mode:c
-// c-basic-offset: 4
-// indent-tabs-mode: nil
-// require-final-newline: nil
-// End:

ippl/src/FFT/FFT.hpp

@@ -15,7 +15,7 @@
 #include "FFT/FFT.h"
 #include "FieldLayout/FieldLayout.h"
 #include "Field/BareField.h"
-#include "Utility/IpplStats.h"
+//#include "Utility/IpplStats.h"
 
 //=============================================================================
 // FFT CCTransform Constructors
@@ -3291,11 +3291,3 @@ FFT<SineTransform,1U,T>::transform(
 
     return;
 }
-
-// vi: set et ts=4 sw=4 sts=4:
-// Local Variables:
-// mode:c
-// c-basic-offset: 4
-// indent-tabs-mode: nil
-// require-final-newline: nil
-// End:
\ No newline at end of file

ippl/src/FFT/FFTBase.h

@@ -299,11 +299,3 @@ FFTBase<Dim,T>::checkDomain(const FFTBase<Dim,T>::Domain_t& dom1,
 #include "FFT/FFTBase.hpp"
 
 #endif // IPPL_FFT_FFTBASE_H
-
-// vi: set et ts=4 sw=4 sts=4:
-// Local Variables:
-// mode:c
-// c-basic-offset: 4
-// indent-tabs-mode: nil
-// require-final-newline: nil
-// End:

ippl/src/FFT/FFTBase.hpp

@@ -107,11 +107,3 @@ void FFTBase<Dim,T>::write(std::ostream& out) const {
 
     return;
 }
-
-// vi: set et ts=4 sw=4 sts=4:
-// Local Variables:
-// mode:c
-// c-basic-offset: 4
-// indent-tabs-mode: nil
-// require-final-newline: nil
-// End:

ippl/src/FFT/fftpack.cpp

@@ -972,11 +972,3 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-
-// vi: set et ts=4 sw=4 sts=4:
-// Local Variables:
-// mode:c
-// c-basic-offset: 4
-// indent-tabs-mode: nil
-// require-final-newline: nil
-// End:

ippl/src/FFT/fftpack.h

@@ -70,11 +70,3 @@ extern "C" {
 #endif
 
 #endif
-
-// vi: set et ts=4 sw=4 sts=4:
-// Local Variables:
-// mode:c
-// c-basic-offset: 4
-// indent-tabs-mode: nil
-// require-final-newline: nil
-// End:

ippl/src/FFT/fftpack_FFT.h

@@ -283,11 +283,3 @@ FFTPACK<T>::callFFT(unsigned transformDim, int direction, T* data) {
 }
 #endif // IPPL_FFT_FFTPACK_FFT_H
 
-// vi: set et ts=4 sw=4 sts=4:
-// Local Variables:
-// mode:c
-// c-basic-offset: 4
-// indent-tabs-mode: nil
-// require-final-newline: nil
-// End:
-

ippl/src/FFT/fftpack_inc.c

@@ -314,11 +314,3 @@ static void X(g)(size_t ido, size_t ip, size_t l1, const cmplx *cc, cmplx *ch,
 #undef PSIGN
 #undef PMSIGNC
 #undef MULPMSIGNC
-
-// vi: set et ts=4 sw=4 sts=4:
-// Local Variables:
-// mode:c
-// c-basic-offset: 4
-// indent-tabs-mode: nil
-// require-final-newline: nil
-// End:

ippl/src/Field/Assign.hpp

@@ -159,31 +159,31 @@ public:
     return Expr::Child.offset(i,j,k)(Expr::Value.Arg);
   }
 
-  PETE_Return_t& operator*() 
+  PETE_Return_t& operator*()
   {
     return (*Expr::Child)(Expr::Value.Arg);
   }
-  PETE_Return_t& offset(int i) 
+  PETE_Return_t& offset(int i)
   {
     return Expr::Child.offset(i)(Expr::Value.Arg);
   }
-  PETE_Return_t& offset(int i, int j) 
+  PETE_Return_t& offset(int i, int j)
   {
     return Expr::Child.offset(i,j)(Expr::Value.Arg);
   }
-  PETE_Return_t& offset(int i, int j, int k) 
+  PETE_Return_t& offset(int i, int j, int k)
   {
     return Expr::Child.offset(i,j,k)(Expr::Value.Arg);
   }
-  PETE_Return_t& unit_offset(int i) 
+  PETE_Return_t& unit_offset(int i)
   {
     return Expr::Child.unit_offset(i)(Expr::Value.Arg);
   }
-  PETE_Return_t& unit_offset(int i, int j) 
+  PETE_Return_t& unit_offset(int i, int j)
   {
     return Expr::Child.unit_offset(i,j)(Expr::Value.Arg);
   }
-  PETE_Return_t& unit_offset(int i, int j, int k) 
+  PETE_Return_t& unit_offset(int i, int j, int k)
   {
     return Expr::Child.unit_offset(i,j,k)(Expr::Value.Arg);
   }
@@ -228,10 +228,10 @@ public:
 
 template<class T1, unsigned Dim, class RHS, class OP>
 void
-assign(const IndexedBareField<T1,Dim,Dim> &aa, RHS b, OP op, ExprTag<true>, 
+assign(const IndexedBareField<T1,Dim,Dim> &aa, RHS b, OP op, ExprTag<true>,
        bool fillGC)
 {
-  IndexedBareField<T1,Dim,Dim> &a = 
+  IndexedBareField<T1,Dim,Dim> &a =
     const_cast<IndexedBareField<T1,Dim,Dim>&>(aa);
 
   // debugging output macros.  these are only enabled if DEBUG_ASSIGN is
@@ -262,8 +262,9 @@ assign(const IndexedBareField<T1,Dim,Dim> &aa, RHS b, OP op, ExprTag<true>,
   a.getBareField().setDirtyFlag();
 
   // Loop over all the local fields of the left hand side.
-  
+#ifdef DEBUG_ASSIGN
   int lfcount=0;
+#endif
   bool needFinalCompressCheck = false;
   while (la != aend)
     {
@@ -361,18 +362,20 @@ assign(const IndexedBareField<T1,Dim,Dim> &aa, RHS b, OP op, ExprTag<true>,
 	}
 
       ++la;
+#ifdef DEBUG_ASSIGN
       ++lfcount;
+#endif
     }
-  
+
 
   // If we are not deferring guard cell fills, and we need to do this
   // now, fill the guard cells.  This will also apply any boundary
   // conditions after the guards have been updated.
   if (fillGC) {
     ASSIGNMSG(msg << "Filling GC's at end if necessary ..." << endl);
-    
+
     a.getBareField().fillGuardCellsIfNotDirty();
-    
+
   }
 
   // Try to compress the result.
@@ -417,7 +420,7 @@ assign(PETE_TUTree<OpParens<TP>,A> lhs, RHS wrhs, OP op, Tag,
   typedef typename Expressionize<RHS>::type::Wrapped RHS_Wrapped;
   typename Expressionize<RHS>::type expr = Expressionize<RHS>::apply(wrhs);
   RHS_Wrapped & rhs = expr.PETE_unwrap();
-  
+
   // Get a reference to the BareField on the left hand side, and the
   // total domain we are modifying.
   BareField<T1,Dim>& bare = lhs.Child.getBareField();
@@ -438,7 +441,7 @@ assign(PETE_TUTree<OpParens<TP>,A> lhs, RHS wrhs, OP op, Tag,
   bare.setDirtyFlag();
 
   // Loop over all the local fields of the left hand side.
-  
+
   bool needFinalCompressCheck = false;
   while (la != aend)
     {
@@ -458,7 +461,7 @@ assign(PETE_TUTree<OpParens<TP>,A> lhs, RHS wrhs, OP op, Tag,
 	  // the whole expression.
 	  typedef typename LField<T1,Dim>::iterator LA;
 	  typedef PETE_TUTree<OpParens<TP>,LA> LHS;
-	  typedef BrickExpression<Dim,ParensIterator<LHS>,RHS_Wrapped,OP> 
+	  typedef BrickExpression<Dim,ParensIterator<LHS>,RHS_Wrapped,OP>
 	    ExprT;
 
 	  // First look and see if the arrays are sufficiently aligned
@@ -524,15 +527,15 @@ assign(PETE_TUTree<OpParens<TP>,A> lhs, RHS wrhs, OP op, Tag,
 	}
       ++la;
     }
-  
+
 
   // Fill the guard cells on the left hand side, if we are deferring
   // this operation until the next time it is needed.
   ASSIGNMSG(msg << "Filling GC's at end if necessary ..." << endl);
   if (fillGC) {
-    
+
     bare.fillGuardCellsIfNotDirty();
-    
+
   }
 
   // Compress the LHS.
@@ -590,8 +593,9 @@ assign(const BareField<T1,Dim>& ca, RHS b, OP op, ExprTag<true>)
   a.setDirtyFlag();
 
   // Loop over the LHS LFields, and assign from RHS LFields
-  
+#ifdef DEBUG_ASSIGN
   int lfcount = 0;
+#endif
   bool needFinalCompressCheck = false;
   while (la != aend)
   {
@@ -635,16 +639,18 @@ assign(const BareField<T1,Dim>& ca, RHS b, OP op, ExprTag<true>)
 
     ++la;
     for_each(bb,NextLField(),PETE_NullCombiner());
+#ifdef DEBUG_ASSIGN
     ++lfcount;
+#endif
   }
-  
+
 
   // Fill the guard cells on the left hand side, if we are deferring
   // this operation until the next time it is needed.
   ASSIGNMSG(msg << "Filling GC's at end if necessary ..." << endl);
-  
+
   a.fillGuardCellsIfNotDirty();
-  
+
 
   // Compress the LHS, if necessary
   if (needFinalCompressCheck) {
@@ -656,11 +662,3 @@ assign(const BareField<T1,Dim>& ca, RHS b, OP op, ExprTag<true>)
   //INCIPPLSTAT(incExpressions);
   //INCIPPLSTAT(incBFEqualsExpression);
 }
-
-// vi: set et ts=4 sw=4 sts=4:
-// Local Variables:
-// mode:c
-// c-basic-offset: 4
-// indent-tabs-mode: nil
-// require-final-newline: nil
-// End:

ippl/src/Field/BCond.hpp

@@ -1413,7 +1413,9 @@ void ParallelPeriodicFace<T,D,M,C>::apply( Field<T,D,M,C>& A )
   // Number of nodes that will send us messages.
 
   int receive_count = 0;
+#ifdef PRINT_DEBUG
   int send_count = 0;
+#endif
 
   // Communications tag
 
@@ -1744,7 +1746,9 @@ void ParallelPeriodicFace<T,D,M,C>::apply( Field<T,D,M,C>& A )
 #endif
 
 	      Ippl::Comm->send(messages[iproc], iproc, bc_comm_tag);
+#ifdef PRINT_DEBUG
 	      ++send_count;
+#endif
 
 	    }
 
@@ -2130,7 +2134,9 @@ void ParallelInterpolationFace<T,D,M,C>::apply( Field<T,D,M,C>& A )
   // Number of nodes that will send us messages.
 
   int receive_count = 0;
+#ifdef PRINT_DEBUG
   int send_count = 0;
+#endif
 
   // Communications tag
 
@@ -2467,8 +2473,9 @@ void ParallelInterpolationFace<T,D,M,C>::apply( Field<T,D,M,C>& A )
 #endif
 
 	      Ippl::Comm->send(messages[iproc], iproc, bc_comm_tag);
+#ifdef PRINT_DEBUG
 	      ++send_count;
-
+#endif
 	    }
 
 	}
@@ -6194,4 +6201,3 @@ void PatchBC<T,D,M,C>::apply( Field<T,D,M,C>& A )
 //----------------------------------------------------------------------
 
 #undef COMPONENT_APPLY_BUILTIN
-

ippl/src/Field/BareField.h

@@ -31,6 +31,7 @@
 #include "Index/SIndex.h"
 #include "SubField/SubBareField.h"
 #include "Utility/IpplInfo.h"
+#include "Utility/IpplStats.h"
 #include "Utility/PAssert.h"
 #include "Utility/Unique.h"
 #include "Utility/my_auto_ptr.h"

ippl/src/Field/BareField.hpp

@@ -33,10 +33,9 @@
 #include "Utility/Inform.h"
 #include "Utility/Unique.h"
 #include "Utility/IpplInfo.h"
-#include "Utility/IpplStats.h"
+//#include "Utility/IpplStats.h"
 
 #include <map>
-#include <utility>
 #include <cstdlib>
 
 

ippl/src/Field/BrickExpression.hpp

@@ -116,11 +116,3 @@ template<unsigned Dim, class LHS, class RHS, class OP>
 
   BrickExpLoop<LHS,RHS,OP,Dim>::apply(Lhs,Rhs,Op);
 }
-
-// vi: set et ts=4 sw=4 sts=4:
-// Local Variables:
-// mode:c
-// c-basic-offset: 4
-// indent-tabs-mode: nil
-// require-final-newline: nil
-// End:

ippl/src/Field/CMakeLists.txt

@@ -3,10 +3,10 @@ set (_SRCS
 
 set (_HDRS
     Assign.hpp
+    Assign.h
     AssignDefs.h
     AssignGeneralBF.hpp
     AssignGeneralIBF.hpp
-    Assign.h
     AssignTags.h
     BareField.hpp
     BareField.h
@@ -42,12 +42,3 @@ add_ippl_sources (${_SRCS})
 add_ippl_headers (${_HDRS})
 
 install (FILES ${_HDRS} DESTINATION include/Field)
-
-# vi: set et ts=4 sw=4 sts=4:
-
-# Local Variables:
-# mode: cmake
-# cmake-tab-width: 4
-# indent-tabs-mode: nil
-# require-final-newline: nil
-# End:

ippl/src/Field/Field.h

@@ -185,11 +185,3 @@ private:
 #include "Field/Field.hpp"
 
 #endif
-
-// vi: set et ts=4 sw=4 sts=4:
-// Local Variables:
-// mode:c
-// c-basic-offset: 4
-// indent-tabs-mode: nil
-// require-final-newline: nil
-// End:

ippl/src/Field/IndexedBareField.h

@@ -336,11 +336,3 @@ std::ostream& operator<<(std::ostream& out, const IndexedBareField<T,Dim,Bracket
 #include "Field/IndexedBareField.hpp"
 
 #endif // INDEXED_BARE_FIELD_H
-
-// vi: set et ts=4 sw=4 sts=4:
-// Local Variables:
-// mode:c
-// c-basic-offset: 4
-// indent-tabs-mode: nil
-// require-final-newline: nil
-// End:

ippl/src/FieldLayout/CMakeLists.txt

@@ -22,12 +22,3 @@ ADD_IPPL_SOURCES (${_SRCS})
 ADD_IPPL_HEADERS (${_HDRS})
 
 install (FILES ${_HDRS} DESTINATION include/FieldLayout)
-
-# vi: set et ts=4 sw=4 sts=4:
-  
-# Local Variables:
-# mode: cmake
-# cmake-tab-width: 4
-# indent-tabs-mode: nil
-# require-final-newline: nil
-# End:

ippl/src/FieldLayout/FieldLayoutUser.h

@@ -42,11 +42,3 @@ public:
 };
 
 #endif // FIELD_LAYOUT_USER_H
-
-// vi: set et ts=4 sw=4 sts=4:
-// Local Variables:
-// mode:c
-// c-basic-offset: 4
-// indent-tabs-mode: nil
-// require-final-newline: nil
-// End: