cleanup includes in param and unitless files

- delete all include of param and unitless files inside unitelss and param files Note: dependencies inside param und unitless files were **only** managed by *.loader files
psychocoderHPC · Feb 26, 2014 · 9b049fc · 9b049fc
1 parent 005588f
commit 9b049fc
Show file tree

Hide file tree

Showing 48 changed files with 9 additions and 118 deletions.
diff --git a/examples/Bunch/include/simulation_defines/param/observer.hpp b/examples/Bunch/include/simulation_defines/param/observer.hpp
@@ -23,8 +23,6 @@
 
 #pragma once
 
-#include "types.h"
-#include "simulation_defines.hpp"
 
 namespace picongpu
 {

diff --git a/examples/Bunch/include/simulation_defines/param/physicalConstants.param b/examples/Bunch/include/simulation_defines/param/physicalConstants.param
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines/param/gridConfig.param"
 
 namespace picongpu
 {

diff --git a/examples/Bunch/include/simulation_defines/param/visColorScales.param b/examples/Bunch/include/simulation_defines/param/visColorScales.param
@@ -23,7 +23,6 @@
 #ifndef COLORSCALES_HPP
 #define	COLORSCALES_HPP
 
-#include "types.h"
 #include "basicOperations.hpp"
 
 namespace picongpu

diff --git a/examples/Bunch/include/simulation_defines/param/visualization.param b/examples/Bunch/include/simulation_defines/param/visualization.param
@@ -23,9 +23,7 @@
 #pragma once
 
 #include <cmath>
-#include "simulation_defines.hpp"
 #include "basicOperations.hpp"
-#include "visColorScales.param"
 
 namespace picongpu
 {

diff --git a/examples/KelvinHelmholtz/include/simulation_defines/param/observer.hpp b/examples/KelvinHelmholtz/include/simulation_defines/param/observer.hpp
@@ -23,9 +23,6 @@
 
 #pragma once
 
-#include "types.h"
-#include "simulation_defines.hpp"
-
 namespace picongpu
 {
   namespace radiation_observer

diff --git a/examples/KelvinHelmholtz/include/simulation_defines/param/physicalConstants.param b/examples/KelvinHelmholtz/include/simulation_defines/param/physicalConstants.param
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines/param/gridConfig.param"
 
 namespace picongpu
 {

diff --git a/examples/KelvinHelmholtz/include/simulation_defines/param/visColorScales.param b/examples/KelvinHelmholtz/include/simulation_defines/param/visColorScales.param
@@ -19,11 +19,8 @@
  */ 
 
 
+#pragma once
 
-#ifndef COLORSCALES_HPP
-#define	COLORSCALES_HPP
-
-#include "types.h"
 #include "basicOperations.hpp"
 
 namespace picongpu
@@ -117,5 +114,3 @@ namespace picongpu
 
     }
 }
-
-#endif	/* COLORSCALES_HPP */
diff --git a/examples/KelvinHelmholtz/include/simulation_defines/param/visualization.param b/examples/KelvinHelmholtz/include/simulation_defines/param/visualization.param
@@ -25,8 +25,6 @@
 #include <cmath>
 
 #include "basicOperations.hpp"
-#include "particleConfig.param"
-#include "visColorScales.param"
 
 namespace picongpu
 {

diff --git a/examples/LaserWakefield/include/simulation_defines/param/particleConfig.param b/examples/LaserWakefield/include/simulation_defines/param/particleConfig.param
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines/param/gasConfig.param"
 #include "particles/shapes.hpp"
 
 namespace picongpu

diff --git a/examples/LaserWakefield/include/simulation_defines/param/physicalConstants.param b/examples/LaserWakefield/include/simulation_defines/param/physicalConstants.param
@@ -22,8 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines/param/gridConfig.param"
-
 namespace picongpu
 {
     const double PI = 3.141592653589793238462643383279502884197169399;

diff --git a/examples/LaserWakefield/include/simulation_defines/param/visColorScales.param b/examples/LaserWakefield/include/simulation_defines/param/visColorScales.param
@@ -19,11 +19,8 @@
  */ 
 
 
+#pragma once
 
-#ifndef COLORSCALES_HPP
-#define	COLORSCALES_HPP
-
-#include "types.h"
 #include "basicOperations.hpp"
 
 namespace picongpu
@@ -117,5 +114,3 @@ namespace picongpu
 
     }
 }
-
-#endif	/* COLORSCALES_HPP */
diff --git a/examples/LaserWakefield/include/simulation_defines/param/visualization.param b/examples/LaserWakefield/include/simulation_defines/param/visualization.param
@@ -23,9 +23,7 @@
 #pragma once
 
 #include <cmath>
-#include "simulation_defines.hpp"
 #include "basicOperations.hpp"
-#include "visColorScales.param"
 
 namespace picongpu
 {

diff --git a/examples/SingleParticleCurrent/include/simulation_defines/param/particleConfig.param b/examples/SingleParticleCurrent/include/simulation_defines/param/particleConfig.param
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines/param/gasConfig.param"
 #include "particles/shapes.hpp"
 
 namespace picongpu

diff --git a/examples/SingleParticleCurrent/include/simulation_defines/param/visColorScales.param b/examples/SingleParticleCurrent/include/simulation_defines/param/visColorScales.param
@@ -19,11 +19,7 @@
  */ 
 
 
-
-#ifndef COLORSCALES_HPP
-#define	COLORSCALES_HPP
-
-#include "types.h"
+#pragma once
 #include "basicOperations.hpp"
 
 namespace picongpu
@@ -117,5 +113,3 @@ namespace picongpu
 
     }
 }
-
-#endif	/* COLORSCALES_HPP */
diff --git a/examples/SingleParticleCurrent/include/simulation_defines/param/visualization.param b/examples/SingleParticleCurrent/include/simulation_defines/param/visualization.param
@@ -25,7 +25,7 @@
 #include <cmath>
 
 #include "basicOperations.hpp"
-#include "visColorScales.param"
+
 
 namespace picongpu
 {
@@ -83,4 +83,3 @@ DINLINE float_X preChannel3(const float3_X& field_B, const float3_X& field_E, co
 }
 }
 }
-
diff --git a/examples/SingleParticleCurrent/include/simulation_defines/unitless/backgroundFields.unitless b/examples/SingleParticleCurrent/include/simulation_defines/unitless/backgroundFields.unitless
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines/param/backgroundFields.param"
 
 namespace picongpu
 {

diff --git a/examples/SingleParticleCurrent/include/simulation_defines/unitless/starter.unitless b/examples/SingleParticleCurrent/include/simulation_defines/unitless/starter.unitless
@@ -22,10 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines.hpp"
-
-
-#include "simulation_defines.hpp"
 #include "plugins/PluginController.hpp"
 #include "initialization/InitModuleNone.hpp"
 #include "OneParticleSimulation.hpp"
@@ -46,4 +42,3 @@ namespace picongpu
         > SimStarter;
     }
 }
