Commit 3ef8b31f authored by frey_m's avatar frey_m
Browse files

Change ParticleBase --> IpplParticleBase due to BoxLib name clash.

List of all files that had to be updated:

	modified:   classic/src/Algorithms/PartBunch.h
	modified:   ippl/doc/tex/introduction.tex
	modified:   ippl/doc/tex/ippl_particles.tex
	modified:   ippl/src/DataSource/ACLVISPtclAttribDataSource.hpp
	modified:   ippl/src/DataSource/ACLVISPtclBaseDataSource.h
	modified:   ippl/src/DataSource/ACLVISPtclBaseDataSource.hpp
	modified:   ippl/src/DataSource/FilePtclBaseDataSource.h
	modified:   ippl/src/DataSource/FilePtclBaseDataSource.hpp
	modified:   ippl/src/DataSource/MakeDataSource.h
	modified:   ippl/src/DataSource/MakeDataSource.hpp
	modified:   ippl/src/DataSource/PtclAttribDataSource.cpp
	modified:   ippl/src/DataSource/PtclAttribDataSource.h
	modified:   ippl/src/DataSource/PtclBaseDataSource.cpp
	modified:   ippl/src/DataSource/PtclBaseDataSource.h
	modified:   ippl/src/DataSource/StringDataSource.hpp
	modified:   ippl/src/DataSource/inst/FileParBaseInteractDS_Cart_1D.cpp
	modified:   ippl/src/DataSource/inst/FileParBaseInteractDS_Cart_2D.cpp
	modified:   ippl/src/DataSource/inst/FileParBaseInteractDS_Cart_3D.cpp
	modified:   ippl/src/DataSource/inst/FileParBaseInteractDS_Unif_1D.cpp
	modified:   ippl/src/DataSource/inst/FileParBaseInteractDS_Unif_2D.cpp
	modified:   ippl/src/DataSource/inst/FileParBaseInteractDS_Unif_3D.cpp
	modified:   ippl/src/DataSource/inst/FileParBaseSpatialDS_Cart_1D.cpp
	modified:   ippl/src/DataSource/inst/FileParBaseSpatialDS_Cart_2D.cpp
	modified:   ippl/src/DataSource/inst/FileParBaseSpatialDS_Cart_3D.cpp
	modified:   ippl/src/DataSource/inst/FileParBaseSpatialDS_Unif_1D.cpp
	modified:   ippl/src/DataSource/inst/FileParBaseSpatialDS_Unif_2D.cpp
	modified:   ippl/src/DataSource/inst/FileParBaseSpatialDS_Unif_3D.cpp
	modified:   ippl/src/DataSource/inst/FileParBaseUniformDS_1D.cpp
	modified:   ippl/src/DataSource/inst/FileParBaseUniformDS_2D.cpp
	modified:   ippl/src/DataSource/inst/FileParBaseUniformDS_3D.cpp
	modified:   ippl/src/Ippl.h
	modified:   ippl/src/Particle/BoxParticleCachingPolicy.h
	modified:   ippl/src/Particle/CMakeLists.txt
	modified:   ippl/src/Particle/CellParticleCachingPolicy.h
	modified:   ippl/src/Particle/GenArrayParticle.h
	modified:   ippl/src/Particle/GenParticle.h
	renamed:    ippl/src/Particle/ParticleBase.h -> ippl/src/Particle/IpplParticleBase.h
	renamed:    ippl/src/Particle/ParticleBase.hpp -> ippl/src/Particle/IpplParticleBase.hpp
	modified:   ippl/src/Particle/NoParticleCachingPolicy.h
	modified:   ippl/src/Particle/ParticleBalancer.h
	modified:   ippl/src/Particle/ParticleBalancer.hpp
	modified:   ippl/src/Particle/ParticleCashedLayout.h
	modified:   ippl/src/Particle/ParticleCashedLayout.hpp
	modified:   ippl/src/Particle/ParticleInteractLayout.h
	modified:   ippl/src/Particle/ParticleInteractLayout.hpp
	modified:   ippl/src/Particle/ParticleLayoutFromGrid.cpp
	modified:   ippl/src/Particle/ParticleLayoutFromGrid.h
	modified:   ippl/src/Particle/ParticleSpatialLayout.cppNudge
	modified:   ippl/src/Particle/ParticleSpatialLayout.h
	modified:   ippl/src/Particle/ParticleSpatialLayout.hNudge
	modified:   ippl/src/Particle/ParticleSpatialLayout.hpp
	modified:   ippl/src/Particle/ParticleUniformLayout.h
	modified:   ippl/src/Particle/ParticleUniformLayout.hpp
	modified:   ippl/src/Particle/inst/ParticleBaseInteract_Cart_1D.cpp
	modified:   ippl/src/Particle/inst/ParticleBaseInteract_Cart_2D.cpp
	modified:   ippl/src/Particle/inst/ParticleBaseInteract_Cart_3D.cpp
	modified:   ippl/src/Particle/inst/ParticleBaseInteract_Unif_1D.cpp
	modified:   ippl/src/Particle/inst/ParticleBaseInteract_Unif_2D.cpp
	modified:   ippl/src/Particle/inst/ParticleBaseInteract_Unif_3D.cpp
	modified:   ippl/src/Particle/inst/ParticleBaseSpatial_Cart_1D.cpp
	modified:   ippl/src/Particle/inst/ParticleBaseSpatial_Cart_2D.cpp
	modified:   ippl/src/Particle/inst/ParticleBaseSpatial_Cart_3D.cpp
	modified:   ippl/src/Particle/inst/ParticleBaseSpatial_Unif_1D.cpp
	modified:   ippl/src/Particle/inst/ParticleBaseSpatial_Unif_2D.cpp
	modified:   ippl/src/Particle/inst/ParticleBaseSpatial_Unif_3D.cpp
	modified:   ippl/src/Particle/inst/ParticleBaseUniform_1D.cpp
	modified:   ippl/src/Particle/inst/ParticleBaseUniform_2D.cpp
	modified:   ippl/src/Particle/inst/ParticleBaseUniform_3D.cpp
	modified:   ippl/src/Utility/DiscParticle.h
	modified:   ippl/src/Utility/DiscParticle.hpp
	modified:   ippl/src/Utility/IpplStats.cpp
	modified:   ippl/src/Utility/IpplStats.h
	modified:   ippl/test/6dtrack/GTChargedParticles/GTChargedParticles.hh
	modified:   ippl/test/AMR/AmrPartBunch.h
	modified:   ippl/test/AMR/CMakeLists.txt
	modified:   ippl/test/AMR/PartBunch.h
	modified:   ippl/test/AMR/PartBunchBase.h
	modified:   ippl/test/AMR/testAmrPartBunch.cpp
	modified:   ippl/test/CavityTrack/ChargedParticles/ChargedParticles.hh
	modified:   ippl/test/PwrSpec/testPwrSpec.cpp
	modified:   ippl/test/hdf5/hdf5write-1.cpp
	modified:   ippl/test/hdf5/testHdf5-1.cpp
	modified:   ippl/test/particle/1dperiodic.cpp
	modified:   ippl/test/particle/CacheTest.cpp
	modified:   ippl/test/particle/FFTFieldSolver.cpp
	modified:   ippl/test/particle/FieldCompare.cpp
	modified:   ippl/test/particle/PIC2d.cpp
	modified:   ippl/test/particle/PIC3d-timing-1.cpp
	modified:   ippl/test/particle/PIC3d.cpp
	modified:   ippl/test/particle/PIC3dBCo-p.cpp
	modified:   ippl/test/particle/PIC3dBCo-p.cpp.nok
	modified:   ippl/test/particle/PairTest.cpp
	modified:   ippl/test/particle/neighNodeTest1.cpp
	modified:   ippl/test/particle/p3m3d.cpp
	modified:   ippl/test/particle/p3m3dHeating.cpp
	modified:   ippl/test/particle/p3m3dMicrobunching.cpp
	modified:   ippl/test/particle/pdbtest.cpp
	modified:   ippl/test/particle/salman-1.cpp
	modified:   ippl/test/particle/test-scatter-1.cpp
	modified:   ippl/test/particle/test-update-1.cpp
	modified:   ippl/test/poissonsolvers/femmgTest.cpp
	modified:   ippl/test/simple-new/id-test1.cpp
	modified:   ippl/test/simple-new/memcheck-1.cpp
	modified:   ippl/test/simple-new/memcheck-2.cpp
	modified:   ippl/test/simple/TestParticleDebug.cpp
	modified:   ippl/test/simple/TestParticleDebugParallel.cpp
	modified:   ippl/test/ttrack/GTChargedParticles/GTChargedParticles.hh
	modified:   ippl/test/twostream-1/.depend
