Merge pull request #115 from prkkumar/fix_comp

fix compilation
AMReX-Microelectronics · Apr 2, 2024 · 2ab1c19 · 2ab1c19
2 parents 0b7265d + 9ce0f2d
commit 2ab1c19
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/Source/Evolve/WarpXEvolve.cpp b/Source/Evolve/WarpXEvolve.cpp
@@ -184,7 +184,7 @@ WarpX::Evolve (int numsteps)
         // ionization, Coulomb collisions, QED
         doFieldIonization();
         ExecutePythonCallback("beforecollisions");
-        mypc->doCollisions( cur_time, dt[0] );
+        //mypc->doCollisions( cur_time, dt[0] );
         ExecutePythonCallback("aftercollisions");
 #ifdef WARPX_QED
         doQEDEvents();

diff --git a/Source/Particles/Make.package b/Source/Particles/Make.package
@@ -15,7 +15,7 @@ include $(WARPX_HOME)/Source/Particles/Gather/Make.package
 include $(WARPX_HOME)/Source/Particles/Sorting/Make.package
 include $(WARPX_HOME)/Source/Particles/ParticleCreation/Make.package
 include $(WARPX_HOME)/Source/Particles/ElementaryProcess/Make.package
-include $(WARPX_HOME)/Source/Particles/Collision/Make.package
+#include $(WARPX_HOME)/Source/Particles/Collision/Make.package
 include $(WARPX_HOME)/Source/Particles/Filter/Make.package
 include $(WARPX_HOME)/Source/Particles/Resampling/Make.package
 

diff --git a/Source/Particles/MultiParticleContainer.H b/Source/Particles/MultiParticleContainer.H
@@ -172,7 +172,7 @@ public:
                             const amrex::MultiFab& Ex, const amrex::MultiFab& Ey, const amrex::MultiFab& Ez,
                             const amrex::MultiFab& Bx, const amrex::MultiFab& By, const amrex::MultiFab& Bz);
 
-    void doCollisions (amrex::Real cur_time, amrex::Real dt);
+    //void doCollisions (amrex::Real cur_time, amrex::Real dt);
 
     /**
     * \brief This function loops over all species and performs resampling if appropriate.
@@ -357,7 +357,7 @@ protected:
 
     std::vector<std::string> lasers_names;
 
-    std::unique_ptr<CollisionHandler> collisionhandler;
+    //std::unique_ptr<CollisionHandler> collisionhandler;
 
     //! instead of depositing (current, charge) on the finest patch level, deposit to the coarsest grid
     std::vector<bool> m_deposit_on_main_grid;

diff --git a/Source/Particles/MultiParticleContainer.cpp b/Source/Particles/MultiParticleContainer.cpp
@@ -120,7 +120,7 @@ MultiParticleContainer::MultiParticleContainer (AmrCore* amr_core)
     pc_tmp = std::make_unique<PhysicalParticleContainer>(amr_core);
 
     // Setup particle collisions
-    collisionhandler = std::make_unique<CollisionHandler>(this);
+    //collisionhandler = std::make_unique<CollisionHandler>(this);
 
 }
 
@@ -933,12 +933,14 @@ MultiParticleContainer::doFieldIonization (int lev,
     }
 }
 
+/*
 void
 MultiParticleContainer::doCollisions ( Real cur_time, amrex::Real dt )
 {
     WARPX_PROFILE("MultiParticleContainer::doCollisions()");
     collisionhandler->doCollisions(cur_time, dt, this);
 }
+*/
 
 void MultiParticleContainer::doResampling (const int timestep)
 {