-
diff --git a/examples/SingleParticleRadiationWithLaser/include/simulation_defines/param/observer.hpp b/examples/SingleParticleRadiationWithLaser/include/simulation_defines/param/observer.hpp
@@ -23,9 +23,6 @@
 
 #pragma once
 
-#include "types.h"
-#include "simulation_defines.hpp"
-
 namespace picongpu
 {
   namespace radiation_observer

diff --git a/...es/SingleParticleRadiationWithLaser/include/simulation_defines/param/particleConfig.param b/...es/SingleParticleRadiationWithLaser/include/simulation_defines/param/particleConfig.param
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines/param/gasConfig.param"
 #include "particles/shapes.hpp"
 
 namespace picongpu

diff --git a/...es/SingleParticleRadiationWithLaser/include/simulation_defines/param/visColorScales.param b/...es/SingleParticleRadiationWithLaser/include/simulation_defines/param/visColorScales.param
@@ -19,11 +19,8 @@
  */ 
 
 
+#pragma once
 
-#ifndef COLORSCALES_HPP
-#define	COLORSCALES_HPP
-
-#include "types.h"
 #include "basicOperations.hpp"
 
 namespace picongpu
@@ -117,5 +114,3 @@ namespace picongpu
 
     }
 }
-
-#endif	/* COLORSCALES_HPP */
diff --git a/...les/SingleParticleRadiationWithLaser/include/simulation_defines/param/visualization.param b/...les/SingleParticleRadiationWithLaser/include/simulation_defines/param/visualization.param
@@ -25,7 +25,7 @@
 #include <cmath>
 
 #include "basicOperations.hpp"
-#include "visColorScales.param"
+
 
 namespace picongpu
 {
@@ -83,4 +83,3 @@ DINLINE float_X preChannel3(const float3_X& field_B, const float3_X& field_E, co
 }
 }
 }
-
diff --git a/...les/SingleParticleRadiationWithLaser/include/simulation_defines/unitless/starter.unitless b/...les/SingleParticleRadiationWithLaser/include/simulation_defines/unitless/starter.unitless
@@ -22,10 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines.hpp"
-
-
-#include "simulation_defines.hpp"
 #include "plugins/PluginController.hpp"
 #include "initialization/InitModuleNone.hpp"
 #include "OneParticleSimulation.hpp"
@@ -46,4 +42,3 @@ namespace picongpu
         > SimStarter;
     }
 }
