RFC: src: Spelling and Initialization Order Changes
Jeffrey Oldham
oldham at codesourcery.com
Sat Apr 7 02:54:49 UTC 2001
I attached the wrong file in my previous posting.
Ok to commit?
2001-04-03 Jeffrey D. Oldham <oldham at codesourcery.com>
* Domain/DomainIterator.h (DomainIterator::DomainIterator):
Reorder initializers to reflect class declaration order.
* Domain/Loc.h: Fix spelling in comment.
* Engine/ConstantFunctionEngine.h (Engine::Engine):
Reorder initializers to reflect class declaration order.
* Engine/IndexFunctionEngine.h (Engine::Engine): Likewise.
* Evaluator/WhereProxy.h: Fix spelling in comment.
* Layout/Node.h (Node::Node): Reorder initializers to reflect
class declaration order.
* NewField/FieldCreateLeaf.h: Fix spelling in comment.
* NewField/FieldInitializers.h: Likewise.
* NewField/FieldReductions.h: Likewise.
* NewField/DiffOps/Div.UR.h:
s/UniformRectilinearMesh/UniformRectilinear/g in comments.
* NewField/DiffOps/Div.h: Fix spelling in comment.
* NewField/DiffOps/FieldStencil.h:
s/UniformRectilinearMesh/UniformRectilinear/g in comment.
* NewField/Updater/PeriodicFaceBC.h: Fix typo in comment.
* NewField/Updater/PosReflectFaceBC.h: Likewise.
* NewField/tests/VectorTest.cpp (main): Fix test's name in the
source code.
* Pooma/Pooma.cmpl.cpp (initialize): Fix spelling in comment.
* Utilities/RefCountedBlockPtr.h
(RefBlockController::RefBlockController): Reorder initializers to
reflect class declaration order.
(RefCountedBlockPtr::RefCountedBlockPtr): Likewise.
Tested on sequential Linux using gcc 3.1
Approved by ???you???
Thanks,
Jeffrey D. Oldham
oldham at codesourcery.com
-------------- next part --------------
Index: Domain/DomainIterator.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/Domain/DomainIterator.h,v
retrieving revision 1.7
diff -c -p -r1.7 DomainIterator.h
*** Domain/DomainIterator.h 2000/04/01 00:26:22 1.7
--- Domain/DomainIterator.h 2001/04/03 22:46:43
*************** public:
*** 99,105 ****
// iterators to the start. This constructor sets up a "begin" iterator.
DomainIterator(const Dom &d, int size = 0)
! : index_m(size), domain_m(d), loc_m(d.firsts())
{
PAssert(index_m >= 0 && index_m <= domain_m.size());
for (int i=0; i < dimensions; ++i)
--- 99,105 ----
// iterators to the start. This constructor sets up a "begin" iterator.
DomainIterator(const Dom &d, int size = 0)
! : domain_m(d), loc_m(d.firsts()), index_m(size)
{
PAssert(index_m >= 0 && index_m <= domain_m.size());
for (int i=0; i < dimensions; ++i)
*************** public:
*** 109,115 ****
// Copy constructor.
DomainIterator(const This_t &model)
! : index_m(model.index_m), domain_m(model.domain_m), loc_m(model.loc_m)
{
PAssert(index_m >= 0 && index_m <= domain_m.size());
for (int i=0; i < dimensions; ++i)
--- 109,115 ----
// Copy constructor.
DomainIterator(const This_t &model)
! : domain_m(model.domain_m), loc_m(model.loc_m), index_m(model.index_m)
{
PAssert(index_m >= 0 && index_m <= domain_m.size());
for (int i=0; i < dimensions; ++i)
Index: Domain/Loc.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/Domain/Loc.h,v
retrieving revision 1.22
diff -c -p -r1.22 Loc.h
*** Domain/Loc.h 2000/06/27 02:48:17 1.22
--- Domain/Loc.h 2001/04/03 22:46:44
***************
*** 110,116 ****
// comparison operators: <, >, !=, ==, <=, >= : compare a Loc<N> to
// another domain object. The compared domains must have the same
// number of dimensions.
! // arithmetic accumulation operators +=, -= : add or substract in a
// given domain. The added domain must have the same number of
// dimensions, or a dimension of 1 (in which case, the same value
// is used for all dimensions), and be known to be single-valued (which
--- 110,116 ----
// comparison operators: <, >, !=, ==, <=, >= : compare a Loc<N> to
// another domain object. The compared domains must have the same
// number of dimensions.
! // arithmetic accumulation operators +=, -= : add or subtract in a
// given domain. The added domain must have the same number of
// dimensions, or a dimension of 1 (in which case, the same value
// is used for all dimensions), and be known to be single-valued (which
Index: Engine/ConstantFunctionEngine.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/Engine/ConstantFunctionEngine.h,v
retrieving revision 1.16
diff -c -p -r1.16 ConstantFunctionEngine.h
*** Engine/ConstantFunctionEngine.h 2000/07/20 15:39:26 1.16
--- Engine/ConstantFunctionEngine.h 2001/04/03 22:46:45
*************** public:
*** 100,106 ****
// Construct from a domain object.
Engine(const Domain_t &domain, T val = T())
! : domain_m(domain), val_m(val)
{
for (int d = 0; d < Dim; ++d)
firsts_m[d] = domain[d].first();
--- 100,106 ----
// Construct from a domain object.
Engine(const Domain_t &domain, T val = T())
! : val_m(val), domain_m(domain)
{
for (int d = 0; d < Dim; ++d)
firsts_m[d] = domain[d].first();
Index: Engine/IndexFunctionEngine.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/Engine/IndexFunctionEngine.h,v
retrieving revision 1.20
diff -c -p -r1.20 IndexFunctionEngine.h
*** Engine/IndexFunctionEngine.h 2001/03/29 17:09:26 1.20
--- Engine/IndexFunctionEngine.h 2001/04/03 22:46:45
*************** public:
*** 129,135 ****
}
Engine(const Layout_t &layout, const Functor &f = Functor())
! : domain_m(layout.domain()), funct_m(f)
{
for (int d = 0; d < Dim; ++d)
firsts_m[d] = domain_m[d].first();
--- 129,135 ----
}
Engine(const Layout_t &layout, const Functor &f = Functor())
! : funct_m(f), domain_m(layout.domain())
{
for (int d = 0; d < Dim; ++d)
firsts_m[d] = domain_m[d].first();
Index: Evaluator/WhereProxy.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/Evaluator/WhereProxy.h,v
retrieving revision 1.3
diff -c -p -r1.3 WhereProxy.h
*** Evaluator/WhereProxy.h 2000/07/20 15:39:26 1.3
--- Evaluator/WhereProxy.h 2001/04/03 22:46:45
*************** struct ConvertWhereProxy
*** 67,73 ****
// A = where(f,B);
//
// Rather than have where(f,B) return an array that could be combined in
! // an expression, we return a WhereProxy that is recognized by assingment
// operators.
//
// The WhereProxy is also necessary because the elements returned by
--- 67,73 ----
// A = where(f,B);
//
// Rather than have where(f,B) return an array that could be combined in
! // an expression, we return a WhereProxy that is recognized by assignment
// operators.
//
// The WhereProxy is also necessary because the elements returned by
Index: Layout/Node.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/Layout/Node.h,v
retrieving revision 1.33
diff -c -p -r1.33 Node.h
*** Layout/Node.h 2001/03/20 23:42:48 1.33
--- Layout/Node.h 2001/04/03 22:46:45
*************** public:
*** 142,148 ****
Node(int affinity, const Domain_t &owned, const AllocatedDomain_t &allocated,
Context_t c, ID_t gid, ID_t lid = (-1))
: domain_m(owned), allocated_m(allocated),
! context_m(c), global_m(gid), local_m(lid),
affinity_m(affinity)
{
PAssert(owned.size() >= 0);
--- 142,148 ----
Node(int affinity, const Domain_t &owned, const AllocatedDomain_t &allocated,
Context_t c, ID_t gid, ID_t lid = (-1))
: domain_m(owned), allocated_m(allocated),
! local_m(lid), global_m(gid), context_m(c),
affinity_m(affinity)
{
PAssert(owned.size() >= 0);
Index: NewField/FieldCreateLeaf.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/NewField/FieldCreateLeaf.h,v
retrieving revision 1.4
diff -c -p -r1.4 FieldCreateLeaf.h
*** NewField/FieldCreateLeaf.h 2000/08/08 17:31:33 1.4
--- NewField/FieldCreateLeaf.h 2001/04/03 22:46:45
*************** template<class G, class T, class E> clas
*** 89,95 ****
//-----------------------------------------------------------------------------
// Fields are leaf objects, we just pass them through unless they have
! // Expression engines. Then, we remove the expresion from the field and form
// leaves with tree-nodes.
template<class GeometryTag, class T, class Expr>
--- 89,95 ----
//-----------------------------------------------------------------------------
// Fields are leaf objects, we just pass them through unless they have
! // Expression engines. Then, we remove the expression from the field and form
// leaves with tree-nodes.
template<class GeometryTag, class T, class Expr>
Index: NewField/FieldInitializers.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/NewField/FieldInitializers.h,v
retrieving revision 1.3
diff -c -p -r1.3 FieldInitializers.h
*** NewField/FieldInitializers.h 2000/07/24 23:36:22 1.3
--- NewField/FieldInitializers.h 2001/04/03 22:46:45
***************
*** 43,49 ****
// Overview:
//
// POOMA supports a hierarchy of multiple centering points per
! // cell. The centering information, manageed by the FieldEngineBase
// class, is initialized using a flexible set of functors. Below are some
// pre-defined functors that set up some common centerings along with some
// versions for building multi-material and multi-centered fields.
--- 43,49 ----
// Overview:
//
// POOMA supports a hierarchy of multiple centering points per
! // cell. The centering information, managed by the FieldEngineBase
// class, is initialized using a flexible set of functors. Below are some
// pre-defined functors that set up some common centerings along with some
// versions for building multi-material and multi-centered fields.
Index: NewField/FieldReductions.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/NewField/FieldReductions.h,v
retrieving revision 1.1
diff -c -p -r1.1 FieldReductions.h
*** NewField/FieldReductions.h 2000/07/24 23:36:22 1.1
--- NewField/FieldReductions.h 2001/04/03 22:46:46
*************** T max(const Field<GeometryTag, T, Engine
*** 115,121 ****
return ret;
}
! // Report if all of the elments of the Field are true.
template<class GeometryTag, class T, class EngineTag>
bool all(const Field<GeometryTag, T, EngineTag> &f)
--- 115,121 ----
return ret;
}
! // Report if all of the elements of the Field are true.
template<class GeometryTag, class T, class EngineTag>
bool all(const Field<GeometryTag, T, EngineTag> &f)
*************** bool all(const Field<GeometryTag, T, Eng
*** 129,135 ****
return ret;
}
! // Report if some of the elments of the Field are true.
template<class GeometryTag, class T, class EngineTag>
bool any(const Field<GeometryTag, T, EngineTag> &f)
--- 129,135 ----
return ret;
}
! // Report if some of the elements of the Field are true.
template<class GeometryTag, class T, class EngineTag>
bool any(const Field<GeometryTag, T, EngineTag> &f)
Index: NewField/DiffOps/Div.UR.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/NewField/DiffOps/Div.UR.h,v
retrieving revision 1.3
diff -c -p -r1.3 Div.UR.h
*** NewField/DiffOps/Div.UR.h 2000/07/26 22:27:27 1.3
--- NewField/DiffOps/Div.UR.h 2001/04/03 22:46:46
***************
*** 71,77 ****
// Div:
//
// Partial specializations of the generic Div (divergence) functor. See Div.h
! // for general comments. These are for UniformRectilinearMesh-based
// DiscreteGeometry.
//
// Div is a functor class serving as the "Functor" template parameter for
--- 71,77 ----
// Div:
//
// Partial specializations of the generic Div (divergence) functor. See Div.h
! // for general comments. These are for UniformRectilinear-based
// DiscreteGeometry.
//
// Div is a functor class serving as the "Functor" template parameter for
***************
*** 90,96 ****
// OutputCentering_t - Centering parameter of the output DiscreteGeometry class
// InputField_t - Type of the input Field, which is restricted to
// something from the
! // DiscreteGeometry<Centering, UniformRectilinearMesh<Dim...> >
// geometry and a vector or tensor type..
// OutputElement_t - Type of the elements in the output ConstField;
// restricted to a scalar type (vector input) or vector
--- 90,96 ----
// OutputCentering_t - Centering parameter of the output DiscreteGeometry class
// InputField_t - Type of the input Field, which is restricted to
// something from the
! // DiscreteGeometry<Centering, UniformRectilinear<Dim...> >
// geometry and a vector or tensor type..
// OutputElement_t - Type of the elements in the output ConstField;
// restricted to a scalar type (vector input) or vector
Index: NewField/DiffOps/Div.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/NewField/DiffOps/Div.h,v
retrieving revision 1.2
diff -c -p -r1.2 Div.h
*** NewField/DiffOps/Div.h 2000/07/26 22:27:27 1.2
--- NewField/DiffOps/Div.h 2001/04/03 22:46:46
***************
*** 82,88 ****
// FieldStencil<Functor,Expression>, which implements a discrete
// divergence operator.
// Partial specializations implement various combinations of input and output
! // centerings, for specific coordinate systems, and different finite-differenc
// orders, are defined in other headers like Div.[URM,RM].h .
//
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
--- 82,88 ----
// FieldStencil<Functor,Expression>, which implements a discrete
// divergence operator.
// Partial specializations implement various combinations of input and output
! // centerings, for specific coordinate systems, and different finite-difference
// orders, are defined in other headers like Div.[URM,RM].h .
//
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Index: NewField/DiffOps/FieldStencil.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/NewField/DiffOps/FieldStencil.h,v
retrieving revision 1.4
diff -c -p -r1.4 FieldStencil.h
*** NewField/DiffOps/FieldStencil.h 2000/09/20 16:22:17 1.4
--- NewField/DiffOps/FieldStencil.h 2001/04/03 22:46:46
*************** struct FieldStencilSimple
*** 474,480 ****
//
// template<int Dim, class T1, class T2>
// class Div<Cell,
! // DiscreteGeometry<Vert, UniformRectilinearMesh<Dim, Cartesian<Dim>, T1> >,
// Vector<Dim, T2> >
// {
// public:
--- 474,480 ----
//
// template<int Dim, class T1, class T2>
// class Div<Cell,
! // DiscreteGeometry<Vert, UniformRectilinear<Dim, Cartesian<Dim>, T1> >,
// Vector<Dim, T2> >
// {
// public:
Index: NewField/Updater/PeriodicFaceBC.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/NewField/Updater/PeriodicFaceBC.h,v
retrieving revision 1.2
diff -c -p -r1.2 PeriodicFaceBC.h
*** NewField/Updater/PeriodicFaceBC.h 2000/12/12 15:53:03 1.2
--- NewField/Updater/PeriodicFaceBC.h 2001/04/03 22:46:46
***************
*** 39,45 ****
// Overview:
//
// PeriodicFaceBC: Updater setting all guard layers beyond a
! // specified (logically) rectilinear mesh face to a the value
// from the non-guard element symmetrically across the face
// (the face is defined at the last vertex).
//-----------------------------------------------------------------------------
--- 39,45 ----
// Overview:
//
// PeriodicFaceBC: Updater setting all guard layers beyond a
! // specified (logically) rectilinear mesh face to the value
// from the non-guard element symmetrically across the face
// (the face is defined at the last vertex).
//-----------------------------------------------------------------------------
Index: NewField/Updater/PosReflectFaceBC.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/NewField/Updater/PosReflectFaceBC.h,v
retrieving revision 1.3
diff -c -p -r1.3 PosReflectFaceBC.h
*** NewField/Updater/PosReflectFaceBC.h 2001/02/19 21:21:07 1.3
--- NewField/Updater/PosReflectFaceBC.h 2001/04/03 22:46:46
***************
*** 37,43 ****
// Overview:
// PosReflectFaceBC: BCondCategory class setting all guard layers beyond a
// specified (logically) rectilinear mesh face to a positively
! // relected value.
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
--- 37,43 ----
// Overview:
// PosReflectFaceBC: BCondCategory class setting all guard layers beyond a
// specified (logically) rectilinear mesh face to a positively
! // reflected value.
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
Index: NewField/tests/VectorTest.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/NewField/tests/VectorTest.cpp,v
retrieving revision 1.1
diff -c -p -r1.1 VectorTest.cpp
*** NewField/tests/VectorTest.cpp 2000/12/13 20:04:14 1.1
--- NewField/tests/VectorTest.cpp 2001/04/03 22:46:47
*************** int main(int argc, char *argv[])
*** 104,110 ****
tester.out() << a << std::endl;
! int ret = tester.results("WhereTest");
Pooma::finalize();
return ret;
}
--- 104,110 ----
tester.out() << a << std::endl;
! int ret = tester.results("VectorTest");
Pooma::finalize();
return ret;
}
Index: Pooma/Pooma.cmpl.cpp
===================================================================
RCS file: /home/pooma/Repository/r2/src/Pooma/Pooma.cmpl.cpp,v
retrieving revision 1.36
diff -c -p -r1.36 Pooma.cmpl.cpp
*** Pooma/Pooma.cmpl.cpp 2000/06/08 22:16:34 1.36
--- Pooma/Pooma.cmpl.cpp 2001/04/03 22:46:47
*************** bool initialize(Options &opts, bool init
*** 365,371 ****
#endif
! // Enable logging too a file, if requested.
logstream_s = 0;
logMessages(opts.logfile().c_str());
--- 365,371 ----
#endif
! // Enable logging to a file, if requested.
logstream_s = 0;
logMessages(opts.logfile().c_str());
Index: Utilities/RefCountedBlockPtr.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/Utilities/RefCountedBlockPtr.h,v
retrieving revision 1.58
diff -c -p -r1.58 RefCountedBlockPtr.h
*** Utilities/RefCountedBlockPtr.h 2001/03/29 17:09:26 1.58
--- Utilities/RefCountedBlockPtr.h 2001/04/03 22:46:48
*************** public:
*** 164,170 ****
// RefCountedBlockPtr.
RefBlockController(size_t size, const NoInitTag &)
! : dealloc_m(false), pBegin_m(0), pEnd_m(0), pEndOfStorage_m(0)
{
// Allocate memory, and set pointers to beginning and ending. This
// also sets the dealloc_m flag to true.
--- 164,170 ----
// RefCountedBlockPtr.
RefBlockController(size_t size, const NoInitTag &)
! : pBegin_m(0), pEnd_m(0), pEndOfStorage_m(0), dealloc_m(false)
{
// Allocate memory, and set pointers to beginning and ending. This
// also sets the dealloc_m flag to true.
*************** public:
*** 639,646 ****
// which adds to compile time.)
inline RefCountedBlockPtr(const This_t & model, Offset_t offset)
! : blockControllerPtr_m(model.blockControllerPtr_m),
! offset_m(model.offset_m + offset)
{ }
// Inline destructor for better performance
--- 639,646 ----
// which adds to compile time.)
inline RefCountedBlockPtr(const This_t & model, Offset_t offset)
! : offset_m(model.offset_m + offset),
! blockControllerPtr_m(model.blockControllerPtr_m)
{ }
// Inline destructor for better performance
More information about the pooma-dev
mailing list