aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Neïl Zaim <49716072+NeilZaim@users.noreply.github.com> 2022-01-04 20:43:17 +0100
committerGravatar GitHub <noreply@github.com> 2022-01-04 19:43:17 +0000
commit344f091b7103d0b04d5b6e4b781cf734ff69feb0 (patch)
treefb6131ada0aa323bd9713488dd799301a215cdd1
parentf08f12835397b9cc05aa4a18fe2f22803501e08d (diff)
downloadWarpX-344f091b7103d0b04d5b6e4b781cf734ff69feb0.tar.gz
WarpX-344f091b7103d0b04d5b6e4b781cf734ff69feb0.tar.zst
WarpX-344f091b7103d0b04d5b6e4b781cf734ff69feb0.zip
Add Coulomb collision and nuclear fusion subfolders (#2389)
-rw-r--r--Source/Particles/Collision/BinaryCollision/BinaryCollision.H4
-rw-r--r--Source/Particles/Collision/BinaryCollision/Coulomb/ComputeTemperature.H (renamed from Source/Particles/Collision/BinaryCollision/ComputeTemperature.H)0
-rw-r--r--Source/Particles/Collision/BinaryCollision/Coulomb/ElasticCollisionPerez.H (renamed from Source/Particles/Collision/BinaryCollision/ElasticCollisionPerez.H)0
-rw-r--r--Source/Particles/Collision/BinaryCollision/Coulomb/PairWiseCoulombCollisionFunc.H (renamed from Source/Particles/Collision/BinaryCollision/PairWiseCoulombCollisionFunc.H)0
-rw-r--r--Source/Particles/Collision/BinaryCollision/Coulomb/UpdateMomentumPerezElastic.H (renamed from Source/Particles/Collision/BinaryCollision/UpdateMomentumPerezElastic.H)0
-rw-r--r--Source/Particles/Collision/BinaryCollision/NuclearFusion/NuclearFusionFunc.H (renamed from Source/Particles/Collision/BinaryCollision/NuclearFusionFunc.H)2
-rw-r--r--Source/Particles/Collision/BinaryCollision/NuclearFusion/ProtonBoronFusionCrossSection.H (renamed from Source/Particles/Collision/BinaryCollision/ProtonBoronFusionCrossSection.H)0
-rw-r--r--Source/Particles/Collision/BinaryCollision/NuclearFusion/ProtonBoronFusionInitializeMomentum.H (renamed from Source/Particles/Collision/BinaryCollision/ProtonBoronFusionInitializeMomentum.H)0
-rw-r--r--Source/Particles/Collision/BinaryCollision/NuclearFusion/SingleNuclearFusionEvent.H (renamed from Source/Particles/Collision/BinaryCollision/SingleNuclearFusionEvent.H)3
-rw-r--r--Source/Particles/Collision/BinaryCollision/ParticleCreationFunc.H2
-rw-r--r--Source/Particles/Collision/CollisionHandler.cpp4
11 files changed, 8 insertions, 7 deletions
diff --git a/Source/Particles/Collision/BinaryCollision/BinaryCollision.H b/Source/Particles/Collision/BinaryCollision/BinaryCollision.H
index 0bef0159b..217547cf9 100644
--- a/Source/Particles/Collision/BinaryCollision/BinaryCollision.H
+++ b/Source/Particles/Collision/BinaryCollision/BinaryCollision.H
@@ -7,8 +7,8 @@
#ifndef WARPX_PARTICLES_COLLISION_BINARYCOLLISION_H_
#define WARPX_PARTICLES_COLLISION_BINARYCOLLISION_H_
-#include "Particles/Collision/BinaryCollision/NuclearFusionFunc.H"
-#include "Particles/Collision/BinaryCollision/PairWiseCoulombCollisionFunc.H"
+#include "Particles/Collision/BinaryCollision/Coulomb/PairWiseCoulombCollisionFunc.H"
+#include "Particles/Collision/BinaryCollision/NuclearFusion/NuclearFusionFunc.H"
#include "Particles/Collision/BinaryCollision/ParticleCreationFunc.H"
#include "Particles/Collision/BinaryCollision/ShuffleFisherYates.H"
#include "Particles/Collision/CollisionBase.H"
diff --git a/Source/Particles/Collision/BinaryCollision/ComputeTemperature.H b/Source/Particles/Collision/BinaryCollision/Coulomb/ComputeTemperature.H
index 50e1f4a4b..50e1f4a4b 100644
--- a/Source/Particles/Collision/BinaryCollision/ComputeTemperature.H
+++ b/Source/Particles/Collision/BinaryCollision/Coulomb/ComputeTemperature.H
diff --git a/Source/Particles/Collision/BinaryCollision/ElasticCollisionPerez.H b/Source/Particles/Collision/BinaryCollision/Coulomb/ElasticCollisionPerez.H
index 5e94a0f93..5e94a0f93 100644
--- a/Source/Particles/Collision/BinaryCollision/ElasticCollisionPerez.H
+++ b/Source/Particles/Collision/BinaryCollision/Coulomb/ElasticCollisionPerez.H
diff --git a/Source/Particles/Collision/BinaryCollision/PairWiseCoulombCollisionFunc.H b/Source/Particles/Collision/BinaryCollision/Coulomb/PairWiseCoulombCollisionFunc.H
index 892fffa4f..892fffa4f 100644
--- a/Source/Particles/Collision/BinaryCollision/PairWiseCoulombCollisionFunc.H
+++ b/Source/Particles/Collision/BinaryCollision/Coulomb/PairWiseCoulombCollisionFunc.H
diff --git a/Source/Particles/Collision/BinaryCollision/UpdateMomentumPerezElastic.H b/Source/Particles/Collision/BinaryCollision/Coulomb/UpdateMomentumPerezElastic.H
index 38ddc5481..38ddc5481 100644
--- a/Source/Particles/Collision/BinaryCollision/UpdateMomentumPerezElastic.H
+++ b/Source/Particles/Collision/BinaryCollision/Coulomb/UpdateMomentumPerezElastic.H
diff --git a/Source/Particles/Collision/BinaryCollision/NuclearFusionFunc.H b/Source/Particles/Collision/BinaryCollision/NuclearFusion/NuclearFusionFunc.H
index b42c5d447..47575f42c 100644
--- a/Source/Particles/Collision/BinaryCollision/NuclearFusionFunc.H
+++ b/Source/Particles/Collision/BinaryCollision/NuclearFusion/NuclearFusionFunc.H
@@ -8,9 +8,9 @@
#ifndef NUCLEAR_FUSION_FUNC_H_
#define NUCLEAR_FUSION_FUNC_H_
-#include "BinaryCollisionUtils.H"
#include "SingleNuclearFusionEvent.H"
+#include "Particles/Collision/BinaryCollision/BinaryCollisionUtils.H"
#include "Particles/Pusher/GetAndSetPosition.H"
#include "Particles/MultiParticleContainer.H"
#include "Particles/WarpXParticleContainer.H"
diff --git a/Source/Particles/Collision/BinaryCollision/ProtonBoronFusionCrossSection.H b/Source/Particles/Collision/BinaryCollision/NuclearFusion/ProtonBoronFusionCrossSection.H
index ee81a620a..ee81a620a 100644
--- a/Source/Particles/Collision/BinaryCollision/ProtonBoronFusionCrossSection.H
+++ b/Source/Particles/Collision/BinaryCollision/NuclearFusion/ProtonBoronFusionCrossSection.H
diff --git a/Source/Particles/Collision/BinaryCollision/ProtonBoronFusionInitializeMomentum.H b/Source/Particles/Collision/BinaryCollision/NuclearFusion/ProtonBoronFusionInitializeMomentum.H
index 415555193..415555193 100644
--- a/Source/Particles/Collision/BinaryCollision/ProtonBoronFusionInitializeMomentum.H
+++ b/Source/Particles/Collision/BinaryCollision/NuclearFusion/ProtonBoronFusionInitializeMomentum.H
diff --git a/Source/Particles/Collision/BinaryCollision/SingleNuclearFusionEvent.H b/Source/Particles/Collision/BinaryCollision/NuclearFusion/SingleNuclearFusionEvent.H
index a1f3db324..c8633b52b 100644
--- a/Source/Particles/Collision/BinaryCollision/SingleNuclearFusionEvent.H
+++ b/Source/Particles/Collision/BinaryCollision/NuclearFusion/SingleNuclearFusionEvent.H
@@ -8,8 +8,9 @@
#ifndef SINGLE_NUCLEAR_FUSION_EVENT_H_
#define SINGLE_NUCLEAR_FUSION_EVENT_H_
-#include "BinaryCollisionUtils.H"
#include "ProtonBoronFusionCrossSection.H"
+
+#include "Particles/Collision/BinaryCollision/BinaryCollisionUtils.H"
#include "Utils/WarpXConst.H"
#include <AMReX_Algorithm.H>
diff --git a/Source/Particles/Collision/BinaryCollision/ParticleCreationFunc.H b/Source/Particles/Collision/BinaryCollision/ParticleCreationFunc.H
index 33c4ec520..6a8387eef 100644
--- a/Source/Particles/Collision/BinaryCollision/ParticleCreationFunc.H
+++ b/Source/Particles/Collision/BinaryCollision/ParticleCreationFunc.H
@@ -9,8 +9,8 @@
#define PARTICLE_CREATION_FUNC_H_
#include "BinaryCollisionUtils.H"
-#include "ProtonBoronFusionInitializeMomentum.H"
+#include "Particles/Collision/BinaryCollision/NuclearFusion/ProtonBoronFusionInitializeMomentum.H"
#include "Particles/ParticleCreation/SmartCopy.H"
#include "Particles/MultiParticleContainer.H"
#include "Particles/WarpXParticleContainer.H"
diff --git a/Source/Particles/Collision/CollisionHandler.cpp b/Source/Particles/Collision/CollisionHandler.cpp
index dd78f160f..ae62c1aab 100644
--- a/Source/Particles/Collision/CollisionHandler.cpp
+++ b/Source/Particles/Collision/CollisionHandler.cpp
@@ -7,10 +7,10 @@
#include "CollisionHandler.H"
#include "BackgroundMCCCollision.H"
+#include "Particles/Collision/BinaryCollision/Coulomb/PairWiseCoulombCollisionFunc.H"
#include "Particles/Collision/BinaryCollision/BinaryCollision.H"
-#include "Particles/Collision/BinaryCollision/NuclearFusionFunc.H"
+#include "Particles/Collision/BinaryCollision/NuclearFusion/NuclearFusionFunc.H"
#include "Particles/Collision/BinaryCollision/ParticleCreationFunc.H"
-#include "Particles/Collision/BinaryCollision/PairWiseCoulombCollisionFunc.H"
#include <AMReX_ParmParse.H>