From af1f20790ad2aa15e6fc2c9a51d8c870437a5fb7 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Thu, 16 Jan 2014 15:53:57 +0100 Subject: [PATCH 1/3] Introduce new Param File: dimension.param Removes the dependency from componentsConfig.param - useful for other param files - preparation for PIConGPU 2D --- .../param/componentsConfig.param | 4 --- .../param/componentsConfig.param | 4 --- .../param/componentsConfig.param | 4 --- .../param/componentsConfig.param | 4 --- .../param/componentsConfig.param | 4 --- .../param/componentsConfig.param | 4 --- .../param/componentsConfig.param | 4 --- .../param/componentsConfig.param | 4 --- .../simulation_defines/_defaultParam.loader | 1 + .../simulation_defines/param/dimension.param | 28 +++++++++++++++++++ 10 files changed, 29 insertions(+), 32 deletions(-) create mode 100644 src/picongpu/include/simulation_defines/param/dimension.param diff --git a/examples/Bunch/include/simulation_defines/param/componentsConfig.param b/examples/Bunch/include/simulation_defines/param/componentsConfig.param index 16e3d9035a..3d76231fd7 100644 --- a/examples/Bunch/include/simulation_defines/param/componentsConfig.param +++ b/examples/Bunch/include/simulation_defines/param/componentsConfig.param @@ -22,10 +22,6 @@ #pragma once -#define SIMDIM DIM3 - -const uint32_t simDim = SIMDIM; - namespace picongpu { /*! Simulation Starter --------------------------------------------------- diff --git a/examples/KelvinHelmholtz/include/simulation_defines/param/componentsConfig.param b/examples/KelvinHelmholtz/include/simulation_defines/param/componentsConfig.param index b9170f9113..a1daa7f265 100644 --- a/examples/KelvinHelmholtz/include/simulation_defines/param/componentsConfig.param +++ b/examples/KelvinHelmholtz/include/simulation_defines/param/componentsConfig.param @@ -22,10 +22,6 @@ #pragma once -#define SIMDIM DIM3 - -const uint32_t simDim = SIMDIM; - namespace picongpu { /*! Simulation Starter --------------------------------------------------- diff --git a/examples/LaserWakefield/include/simulation_defines/param/componentsConfig.param b/examples/LaserWakefield/include/simulation_defines/param/componentsConfig.param index 652f8cb439..95f42e9596 100644 --- a/examples/LaserWakefield/include/simulation_defines/param/componentsConfig.param +++ b/examples/LaserWakefield/include/simulation_defines/param/componentsConfig.param @@ -22,10 +22,6 @@ #pragma once -#define SIMDIM DIM3 - -const uint32_t simDim = SIMDIM; - namespace picongpu { /*! Simulation Starter --------------------------------------------------- diff --git a/examples/SingleParticleCurrent/include/simulation_defines/param/componentsConfig.param b/examples/SingleParticleCurrent/include/simulation_defines/param/componentsConfig.param index 563e198fe8..a864bad152 100644 --- a/examples/SingleParticleCurrent/include/simulation_defines/param/componentsConfig.param +++ b/examples/SingleParticleCurrent/include/simulation_defines/param/componentsConfig.param @@ -22,10 +22,6 @@ #pragma once -#define SIMDIM DIM3 - -const uint32_t simDim = SIMDIM; - namespace picongpu { /** Simulation Starter --------------------------------------------------- diff --git a/examples/SingleParticleRadiationWithLaser/include/simulation_defines/param/componentsConfig.param b/examples/SingleParticleRadiationWithLaser/include/simulation_defines/param/componentsConfig.param index beac5900ed..ceac408c26 100644 --- a/examples/SingleParticleRadiationWithLaser/include/simulation_defines/param/componentsConfig.param +++ b/examples/SingleParticleRadiationWithLaser/include/simulation_defines/param/componentsConfig.param @@ -22,10 +22,6 @@ #pragma once -#define SIMDIM DIM3 - -const uint32_t simDim = SIMDIM; - namespace picongpu { /** Simulation Starter --------------------------------------------------- diff --git a/examples/SingleParticleTest/include/simulation_defines/param/componentsConfig.param b/examples/SingleParticleTest/include/simulation_defines/param/componentsConfig.param index bed3c9ba51..8c9f833d91 100644 --- a/examples/SingleParticleTest/include/simulation_defines/param/componentsConfig.param +++ b/examples/SingleParticleTest/include/simulation_defines/param/componentsConfig.param @@ -22,10 +22,6 @@ #pragma once -#define SIMDIM DIM3 - -const uint32_t simDim = SIMDIM; - namespace picongpu { /** Simulation Starter --------------------------------------------------- diff --git a/examples/ThermalTest/include/simulation_defines/param/componentsConfig.param b/examples/ThermalTest/include/simulation_defines/param/componentsConfig.param index 8290d1a0a0..d18027154f 100644 --- a/examples/ThermalTest/include/simulation_defines/param/componentsConfig.param +++ b/examples/ThermalTest/include/simulation_defines/param/componentsConfig.param @@ -22,10 +22,6 @@ #pragma once -#define SIMDIM DIM3 - -const uint32_t simDim = SIMDIM; - namespace picongpu { /*! Simulation Starter --------------------------------------------------- diff --git a/examples/WeibelTransverse/include/simulation_defines/param/componentsConfig.param b/examples/WeibelTransverse/include/simulation_defines/param/componentsConfig.param index c82b1c4d2a..d64b2db230 100644 --- a/examples/WeibelTransverse/include/simulation_defines/param/componentsConfig.param +++ b/examples/WeibelTransverse/include/simulation_defines/param/componentsConfig.param @@ -22,10 +22,6 @@ #pragma once -#define SIMDIM DIM3 - -const uint32_t simDim = SIMDIM; - namespace picongpu { /*! Simulation Starter --------------------------------------------------- diff --git a/src/picongpu/include/simulation_defines/_defaultParam.loader b/src/picongpu/include/simulation_defines/_defaultParam.loader index 33033dce1f..be83b3db0d 100644 --- a/src/picongpu/include/simulation_defines/_defaultParam.loader +++ b/src/picongpu/include/simulation_defines/_defaultParam.loader @@ -25,6 +25,7 @@ */ #pragma once +#include "simulation_defines/param/dimension.param" #include "simulation_defines/param/precision.param" #include "simulation_defines/param/physicalConstants.param" #include "simulation_defines/param/particleDefinition.param" diff --git a/src/picongpu/include/simulation_defines/param/dimension.param b/src/picongpu/include/simulation_defines/param/dimension.param new file mode 100644 index 0000000000..5c43b40c3b --- /dev/null +++ b/src/picongpu/include/simulation_defines/param/dimension.param @@ -0,0 +1,28 @@ +/** + * Copyright 2014 Axel Huebl + * + * This file is part of PIConGPU. + * + * PIConGPU is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * PIConGPU is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with PIConGPU. + * If not, see . + */ + +#pragma once + +#define SIMDIM DIM3 + +namespace picongpu +{ + const uint32_t simDim = SIMDIM; +} // namespace picongpu From 8a4ae0935ca57016b3558a4bdf22cccb424485b0 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Thu, 16 Jan 2014 16:01:30 +0100 Subject: [PATCH 2/3] Add Param Change to Changelog - so we won't forget about this param change (quite important for users) --- CHANGELOG.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index efa2cb5844..0ef3073b77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,24 @@ Change Log / Release Log for PIConGPU ================================================================ +Open Beta RC3 +------------- +**Date:** TBA + +This is the third release candidate, a *pre-beta* version. + +### Changes to "Open Beta RC2" + +**.param file changes:** + - componentsConfig.param: + - remove simDim defines #134 + (example how to update yoyr existing componentsConfig.param, see + [https://github.com/ax3l/picongpu/commit/af1f20790ad2aa15e6fc2c9a51d8c870437a5fb7]) + - dimension.param: new file with simDim setting #134 + - only add this file to your example/test/config if you want to change it + from the default value (3D) + + Open Beta RC2 ------------- **Date:** 2013-11-27 From 627ae9a7471e7617dc588f1cea7ab48aaf43fc41 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Thu, 16 Jan 2014 16:05:59 +0100 Subject: [PATCH 3/3] Typo and Highlight File Names --- CHANGELOG.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ef3073b77..bd671767a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,11 +10,11 @@ This is the third release candidate, a *pre-beta* version. ### Changes to "Open Beta RC2" **.param file changes:** - - componentsConfig.param: + - `componentsConfig.param`: - remove simDim defines #134 - (example how to update yoyr existing componentsConfig.param, see + (example how to update your existing `componentsConfig.param`, see [https://github.com/ax3l/picongpu/commit/af1f20790ad2aa15e6fc2c9a51d8c870437a5fb7]) - - dimension.param: new file with simDim setting #134 + - `dimension.param`: new file with simDim setting #134 - only add this file to your example/test/config if you want to change it from the default value (3D) @@ -28,12 +28,12 @@ This is the second release candidate, a *pre-beta* version. ### Changes to "Open Beta RC1" **.param file changes:** - - gasConfig.param: + - `gasConfig.param`: - add gasFreeFormula #96 - (example how to update your existing gasConfig.param, see + (example how to update your existing `gasConfig.param`, see [https://github.com/ComputationalRadiationPhysics/picongpu/pull/96/files#diff-1]) - add inner radius to gasSphereFlanks #66 - (example how to update your existing gasConfig.param, see + (example how to update your existing `gasConfig.param`, see [https://github.com/ComputationalRadiationPhysics/picongpu/pull/66/files#diff-0]) **New Features:**