parent d5b4fe66
......@@ -48,8 +48,8 @@ template <class T, int> class FVector;
/// Particle Bunch.
// A representation of a particle bunch as a vector of particles.
// class PartBunch: public std::vector<Particle>, public ParticleBase< ParticleSpatialLayout<double, 3> > {
class PartBunch: public ParticleBase< ParticleSpatialLayout<double, 3> > {
// class PartBunch: public std::vector<Particle>, public IpplParticleBase< ParticleSpatialLayout<double, 3> > {
class PartBunch: public IpplParticleBase< ParticleSpatialLayout<double, 3> > {
public:
/// Default constructor.
......
......@@ -121,12 +121,12 @@ assuming the non local part of $f1$ is initialized with zero.
this presentation details are omitted, only the structure and important issues are
highlighted.
\subsection{The {\em ChargedParticles} Class}
The base class {\tt ParticleBase} is augmented with attributes such as charge to mass ration
The base class {\tt IpplParticleBase} is augmented with attributes such as charge to mass ration
{\tt qm}, the vector momenta {\tt P} and the vector holding the electric field {\tt E}.
\begin{code}
ChargedParticles(PL* pl, Vector_t hr, Vector_t rmin,
Vector_t rmax, e_dim_tag decomp[Dim]) :
ParticleBase<PL>(pl),
IpplParticleBase<PL>(pl),
hr_m(hr),
rmin_m(rmin),
rmax_m(rmax),
......
This diff is collapsed.
......@@ -52,12 +52,12 @@ ACLVISParticleAttribDataSource<T>::ACLVISParticleAttribDataSource(const
ERRORMSG("ACLVIS data connections may only be of type OUTPUT." << endl);
Connection = 0;
} else {
// check if our ParticleBase container has been connected already ...
// check if our IpplParticleBase container has been connected already ...
if (PBase != 0) {
// yes it has ... set up our ACLVIS info.
// make a Tool object to store the data on the parent node
// We do not need to register this with the ACLVIS API, as this is
// done by the ACLVISParticleBaseDataSource
// done by the ACLVISIpplParticleBaseDataSource
if (getConnection()->onConnectNode())
LocalData = new ReadParticleTool;
......@@ -78,7 +78,7 @@ ACLVISParticleAttribDataSource<T>::ACLVISParticleAttribDataSource(const
template<class T>
ACLVISParticleAttribDataSource<T>::~ACLVISParticleAttribDataSource() {
// disassociate ourselves from the ParticleBase container
// disassociate ourselves from the IpplParticleBase container
if (PBase != 0)
PBase->disconnect_attrib(this);
......@@ -100,7 +100,7 @@ bool ACLVISParticleAttribDataSource<T>::update() {
// just return, the user should do an update for the ParticleBase
// just return, the user should do an update for the IpplParticleBase
return true;
}
......
......@@ -13,15 +13,15 @@
/***********************************************************************
*
* class ACLVISParticleBaseDataSource
* class ACLVISIpplParticleBaseDataSource
*
* ACLVISParticleBaseDataSource is a specific version of ParticleBaseDataSource
* which takes position and attribute data for a given ParticleBase and
* ACLVISIpplParticleBaseDataSource is a specific version of IpplParticleBaseDataSource
* which takes position and attribute data for a given IpplParticleBase and
* provides it to an external agency. This is done by collecting data on
* node 0, and formatting it for VTK use.
*
* ACLVISParticleBaseDataSource will take the position data, and all connected
* attributes for the ParticleBase, and update their values.
* ACLVISIpplParticleBaseDataSource will take the position data, and all connected
* attributes for the IpplParticleBase, and update their values.
*
***********************************************************************/
......@@ -31,21 +31,21 @@
// forward declarations
template<class PLayout> class ParticleBase;
template<class PLayout> class IpplParticleBase;
class ACLVISDataConnect;
// class definition
template<class PLayout>
class ACLVISParticleBaseDataSource : public ParticleBaseDataSource {
class ACLVISIpplParticleBaseDataSource : public IpplParticleBaseDataSource {
public:
// constructor: name, connection method, transfer method, pbase
ACLVISParticleBaseDataSource(const char *, DataConnect *, int,
ParticleBase<PLayout>&);
ACLVISIpplParticleBaseDataSource(const char *, DataConnect *, int,
IpplParticleBase<PLayout>&);
// destructor
virtual ~ACLVISParticleBaseDataSource();
virtual ~ACLVISIpplParticleBaseDataSource();
//
// DataSourceObject virtual function interface.
......@@ -61,7 +61,7 @@ public:
virtual void interact(const char * = 0);
//
// ParticleBaseDataSource virtual function interface
// IpplParticleBaseDataSource virtual function interface
//
// make a connection using the given attribute. Return success.
......@@ -71,13 +71,13 @@ public:
// particle base and the given attribute. Return success.
virtual bool disconnect_attrib(ParticleAttribDataSource *);
// check to see if the given ParticleAttribBase is in this ParticleBase's
// check to see if the given ParticleAttribBase is in this IpplParticleBase's
// list of registered attributes. Return true if this is so.
virtual bool has_attrib(ParticleAttribBase *);
private:
// the set of particles to connect
ParticleBase<PLayout>& MyParticleBase;
IpplParticleBase<PLayout>& MyIpplParticleBase;
// recast of DataConnect to ACL-specific object
ACLVISDataConnect *ACLVISConnection;
......
......@@ -28,7 +28,7 @@
#include "DataSource/ACLVISOperations.h"
#include "DataSource/ACLVISDataConnect.h"
#include "DataSource/PtclAttribDataSource.h"
#include "Particle/ParticleBase.h"
#include "Particle/IpplParticleBase.h"
#include "Message/Communicate.h"
#include "Utility/IpplInfo.h"
......@@ -38,14 +38,14 @@
////////////////////////////////////////////////////////////////////////////
// constructor: name, connection method, transfer method, pbase
template<class PLayout>
ACLVISParticleBaseDataSource<PLayout>::ACLVISParticleBaseDataSource(const
ACLVISIpplParticleBaseDataSource<PLayout>::ACLVISIpplParticleBaseDataSource(const
char *nm,
DataConnect *dc, int tm, ParticleBase<PLayout>& PB)
: ParticleBaseDataSource(nm, dc, tm, &PB), MyParticleBase(PB),
DataConnect *dc, int tm, IpplParticleBase<PLayout>& PB)
: IpplParticleBaseDataSource(nm, dc, tm, &PB), MyIpplParticleBase(PB),
IDMap(&IDMapA), NewIDMap(&IDMapB)
{
// make sure we do not have a ParticleBase with positions greater than
// make sure we do not have a IpplParticleBase with positions greater than
// 3 dimensions
CTAssert(PLayout::Dimension < 4);
......@@ -70,7 +70,7 @@ ACLVISParticleBaseDataSource<PLayout>::ACLVISParticleBaseDataSource(const
////////////////////////////////////////////////////////////////////////////
// destructor
template<class PLayout>
ACLVISParticleBaseDataSource<PLayout>::~ACLVISParticleBaseDataSource() {
ACLVISIpplParticleBaseDataSource<PLayout>::~ACLVISIpplParticleBaseDataSource() {
}
......@@ -78,7 +78,7 @@ ACLVISParticleBaseDataSource<PLayout>::~ACLVISParticleBaseDataSource() {
////////////////////////////////////////////////////////////////////////////
// make a connection using the given attribute. Return success.
template<class PLayout>
bool ACLVISParticleBaseDataSource<PLayout>::connect_attrib(
bool ACLVISIpplParticleBaseDataSource<PLayout>::connect_attrib(
ParticleAttribDataSource *pa) {
// on parent node, establish connection to ACLVIS for this base+attrib pair
......@@ -89,7 +89,7 @@ bool ACLVISParticleBaseDataSource<PLayout>::connect_attrib(
(ReadParticleTool *)(pa->getConnectStorage()),
ParticleDataType);
return ParticleBaseDataSource::connect_attrib(pa);
return IpplParticleBaseDataSource::connect_attrib(pa);
}
......@@ -97,7 +97,7 @@ bool ACLVISParticleBaseDataSource<PLayout>::connect_attrib(
// disconnect from the external agency the connection involving this
// particle base and the given attribute. Return success.
template<class PLayout>
bool ACLVISParticleBaseDataSource<PLayout>::disconnect_attrib(
bool ACLVISIpplParticleBaseDataSource<PLayout>::disconnect_attrib(
ParticleAttribDataSource *pa) {
// on parent node, remove connection to ACLVIS for this base+attrib pair
......@@ -108,20 +108,20 @@ bool ACLVISParticleBaseDataSource<PLayout>::disconnect_attrib(
ACLVISConnection->getConnection()->disconnect((void *)pa);
#endif
return ParticleBaseDataSource::disconnect_attrib(pa);
return IpplParticleBaseDataSource::disconnect_attrib(pa);
}
////////////////////////////////////////////////////////////////////////////
// check to see if the given ParticleAttrib is in this ParticleBase's
// check to see if the given ParticleAttrib is in this IpplParticleBase's
// list of registered attributes. Return true if this is so.
template<class PLayout>
bool ACLVISParticleBaseDataSource<PLayout>::has_attrib(
bool ACLVISIpplParticleBaseDataSource<PLayout>::has_attrib(
ParticleAttribBase *pa) {
// go through the list of registered attributes in our ParticleBase ...
typename ParticleBase<PLayout>::attrib_iterator attr=MyParticleBase.begin();
typename ParticleBase<PLayout>::attrib_iterator endattr=MyParticleBase.end();
// go through the list of registered attributes in our IpplParticleBase ...
typename IpplParticleBase<PLayout>::attrib_iterator attr=MyIpplParticleBase.begin();
typename IpplParticleBase<PLayout>::attrib_iterator endattr=MyIpplParticleBase.end();
for ( ; attr != endattr; ++attr)
if (pa == *attr)
return true;
......@@ -136,7 +136,7 @@ bool ACLVISParticleBaseDataSource<PLayout>::has_attrib(
// data (e.g., for a viz program, to rotate it, change representation, etc.)
// This should only return when the manipulation is done.
template<class PLayout>
void ACLVISParticleBaseDataSource<PLayout>::interact(const char *str) {
void ACLVISIpplParticleBaseDataSource<PLayout>::interact(const char *str) {
......@@ -163,7 +163,7 @@ void ACLVISParticleBaseDataSource<PLayout>::interact(const char *str) {
// Update the object, that is, make sure the receiver of the data has a
// current and consistent snapshot of the current state. Return success.
template<class PLayout>
bool ACLVISParticleBaseDataSource<PLayout>::update() {
bool ACLVISIpplParticleBaseDataSource<PLayout>::update() {
......@@ -178,8 +178,8 @@ bool ACLVISParticleBaseDataSource<PLayout>::update() {
int n, tag = Ippl::Comm->next_tag(DS_PB_TAG, DS_CYCLE);
unsigned N = Ippl::getNodes();
unsigned myN = Ippl::myNode();
unsigned locN = MyParticleBase.getLocalNum();
unsigned totN = MyParticleBase.getTotalNum();
unsigned locN = MyIpplParticleBase.getLocalNum();
unsigned totN = MyIpplParticleBase.getTotalNum();
unsigned currIndx = 0;
typename AttribList_t::iterator attr;
......@@ -198,8 +198,8 @@ bool ACLVISParticleBaseDataSource<PLayout>::update() {
if (locN > 0) {
// put position and ID data into a message
MyParticleBase.R.putMessage(*msg, locN, 0);
MyParticleBase.ID.putMessage(*msg, locN, 0);
MyIpplParticleBase.R.putMessage(*msg, locN, 0);
MyIpplParticleBase.ID.putMessage(*msg, locN, 0);
// put attribute data into a message
for (attr=begin_attrib(), endattr=end_attrib();
......@@ -231,8 +231,8 @@ bool ACLVISParticleBaseDataSource<PLayout>::update() {
//dbgmsg << "Inserting local data ..." << endl;
for (attr=begin_attrib(),endattr=end_attrib();attr!=endattr;++attr){
(*attr)->insert_data(locN, currIndx, 0);
insert_pos(locN, currIndx, &(MyParticleBase.R[0]),
&(MyParticleBase.ID[0]), *attr);
insert_pos(locN, currIndx, &(MyIpplParticleBase.R[0]),
&(MyIpplParticleBase.ID[0]), *attr);
}
}
......@@ -302,7 +302,7 @@ bool ACLVISParticleBaseDataSource<PLayout>::update() {
// specific storage. Arguments = number of particles, starting index,
// pointer to value, pointer to ID's, and ParticleAttribDataSource
template<class PLayout>
void ACLVISParticleBaseDataSource<PLayout>::insert_pos(
void ACLVISIpplParticleBaseDataSource<PLayout>::insert_pos(
unsigned N, unsigned sIndx,
typename PLayout::SingleParticlePos_t* data,
typename PLayout::Index_t* iddata,
......
......@@ -13,31 +13,31 @@
/***********************************************************************
*
* class FileParticleBaseDataSource
* class FileIpplParticleBaseDataSource
*
* A specific version of DataSourceObject which takes the data for
* a given ParticleBase and writes it to a file using a DiscParticle
* a given IpplParticleBase and writes it to a file using a DiscParticle
* object.
*
***********************************************************************/
// include files
#include "DataSource/DataSourceObject.h"
#include "Particle/ParticleBase.h"
#include "Particle/IpplParticleBase.h"
#include "Utility/DiscParticle.h"
template<class T>
class FileParticleBaseDataSource : public DataSourceObject {
class FileIpplParticleBaseDataSource : public DataSourceObject {
public:
// constructor: the name, the connection, the transfer method,
// the ParticleBase to connect
FileParticleBaseDataSource(const char *, DataConnect *, int,
ParticleBase<T> &);
// the IpplParticleBase to connect
FileIpplParticleBaseDataSource(const char *, DataConnect *, int,
IpplParticleBase<T> &);
// destructor
virtual ~FileParticleBaseDataSource();
virtual ~FileIpplParticleBaseDataSource();
//
// virtual function interface.
......@@ -56,8 +56,8 @@ private:
// the DiscParticle object, which read/writes the data
DiscParticle *DP;
// the ParticleBase to read into (or write from)
ParticleBase<T> &MyParticles;
// the IpplParticleBase to read into (or write from)
IpplParticleBase<T> &MyParticles;
// the number of frames we have read or written (i.e. or current record)
int counter;
......
......@@ -33,10 +33,10 @@
// constructor: the name, the connection, the transfer method,
// the particlebase to connect
template<class T>
FileParticleBaseDataSource<T>::FileParticleBaseDataSource(const char *nm,
FileIpplParticleBaseDataSource<T>::FileIpplParticleBaseDataSource(const char *nm,
DataConnect *dc,
int tm,
ParticleBase<T>& P)
IpplParticleBase<T>& P)
: DataSourceObject(nm,&P,dc,tm), DP(0), MyParticles(P), counter(0) {
std::string filestring = "file";
......@@ -58,7 +58,7 @@ FileParticleBaseDataSource<T>::FileParticleBaseDataSource(const char *nm,
////////////////////////////////////////////////////////////////////////////
// destructor
template<class T>
FileParticleBaseDataSource<T>::~FileParticleBaseDataSource() {
FileIpplParticleBaseDataSource<T>::~FileIpplParticleBaseDataSource() {
if (DP != 0)
delete DP;
......@@ -69,7 +69,7 @@ FileParticleBaseDataSource<T>::~FileParticleBaseDataSource() {
// Update the object, that is, make sure the receiver of the data has a
// current and consistent snapshot of the current state. Return success.
template<class T>
bool FileParticleBaseDataSource<T>::update() {
bool FileIpplParticleBaseDataSource<T>::update() {
if (TransferMethod == DataSource::OUTPUT)
return DP->write(MyParticles);
......@@ -86,7 +86,7 @@ bool FileParticleBaseDataSource<T>::update() {
// representation, etc.).
// This should only return when the manipulation is done.
template<class T>
void FileParticleBaseDataSource<T>::interact(const char *) {}
void FileIpplParticleBaseDataSource<T>::interact(const char *) {}
/***************************************************************************
......
......@@ -23,7 +23,7 @@
// forward declarations
template<class T, unsigned Dim, class M, class C> class Field;
template<class T> class ParticleAttrib;
template<class PLayout> class ParticleBase;
template<class PLayout> class IpplParticleBase;
template<class T> class ScalarDataSource;
template<class T> class StringDataSource;
class DataSourceObject;
......@@ -45,10 +45,10 @@ make_DataSourceObject(const char *, DataConnect *, int, ParticleAttrib<T>&);
// a version of make_DataSourceObject for ParticleAttrib's.
// arguments: name, connection type, transfer method, ParticleBase
// arguments: name, connection type, transfer method, IpplParticleBase
template<class PLayout>
DataSourceObject *
make_DataSourceObject(const char *,DataConnect *,int,ParticleBase<PLayout>&);
make_DataSourceObject(const char *,DataConnect *,int,IpplParticleBase<PLayout>&);
// a version of make_DataSourceObject for Scalar's.
// arguments: name, connection type, transfer method, ScalarDataSource
......
......@@ -133,21 +133,21 @@ make_DataSourceObject(const char *nm, DataConnect *dc, int t,
////////////////////////////////////////////////////////////////////////////
// a version of make_DataSourceObject for ParticleBase's
// a version of make_DataSourceObject for IpplParticleBase's
template<class PLayout>
DataSourceObject *
make_DataSourceObject(const char *nm, DataConnect *dc, int t,
ParticleBase<PLayout>& P) {
IpplParticleBase<PLayout>& P) {
// get the connection method name, and make a string out of it
std::string method(dc->DSID());
DataSourceObject *dso = 0;
if (method == "aclvis") {
// create a DataSourceObject for this ParticleBase which will connect to
// create a DataSourceObject for this IpplParticleBase which will connect to
// the ACL visualization code
#ifdef IPPL_ACLVIS
dso = new ACLVISParticleBaseDataSource<PLayout>(nm, dc, t, P);
dso = new ACLVISIpplParticleBaseDataSource<PLayout>(nm, dc, t, P);
#endif
} else if (method == "paws") {
......@@ -157,7 +157,7 @@ make_DataSourceObject(const char *nm, DataConnect *dc, int t,
} else if (method == "file") {
// create a DataSourceObject for this FILE which will connect to
// a file
dso = new FileParticleBaseDataSource<PLayout>(nm, dc, t, P);
dso = new FileIpplParticleBaseDataSource<PLayout>(nm, dc, t, P);
}
// make a default connection is nothing has been found
......@@ -179,7 +179,7 @@ make_DataSourceObject(const char *nm, DataConnect *dc, int t,
DataSourceObject *dso = 0;
if (method == "aclvis") {
// create a DataSourceObject for this ParticleBase which will connect to
// create a DataSourceObject for this IpplParticleBase which will connect to
// the ACL visualization code
} else if (method == "paws") {
......@@ -213,7 +213,7 @@ make_DataSourceObject(const char *nm, DataConnect *dc, int t,
DataSourceObject *dso = 0;
if (method == "aclvis") {
// create a DataSourceObject for this ParticleBase which will connect to
// create a DataSourceObject for this IpplParticleBase which will connect to
// the ACL visualization code
} else if (method == "paws") {
......
......@@ -35,7 +35,7 @@ ParticleAttribDataSource::ParticleAttribDataSource(const char *nm,
// find a particlebase object which contains this attribute; if none
// found, it is an error
PBase = ParticleBaseDataSource::find_particle_base(this, pa);
PBase = IpplParticleBaseDataSource::find_particle_base(this, pa);
// if we did find it ...
if (PBase != 0) {
......
......@@ -17,9 +17,9 @@
*
* ParticleAttribDataSource is a base class for classes which
* provides functionality needed to have the attributes check to see if
* their associated ParticleBase has been previously connected, and if so,
* their associated IpplParticleBase has been previously connected, and if so,
* to add this object to the list of connected attributes for that
* ParticleBase. This also provides virtual functions for transmitting
* IpplParticleBase. This also provides virtual functions for transmitting
* and receiving attribute data from other nodes.
*
***********************************************************************/
......@@ -30,7 +30,7 @@
// forward declarations
class ParticleBaseDataSource;
class IpplParticleBaseDataSource;
class ParticleAttribBase;
class DataSource;
......@@ -74,7 +74,7 @@ public:
protected:
// container holding our particle base ... used for disconnection
ParticleBaseDataSource *PBase;
IpplParticleBaseDataSource *PBase;
};
......
......@@ -30,12 +30,12 @@
// static objects for this class
ParticleBaseDataSource::BaseList_t ParticleBaseDataSource::BaseList;
IpplParticleBaseDataSource::BaseList_t IpplParticleBaseDataSource::BaseList;
///////////////////////////////////////////////////////////////////////////
// constructor: name, connection method, transfer method
ParticleBaseDataSource::ParticleBaseDataSource(const char *nm,
IpplParticleBaseDataSource::IpplParticleBaseDataSource(const char *nm,
DataConnect *dc,
int tm,
DataSource *ds)
......@@ -44,13 +44,13 @@ ParticleBaseDataSource::ParticleBaseDataSource(const char *nm,
///////////////////////////////////////////////////////////////////////////
// destructor ... unregister ourselves if this has not already been done
ParticleBaseDataSource::~ParticleBaseDataSource() {
IpplParticleBaseDataSource::~IpplParticleBaseDataSource() {
// disconnect all our currently connected attributes
while (AttribList.size() > 0)
disconnect_attrib(AttribList.front());
// remove ourselves from the list of available ParticleBase containers
// remove ourselves from the list of available IpplParticleBase containers
checkout();
}
......@@ -58,21 +58,21 @@ ParticleBaseDataSource::~ParticleBaseDataSource() {
///////////////////////////////////////////////////////////////////////////
// try to add a new ParticleAttrib (stored in a ParticleAttribDataSource
// object) to our list of connected attributes. This will check through
// the list of registered ParticleBase's, and add it to the proper one.
// the list of registered IpplParticleBase's, and add it to the proper one.
// If none are found, this returns NULL, otherwise this method returns
// a pointer to the ParticleBaseDataSource to which the attrib was added.
// a pointer to the IpplParticleBaseDataSource to which the attrib was added.
// This function is static, so that it may be called without a specific
// ParticleBaseDataSource instance.
ParticleBaseDataSource*
ParticleBaseDataSource::find_particle_base(ParticleAttribDataSource *pa,
// IpplParticleBaseDataSource instance.
IpplParticleBaseDataSource*
IpplParticleBaseDataSource::find_particle_base(ParticleAttribDataSource *pa,
ParticleAttribBase *pabase) {
// search through the particle base holders, and check for matching
// connection method, and if pa is in currbase
BaseList_t::iterator currbase = ParticleBaseDataSource::begin_base();
BaseList_t::iterator endbase = ParticleBaseDataSource::end_base();
BaseList_t::iterator currbase = IpplParticleBaseDataSource::begin_base();
BaseList_t::iterator endbase = IpplParticleBaseDataSource::end_base();
for ( ; currbase != endbase; ++currbase ) {
ParticleBaseDataSource *list = *currbase;
IpplParticleBaseDataSource *list = *currbase;
if (pa->getConnection()==list->getConnection() && list->has_attrib(pabase))
return list;
}
......@@ -83,15 +83,15 @@ ParticleBaseDataSource::find_particle_base(ParticleAttribDataSource *pa,
///////////////////////////////////////////////////////////////////////////
// register ourselves as a properly-connected ParticleBase holder. This
// register ourselves as a properly-connected IpplParticleBase holder. This
// should be called by the constructors of subclasses after a successful
// connect. Argument = name of this particle base
void ParticleBaseDataSource::checkin() {
void IpplParticleBaseDataSource::checkin() {
// first see if we're already here ...
BaseList_t::iterator currbase = ParticleBaseDataSource::begin_base();
BaseList_t::iterator endbase = ParticleBaseDataSource::end_base();
BaseList_t::iterator currbase = IpplParticleBaseDataSource::begin_base();
BaseList_t::iterator endbase = IpplParticleBaseDataSource::end_base();
for ( ; currbase != endbase; ++currbase )
if (*currbase == this)
return; // we're already checked in
......@@ -103,7 +103,7 @@ void ParticleBaseDataSource::checkin() {
///////////////////////////////////////////////////////////////////////////
// unregister ourselves ... generally called by subclass destructors.
void ParticleBaseDataSource::checkout() {
void IpplParticleBaseDataSource::checkout() {
for (unsigned i=0; i < BaseList.size(); ++i) {
......@@ -118,7 +118,7 @@ void ParticleBaseDataSource::checkout() {
////////////////////////////////////////////////////////////////////////////
// make a connection using the given attribute. Return success.
bool ParticleBaseDataSource::connect_attrib(ParticleAttribDataSource *pa) {
bool IpplParticleBaseDataSource::connect_attrib(ParticleAttribDataSource *pa) {
AttribList.push_back(pa);
return true;
}
......@@ -127,7 +127,7 @@ bool ParticleBaseDataSource::connect_attrib(ParticleAttribDataSource *pa) {
////////////////////////////////////////////////////////////////////////////
// disconnect from the external agency the connection involving this
// particle base and the given attribute. Return success.
bool ParticleBaseDataSource::disconnect_attrib(ParticleAttribDataSource *pa) {
bool IpplParticleBaseDataSource::disconnect_attrib(ParticleAttribDataSource *pa) {
// remove the attribute from our list
int i, size = AttribList.size();
......
......@@ -13,14 +13,14 @@
/***********************************************************************
*
* class ParticleBaseDataSource
* class IpplParticleBaseDataSource
*
* ParticleBaseDataSource is a base class which
* stores a static list of all ParticleBaseDataSource's (stored as
* ParticleBaseDataSource pointers) which are currently connected. This
* IpplParticleBaseDataSource is a base class which
* stores a static list of all IpplParticleBaseDataSource's (stored as
* IpplParticleBaseDataSource pointers) which are currently connected. This
* is needed so that ParticleAttrib's can determine if their parent
* ParticleBase has been previously connected, and if so they can then
* put themselves in the list for that ParticleBase as an attribute to be