-
diff --git a/...ngleParticleRadiationWithLaser/include/simulation_defines/unitless/testExtension.unitless b/...ngleParticleRadiationWithLaser/include/simulation_defines/unitless/testExtension.unitless
@@ -22,8 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines/param/testExtension.param"
-
 namespace picongpu
 {
     // Constant Background Fields

diff --git a/examples/SingleParticleTest/include/simulation_defines/param/particleConfig.param b/examples/SingleParticleTest/include/simulation_defines/param/particleConfig.param
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines/param/gasConfig.param"
 #include "particles/shapes.hpp"
 
 namespace picongpu

diff --git a/examples/SingleParticleTest/include/simulation_defines/param/visColorScales.param b/examples/SingleParticleTest/include/simulation_defines/param/visColorScales.param
@@ -19,11 +19,8 @@
  */ 
 
 
+#pragma once
 
-#ifndef COLORSCALES_HPP
-#define	COLORSCALES_HPP
-
-#include "types.h"
 #include "basicOperations.hpp"
 
 namespace picongpu
@@ -117,5 +114,3 @@ namespace picongpu
 
     }
 }
-
-#endif	/* COLORSCALES_HPP */
diff --git a/examples/SingleParticleTest/include/simulation_defines/param/visualization.param b/examples/SingleParticleTest/include/simulation_defines/param/visualization.param
@@ -25,7 +25,6 @@
 #include <cmath>
 
 #include "basicOperations.hpp"
-#include "visColorScales.param"
 
 namespace picongpu
 {

diff --git a/examples/SingleParticleTest/include/simulation_defines/unitless/backgroundFields.unitless b/examples/SingleParticleTest/include/simulation_defines/unitless/backgroundFields.unitless
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines/param/backgroundFields.param"
 
 namespace picongpu
 {

diff --git a/examples/SingleParticleTest/include/simulation_defines/unitless/starter.unitless b/examples/SingleParticleTest/include/simulation_defines/unitless/starter.unitless
@@ -22,10 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines.hpp"
-
-
-#include "simulation_defines.hpp"
 #include "plugins/PluginController.hpp"
 #include "initialization/InitModuleNone.hpp"
 #include "OneParticleSimulation.hpp"

diff --git a/examples/ThermalTest/include/simulation_defines/param/particleConfig.param b/examples/ThermalTest/include/simulation_defines/param/particleConfig.param
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines/param/gasConfig.param"
 #include "particles/shapes.hpp"
 
 namespace picongpu

diff --git a/examples/ThermalTest/include/simulation_defines/unitless/starter.unitless b/examples/ThermalTest/include/simulation_defines/unitless/starter.unitless
@@ -22,10 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines.hpp"
-
-
-#include "simulation_defines.hpp"
 #include "plugins/PluginController.hpp"
 #include "initialization/InitialiserController.hpp"
 #include "ThermalTestSimulation.hpp"
@@ -47,4 +43,3 @@ namespace picongpu
         > SimStarter;
     }
 }
-
diff --git a/examples/WeibelTransverse/include/simulation_defines/param/particleConfig.param b/examples/WeibelTransverse/include/simulation_defines/param/particleConfig.param
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines/param/gasConfig.param"
 #include "particles/shapes.hpp"
 
 namespace picongpu

diff --git a/examples/WeibelTransverse/include/simulation_defines/param/physicalConstants.param b/examples/WeibelTransverse/include/simulation_defines/param/physicalConstants.param
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include "simulation_defines/param/gridConfig.param"
 
 namespace picongpu
 {

diff --git a/examples/WeibelTransverse/include/simulation_defines/param/visColorScales.param b/examples/WeibelTransverse/include/simulation_defines/param/visColorScales.param
@@ -19,11 +19,8 @@
  */ 
 
 
+#pragma once
 
-#ifndef COLORSCALES_HPP
-#define	COLORSCALES_HPP
-
-#include "types.h"
 #include "basicOperations.hpp"
 
 namespace picongpu
@@ -117,5 +114,3 @@ namespace picongpu
 
     }
 }
-
-#endif	/* COLORSCALES_HPP */
diff --git a/examples/WeibelTransverse/include/simulation_defines/param/visualization.param b/examples/WeibelTransverse/include/simulation_defines/param/visualization.param
@@ -25,8 +25,6 @@
 #include <cmath>
 
 #include "basicOperations.hpp"
-#include "particleConfig.param"
-#include "visColorScales.param"
 
 namespace picongpu
 {

diff --git a/src/picongpu/include/simulation_defines/param/fieldBackground.param b/src/picongpu/include/simulation_defines/param/fieldBackground.param
@@ -20,9 +20,6 @@
 
 #pragma once
 
-#include "physicalConstants.param"
-#include "gridConfig.param"
-
 /** Load external background fields
  * 
  */
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,6 @@ @@
     #pragma once
-    #include "simulation_defines/param/gridConfig.param"
     namespace picongpu
     {
@@ Expand Down @@