Merge pull request #1 from psychocoderHPC/conrad-topic-Environment-addParticleFactory

c-schumann-zih · c-schumann-zih · commit 3a9762369975 · 2014-03-03T10:02:50.000+01:00
add ParticleFactory to Environment
diff --git a/examples/SingleParticleCurrent/include/OneParticleSimulation.hpp b/examples/SingleParticleCurrent/include/OneParticleSimulation.hpp
@@ -24,6 +24,7 @@
 #define	ONEPARTICLESIMULATION_HPP
 
 #include "simulation_defines.hpp"
+#include "Environment.hpp"
 
 #include "simulationControl/MySimulation.hpp"
 
@@ -75,7 +76,7 @@ class OneParticleSimulation : public MySimulation
 
         MySimulation::init();
 
-        if (GridController<DIM3>::getInstance().getGlobalRank() == 0)
+        if (Environment<simDim>::getInstance().getGridController().getGlobalRank() == 0)
         {
             std::cout << "max weighting " << NUM_EL_PER_PARTICLE << std::endl;
             std::cout << "courant=min(deltaCellSize)/dt/c > 1.77 ? " << std::min(CELL_WIDTH, std::min(CELL_DEPTH, CELL_HEIGHT)) / SPEED_OF_LIGHT / DELTA_T << std::endl;
@@ -91,7 +92,7 @@ class OneParticleSimulation : public MySimulation
         //diabled because we have a transaction bug 
         //StreamController::getInstance().addStreams(6);
 
-        PMACC_AUTO(simBox, SubGrid<simDim>::getInstance().getSimulationBox());
+        PMACC_AUTO(simBox, Environment<simDim>::getInstance().getSubGrid().getSimulationBox());
 
         const DataSpace<simDim> halfSimSize(simBox.getGlobalSize() / 2);
 
@@ -141,7 +142,7 @@ class OneParticleSimulation : public MySimulation
 
     virtual void movingWindowCheck(uint32_t currentStep)
     {
-        PMACC_AUTO(simBox, SubGrid<simDim>::getInstance().getSimulationBox());
+        PMACC_AUTO(simBox, Environment<simDim>::getInstance().getSubGrid().getSimulationBox());
         GridLayout<DIM3> gridLayout(simBox.getLocalSize(), MappingDesc::SuperCellSize::getDataSpace());
         if (MovingWindow::getInstance().getVirtualWindow(currentStep).doSlide)
         {
diff --git a/examples/SingleParticleCurrent/include/particles/ParticlesInitOneParticle.hpp b/examples/SingleParticleCurrent/include/particles/ParticlesInitOneParticle.hpp
@@ -90,7 +90,7 @@ class ParticlesInitOneParticle
     static void addOneParticle(ParticlesClass& parClass, MappingDesc cellDescription, DataSpace<DIM3> globalCell)
     {
 
-        PMACC_AUTO(simBox, SubGrid<simDim>::getInstance().getSimulationBox());
+        PMACC_AUTO(simBox, Environment<simDim>::getInstance().getSubGrid().getSimulationBox());
         const DataSpace<DIM3> globalTopLeft = simBox.getGlobalOffset();
         const DataSpace<DIM3> localSimulationArea = simBox.getLocalSize();
         
diff --git a/examples/SingleParticleRadiationWithLaser/include/OneParticleSimulation.hpp b/examples/SingleParticleRadiationWithLaser/include/OneParticleSimulation.hpp
@@ -24,6 +24,7 @@
 #define	ONEPARTICLESIMULATION_HPP
 
 #include "simulation_defines.hpp"
+#include "Environment.hpp"
 
 #include "simulationControl/MySimulation.hpp"
 
@@ -75,7 +76,7 @@ class OneParticleSimulation : public MySimulation
 
         MySimulation::init();
 
-        if (GridController<DIM3>::getInstance().getGlobalRank() == 0)
+        if (Environment<simDim>::getInstance().getGridController().getGlobalRank() == 0)
         {
             std::cout << "max weighting " << NUM_EL_PER_PARTICLE << std::endl;
             std::cout << "courant=min(deltaCellSize)/dt/c > 1.77 ? " << std::min(CELL_WIDTH, std::min(CELL_DEPTH, CELL_HEIGHT)) / SPEED_OF_LIGHT / DELTA_T << std::endl;
@@ -91,7 +92,7 @@ class OneParticleSimulation : public MySimulation
 
         //add one particle in simulation
         //
-        PMACC_AUTO(simBox, SubGrid<simDim>::getInstance().getSimulationBox());
+        PMACC_AUTO(simBox, Environment<simDim>::getInstance().getSubGrid().getSimulationBox());
 
         const DataSpace<simDim> halfSimSize(simBox.getGlobalSize() / 2);
 
@@ -175,7 +176,7 @@ class OneParticleSimulation : public MySimulation
     virtual void movingWindowCheck(uint32_t currentStep)
     {
 
-        PMACC_AUTO(simBox, SubGrid<simDim>::getInstance().getSimulationBox());
+        PMACC_AUTO(simBox, Environment<simDim>::getInstance().getSubGrid().getSimulationBox());
         GridLayout<DIM3> gridLayout(simBox.getLocalSize(), MappingDesc::SuperCellSize::getDataSpace());
         if (MovingWindow::getInstance().getVirtualWindow(currentStep).doSlide)
         {
diff --git a/examples/SingleParticleRadiationWithLaser/include/particles/ParticlesInitOneParticle.hpp b/examples/SingleParticleRadiationWithLaser/include/particles/ParticlesInitOneParticle.hpp
@@ -94,7 +94,7 @@ class ParticlesInitOneParticle
     static void addOneParticle(ParticlesClass& parClass, MappingDesc cellDescription, DataSpace<DIM3> globalCell)
     {
 
-        PMACC_AUTO(simBox, SubGrid<simDim>::getInstance().getSimulationBox());
+        PMACC_AUTO(simBox, Environment<simDim>::getInstance().getSubGrid().getSimulationBox());
         const DataSpace<DIM3> globalTopLeft = simBox.getGlobalOffset();
         const DataSpace<DIM3> localSimulationArea = simBox.getLocalSize();
         DataSpace<DIM3> localParCell = globalCell - globalTopLeft;
diff --git a/examples/SingleParticleTest/include/OneParticleSimulation.hpp b/examples/SingleParticleTest/include/OneParticleSimulation.hpp
@@ -24,7 +24,7 @@
 #define	ONEPARTICLESIMULATION_HPP
 
 #include "simulation_defines.hpp"
-
+#include "Environment.hpp"
 #include "simulationControl/MySimulation.hpp"
 
 #include "simulationControl/SimulationHelper.hpp"
@@ -75,7 +75,7 @@ class OneParticleSimulation : public MySimulation
 
         MySimulation::init();
 
-        if (GridController<DIM3>::getInstance().getGlobalRank() == 0)
+        if (Environment<simDim>::getInstance().getGridController().getGlobalRank() == 0)
         {
             std::cout << "max weighting " << NUM_EL_PER_PARTICLE << std::endl;
             std::cout << "courant=min(deltaCellSize)/dt/c > 1.77 ? " << std::min(CELL_WIDTH, std::min(CELL_DEPTH, CELL_HEIGHT)) / SPEED_OF_LIGHT / DELTA_T << std::endl;
@@ -93,7 +93,7 @@ class OneParticleSimulation : public MySimulation
 
         //add one particle in simulation
         //
-        PMACC_AUTO(simBox, SubGrid<simDim>::getInstance().getSimulationBox());
+        PMACC_AUTO(simBox, Environment<simDim>::getInstance().getSubGrid().getSimulationBox());
 
         const DataSpace<simDim> halfSimSize(simBox.getGlobalSize() / 2);
 
@@ -154,7 +154,7 @@ class OneParticleSimulation : public MySimulation
 
     virtual void movingWindowCheck(uint32_t currentStep)
     {
-        PMACC_AUTO(simBox, SubGrid<simDim>::getInstance().getSimulationBox());
+        PMACC_AUTO(simBox, Environment<simDim>::getInstance().getSubGrid().getSimulationBox());
         GridLayout<DIM3> gridLayout(simBox.getLocalSize(), MappingDesc::SuperCellSize::getDataSpace());
         if (MovingWindow::getInstance().getVirtualWindow(currentStep).doSlide)
         {
diff --git a/examples/SingleParticleTest/include/particles/ParticlesInitOneParticle.hpp b/examples/SingleParticleTest/include/particles/ParticlesInitOneParticle.hpp
@@ -90,7 +90,7 @@ namespace picongpu
         static void addOneParticle(ParticlesClass& parClass, MappingDesc cellDescription, DataSpace<DIM3> globalCell)
         {
 
-            PMACC_AUTO(simBox, SubGrid<simDim>::getInstance().getSimulationBox());
+            PMACC_AUTO(simBox, Environment<simDim>::getInstance().getSubGrid().getSimulationBox());
             const DataSpace<DIM3> globalTopLeft = simBox.getGlobalOffset();
             const DataSpace<DIM3> localSimulationArea = simBox.getLocalSize();
             DataSpace<DIM3> localParCell = globalCell - globalTopLeft;
diff --git a/examples/ThermalTest/include/ThermalTestSimulation.hpp b/examples/ThermalTest/include/ThermalTestSimulation.hpp
@@ -22,6 +22,7 @@
 #define	TERMALTESTSIMULATION_HPP
 
 #include "simulation_defines.hpp"
+#include "Environment.hpp"
 
 #include "simulationControl/MySimulation.hpp"
 
@@ -114,7 +115,7 @@ class ThermalTestSimulation : public MySimulation
     {
         using namespace ::PMacc::math;
 
-        PMacc::GridController<SIMDIM>& con = PMacc::GridController<SIMDIM>::getInstance();
+        PMACC_AUTO(&con,Environment<simDim>::getInstance().getGridController());
         Size_t<SIMDIM> gpuDim = (Size_t<SIMDIM>)con.getGpuNodes();
         Int<3> gpuPos = (Int<3>)con.getPosition();
         zone::SphericZone<SIMDIM> gpuGatheringZone(Size_t<SIMDIM > (1, 1, gpuDim.z()));
diff --git a/src/libPMacc/include/Environment.hpp b/src/libPMacc/include/Environment.hpp
@@ -22,6 +22,7 @@
 #pragma once 
 
 #include "eventSystem/EventSystem.hpp"
+#include "particles/tasks/ParticleFactory.hpp"
 
 #include "mappings/simulation/GridController.hpp"
 #include "mappings/simulation/SubGrid.hpp"
@@ -76,6 +77,11 @@ namespace PMacc
             return Factory::getInstance();
         }
         
+        ParticleFactory& getParticleFactory()
+        {
+            return ParticleFactory::getInstance();
+        }
+        
         DataConnector& getDataConnector()
         {
             return DataConnector::getInstance();
@@ -146,3 +152,4 @@ namespace PMacc
 
 }
 
+#include "particles/tasks/ParticleFactory.tpp"
diff --git a/src/libPMacc/include/cuSTL/algorithm/mpi/Reduce.tpp b/src/libPMacc/include/cuSTL/algorithm/mpi/Reduce.tpp
@@ -38,8 +38,8 @@ template<int dim>
 Reduce<dim>::Reduce(const zone::SphericZone<dim>& _zone, bool setThisAsRoot) : comm(MPI_COMM_NULL)
 {
     using namespace math;
-    
-    PMacc::GridController<dim>& con = PMacc::GridController<dim>::getInstance();    
+      
+    PMACC_AUTO(&con,Environment<dim>::getInstance().getGridController());
     
     typedef std::pair<Int<dim>, bool> PosFlag;
     PosFlag posFlag;
diff --git a/src/libPMacc/include/eventSystem/EventSystem.hpp b/src/libPMacc/include/eventSystem/EventSystem.hpp
@@ -19,12 +19,12 @@
  * If not, see <http://www.gnu.org/licenses/>. 
  */ 
  
-#ifndef EVENTSYSTEM_HPP
-#define	EVENTSYSTEM_HPP
+#pragma once
 
 #include "eventSystem/events/EventTask.hpp"
 #include "eventSystem/events/EventNotify.hpp"
 #include "eventSystem/tasks/StreamTask.hpp"
+#include "eventSystem/tasks/MPITask.hpp"
 #include "eventSystem/transactions/TransactionManager.hpp"
 #include "eventSystem/transactions/Transaction.hpp"
 #include "eventSystem/Manager.hpp"
@@ -38,8 +38,3 @@
 #include "eventSystem/events/EventTask.tpp"
 #include "eventSystem/events/EventNotify.tpp"
 #include "eventSystem/tasks/Factory.tpp"
-
-
-
-#endif	/* EVENTSYSTEM_HPP */
-
diff --git a/src/libPMacc/include/particles/ParticlesBase.hpp b/src/libPMacc/include/particles/ParticlesBase.hpp
@@ -21,14 +21,10 @@
  
 #pragma once
 
-#include "eventSystem/EventSystem.hpp"
-
 #include "particles/ParticlesBase.kernel"
 #include "fields/SimulationFieldHelper.hpp"
 #include "mappings/kernel/ExchangeMapping.hpp"
 
-#include "particles/tasks/ParticleFactory.hpp"
-
 #include "particles/memory/boxes/ParticlesBox.hpp"
 #include "particles/memory/buffers/ParticlesBuffer.hpp"
 
diff --git a/src/libPMacc/include/particles/ParticlesBase.tpp b/src/libPMacc/include/particles/ParticlesBase.tpp
@@ -20,13 +20,12 @@
  */ 
  
 
+#include "Environment.hpp"
 #include "eventSystem/EventSystem.hpp"
 
 #include "fields/SimulationFieldHelper.hpp"
 #include "mappings/kernel/ExchangeMapping.hpp"
 
-#include "particles/tasks/ParticleFactory.hpp"
-
 #include "particles/memory/boxes/ParticlesBox.hpp"
 #include "particles/memory/buffers/ParticlesBuffer.hpp"
 
@@ -77,11 +76,11 @@ namespace PMacc
     {
         EventTask ret;
         __startTransaction(event);
-        ParticleFactory::getInstance().createTaskParticlesReceive(*this);
+        Environment<>::getInstance().getParticleFactory().createTaskParticlesReceive(*this);
         ret = __endTransaction();
 
         __startTransaction(event);
-        ParticleFactory::getInstance().createTaskParticlesSend(*this);
+        Environment<>::getInstance().getParticleFactory().createTaskParticlesSend(*this);
         ret += __endTransaction();
         return ret;
     }
diff --git a/src/libPMacc/include/particles/tasks/ParticleFactory.hpp b/src/libPMacc/include/particles/tasks/ParticleFactory.hpp
@@ -20,13 +20,10 @@
  */ 
  
 
-#ifndef _PARTICLEFACTORY_HPP
-#define	_PARTICLEFACTORY_HPP
+#pragma once
 
-#include "memory/buffers/Exchange.hpp"
-
-#include "eventSystem/tasks/Factory.hpp"
-#include "eventSystem/tasks/ITask.hpp"
+#include "Environment.hpp"
+#include "eventSystem/EventSystem.hpp"
 
 namespace PMacc
 {
@@ -68,6 +65,13 @@ namespace PMacc
         EventTask createTaskSendParticlesExchange(ParBase &parBase, uint32_t exchange,
         ITask *registeringTask = NULL);
         
+        
+    private:
+        
+        friend Environment<DIM1>;
+        friend Environment<DIM2>;
+        friend Environment<DIM3>;
+        
         /**
          * returns the instance of this factory
          * @return the instance
@@ -77,8 +81,6 @@ namespace PMacc
             static ParticleFactory instance;
             return instance;
         }
-        
-    private:
 
         ParticleFactory() { };
 
@@ -87,8 +89,3 @@ namespace PMacc
     };
 
 } //namespace PMacc
-
-#include "particles/tasks/ParticleFactory.tpp"
-
-#endif	/* _PARTICLEFACTORY_HPP */
-
diff --git a/src/libPMacc/include/particles/tasks/ParticleFactory.tpp b/src/libPMacc/include/particles/tasks/ParticleFactory.tpp
@@ -19,15 +19,17 @@
  * If not, see <http://www.gnu.org/licenses/>. 
  */ 
 
+
+#pragma once
+
+#include "eventSystem/EventSystem.hpp"
 #include "particles/tasks/ParticleFactory.hpp"
+
 #include "particles/tasks/TaskSendParticlesExchange.hpp"
 #include "particles/tasks/TaskReceiveParticlesExchange.hpp"
 #include "particles/tasks/TaskParticlesReceive.hpp"
 #include "particles/tasks/TaskParticlesSend.hpp"
 
-#include "eventSystem/tasks/Factory.hpp"
-#include "eventSystem/tasks/ITask.hpp"
-
 namespace PMacc
 {
 
diff --git a/src/libPMacc/include/particles/tasks/TaskParticlesReceive.hpp b/src/libPMacc/include/particles/tasks/TaskParticlesReceive.hpp
@@ -23,12 +23,8 @@
 #define	_TASKPARTICLESRECEIVE_HPP
 
 
+#include "Environment.hpp"
 #include "eventSystem/EventSystem.hpp"
-#include "particles/tasks/ParticleFactory.hpp"
-#include "eventSystem/tasks/ITask.hpp"
-#include "eventSystem/tasks/MPITask.hpp"
-#include "eventSystem/events/EventDataReceive.hpp"
-
 
 
 namespace PMacc
@@ -61,7 +57,7 @@ namespace PMacc
                 if (parBase.getParticlesBuffer().hasReceiveExchange(i))
                 {
                     __startAtomicTransaction(serialEvent);
-                    ParticleFactory::getInstance().createTaskReceiveParticlesExchange(parBase, i);
+                    Environment<>::getInstance().getParticleFactory().createTaskReceiveParticlesExchange(parBase, i);
                     tmpEvent += __endTransaction();
                 }
             }
diff --git a/src/libPMacc/include/particles/tasks/TaskParticlesSend.hpp b/src/libPMacc/include/particles/tasks/TaskParticlesSend.hpp
@@ -22,13 +22,8 @@
 #ifndef _TASKPARTICLESSEND_HPP
 #define	_TASKPARTICLESSEND_HPP
 
-
+#include "Environment.hpp"
 #include "eventSystem/EventSystem.hpp"
-#include "particles/tasks/ParticleFactory.hpp"
-#include "eventSystem/tasks/ITask.hpp"
-#include "eventSystem/tasks/MPITask.hpp"
-#include "eventSystem/events/EventDataReceive.hpp"
-
 
 namespace PMacc
 {
@@ -62,7 +57,7 @@ class TaskParticlesSend : public MPITask
             if (parBase.getParticlesBuffer().hasSendExchange(i))
             {
                 __startAtomicTransaction(serialEvent);
-                ParticleFactory::getInstance().createTaskSendParticlesExchange(parBase, i);
+                Environment<>::getInstance().getParticleFactory().createTaskSendParticlesExchange(parBase, i);
                 tmpEvent += __endTransaction();
             }
         }
diff --git a/src/libPMacc/include/particles/tasks/TaskReceiveParticlesExchange.hpp b/src/libPMacc/include/particles/tasks/TaskReceiveParticlesExchange.hpp
@@ -23,14 +23,7 @@
 #ifndef _TASKRECEIVEPARTICLESEXCHANGE_HPP
 #define	_TASKRECEIVEPARTICLESEXCHANGE_HPP
 
-
 #include "eventSystem/EventSystem.hpp"
-#include "particles/tasks/ParticleFactory.hpp"
-#include "eventSystem/tasks/ITask.hpp"
-#include "eventSystem/tasks/MPITask.hpp"
-#include "eventSystem/events/EventDataReceive.hpp"
-
-
 
 namespace PMacc
 {
diff --git a/src/libPMacc/include/particles/tasks/TaskSendParticlesExchange.hpp b/src/libPMacc/include/particles/tasks/TaskSendParticlesExchange.hpp
@@ -24,12 +24,6 @@
 
 
 #include "eventSystem/EventSystem.hpp"
-#include "particles/tasks/ParticleFactory.hpp"
-#include "eventSystem/tasks/ITask.hpp"
-#include "eventSystem/tasks/MPITask.hpp"
-#include "eventSystem/events/EventDataReceive.hpp"
-
-
 
 namespace PMacc
 {

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ class ParticlesInitOneParticle`
`90`	`90`	`static void addOneParticle(ParticlesClass& parClass, MappingDesc cellDescription, DataSpace<DIM3> globalCell)`
`91`	`91`	`{`
`92`	`92`
`93`		`- PMACC_AUTO(simBox, SubGrid<simDim>::getInstance().getSimulationBox());`
	`93`	`+ PMACC_AUTO(simBox, Environment<simDim>::getInstance().getSubGrid().getSimulationBox());`
`94`	`94`	`const DataSpace<DIM3> globalTopLeft = simBox.getGlobalOffset();`
`95`	`95`	`const DataSpace<DIM3> localSimulationArea = simBox.getLocalSize();`
`96`	`96`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ class ParticlesInitOneParticle`
`94`	`94`	`static void addOneParticle(ParticlesClass& parClass, MappingDesc cellDescription, DataSpace<DIM3> globalCell)`
`95`	`95`	`{`
`96`	`96`
`97`		`- PMACC_AUTO(simBox, SubGrid<simDim>::getInstance().getSimulationBox());`
	`97`	`+ PMACC_AUTO(simBox, Environment<simDim>::getInstance().getSubGrid().getSimulationBox());`
`98`	`98`	`const DataSpace<DIM3> globalTopLeft = simBox.getGlobalOffset();`
`99`	`99`	`const DataSpace<DIM3> localSimulationArea = simBox.getLocalSize();`
`100`	`100`	`DataSpace<DIM3> localParCell = globalCell - globalTopLeft;`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ namespace picongpu`
`90`	`90`	`static void addOneParticle(ParticlesClass& parClass, MappingDesc cellDescription, DataSpace<DIM3> globalCell)`
`91`	`91`	`{`
`92`	`92`
`93`		`- PMACC_AUTO(simBox, SubGrid<simDim>::getInstance().getSimulationBox());`
	`93`	`+ PMACC_AUTO(simBox, Environment<simDim>::getInstance().getSubGrid().getSimulationBox());`
`94`	`94`	`const DataSpace<DIM3> globalTopLeft = simBox.getGlobalOffset();`
`95`	`95`	`const DataSpace<DIM3> localSimulationArea = simBox.getLocalSize();`
`96`	`96`	`DataSpace<DIM3> localParCell = globalCell - globalTopLeft;`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`#pragma once`
`23`	`23`
`24`	`24`	`#include "eventSystem/EventSystem.hpp"`
	`25`	`+#include "particles/tasks/ParticleFactory.hpp"`
`25`	`26`
`26`	`27`	`#include "mappings/simulation/GridController.hpp"`
`27`	`28`	`#include "mappings/simulation/SubGrid.hpp"`
`@@ -76,6 +77,11 @@ namespace PMacc`
`76`	`77`	`return Factory::getInstance();`
`77`	`78`	`}`
`78`	`79`
	`80`	`+ ParticleFactory& getParticleFactory()`
	`81`	`+ {`
	`82`	`+ return ParticleFactory::getInstance();`
	`83`	`+ }`
	`84`	`+`
`79`	`85`	`DataConnector& getDataConnector()`
`80`	`86`	`{`
`81`	`87`	`return DataConnector::getInstance();`
`@@ -146,3 +152,4 @@ namespace PMacc`
`146`	`152`
`147`	`153`	`}`
`148`	`154`
	`155`	`+#include "particles/tasks/ParticleFactory.tpp"`