Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
S
src
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
75
Issues
75
List
Boards
Labels
Service Desk
Milestones
Merge Requests
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Code Review
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OPAL
src
Commits
fdb171eb
Commit
fdb171eb
authored
Sep 25, 2020
by
snuverink_j
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'small-fixes' into 'master'
Small fixes See merge request
!441
parents
a48c0f81
d4ece97d
Changes
162
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
162 changed files
with
409 additions
and
762 deletions
+409
-762
CMakeLists.txt
CMakeLists.txt
+2
-1
CMakeModules/FindGTest.cmake
CMakeModules/FindGTest.cmake
+0
-4
ippl/src/AppTypes/Vektor.h
ippl/src/AppTypes/Vektor.h
+13
-7
ippl/src/FFT/CMakeLists.txt
ippl/src/FFT/CMakeLists.txt
+1
-0
ippl/src/FFT/FFT.hpp
ippl/src/FFT/FFT.hpp
+1
-1
ippl/src/Field/BareField.h
ippl/src/Field/BareField.h
+1
-0
ippl/src/Field/BareField.hpp
ippl/src/Field/BareField.hpp
+1
-2
ippl/src/Field/CMakeLists.txt
ippl/src/Field/CMakeLists.txt
+1
-1
ippl/src/Index/SIndexAssign.hpp
ippl/src/Index/SIndexAssign.hpp
+3
-3
ippl/src/Meshes/UniformCartesian.hpp
ippl/src/Meshes/UniformCartesian.hpp
+0
-1
ippl/src/Message/Communicate.cpp
ippl/src/Message/Communicate.cpp
+0
-1
ippl/src/Message/Message.h
ippl/src/Message/Message.h
+0
-1
ippl/src/Message/Message.hpp
ippl/src/Message/Message.hpp
+0
-1
ippl/src/Particle/AbstractParticle.h
ippl/src/Particle/AbstractParticle.h
+3
-1
ippl/src/Particle/CMakeLists.txt
ippl/src/Particle/CMakeLists.txt
+2
-1
ippl/src/Particle/Interpolator.h
ippl/src/Particle/Interpolator.h
+2
-3
ippl/src/Particle/IpplParticleBase.h
ippl/src/Particle/IpplParticleBase.h
+4
-2
ippl/src/Particle/PAssignDefs.h
ippl/src/Particle/PAssignDefs.h
+2
-1
ippl/src/Particle/ParticleAttrib.h
ippl/src/Particle/ParticleAttrib.h
+1
-0
ippl/src/SubParticle/SubParticleAssignDefs.h
ippl/src/SubParticle/SubParticleAssignDefs.h
+1
-1
ippl/src/Utility/DiscField.h
ippl/src/Utility/DiscField.h
+0
-3
ippl/src/Utility/DiscField.hpp
ippl/src/Utility/DiscField.hpp
+0
-1
ippl/src/Utility/DiscParticle.h
ippl/src/Utility/DiscParticle.h
+2
-3
ippl/src/Utility/Inform.h
ippl/src/Utility/Inform.h
+1
-0
ippl/src/Utility/IpplInfo.cpp
ippl/src/Utility/IpplInfo.cpp
+1
-0
ippl/src/Utility/IpplInfo.h
ippl/src/Utility/IpplInfo.h
+2
-2
ippl/src/Utility/IpplMemoryUsage.cpp
ippl/src/Utility/IpplMemoryUsage.cpp
+3
-0
ippl/src/Utility/IpplMemoryUsage.h
ippl/src/Utility/IpplMemoryUsage.h
+3
-3
ippl/src/Utility/IpplStats.h
ippl/src/Utility/IpplStats.h
+2
-1
ippl/src/Utility/IpplTimings.cpp
ippl/src/Utility/IpplTimings.cpp
+0
-1
ippl/src/Utility/PAssert.h
ippl/src/Utility/PAssert.h
+0
-1
ippl/test/FFT/SeaborgRes/TestFFT-PPP.cpp
ippl/test/FFT/SeaborgRes/TestFFT-PPP.cpp
+0
-4
ippl/test/FFT/SeaborgRes/TestFFT-SPP.cpp
ippl/test/FFT/SeaborgRes/TestFFT-SPP.cpp
+0
-4
ippl/test/FFT/SeaborgRes/TestFFT-SSP.cpp
ippl/test/FFT/SeaborgRes/TestFFT-SSP.cpp
+1
-17
ippl/test/FFT/SeaborgRes/TestFFT.cpp
ippl/test/FFT/SeaborgRes/TestFFT.cpp
+0
-4
ippl/test/FFT/TestFFT-XT3.cpp
ippl/test/FFT/TestFFT-XT3.cpp
+0
-4
ippl/test/FFT/TestRCMIC.cpp
ippl/test/FFT/TestRCMIC.cpp
+2
-5
ippl/test/PwrSpec/PwrSpec.cpp
ippl/test/PwrSpec/PwrSpec.cpp
+1
-1
ippl/test/particle/PIC3d.cpp
ippl/test/particle/PIC3d.cpp
+1
-1
ippl/test/toyfdtf/ipplToyFDTD2.cpp
ippl/test/toyfdtf/ipplToyFDTD2.cpp
+0
-2
optimizer/Comm/types.h
optimizer/Comm/types.h
+0
-2
optimizer/Util/CmdArguments.cpp
optimizer/Util/CmdArguments.cpp
+2
-0
optimizer/Util/CmdArguments.h
optimizer/Util/CmdArguments.h
+0
-1
optimizer/Util/MPIHelper.cpp
optimizer/Util/MPIHelper.cpp
+1
-0
optimizer/Util/Types.h
optimizer/Util/Types.h
+2
-7
src/AbstractObjects/Attribute.cpp
src/AbstractObjects/Attribute.cpp
+2
-0
src/AbstractObjects/Attribute.h
src/AbstractObjects/Attribute.h
+0
-3
src/AbstractObjects/OpalData.h
src/AbstractObjects/OpalData.h
+0
-3
src/Algorithms/ParallelCyclotronTracker.cpp
src/Algorithms/ParallelCyclotronTracker.cpp
+2
-2
src/Algorithms/ParallelTTracker.cpp
src/Algorithms/ParallelTTracker.cpp
+3
-4
src/Algorithms/ThickTracker.h
src/Algorithms/ThickTracker.h
+6
-23
src/Algorithms/lomb.cpp
src/Algorithms/lomb.cpp
+0
-5
src/Amr/AmrYtWriter.cpp
src/Amr/AmrYtWriter.cpp
+1
-1
src/Amr/AmrYtWriter.h
src/Amr/AmrYtWriter.h
+1
-1
src/BasicActions/Option.cpp
src/BasicActions/Option.cpp
+3
-3
src/BasicActions/PSystem.cpp
src/BasicActions/PSystem.cpp
+2
-1
src/BasicActions/System.cpp
src/BasicActions/System.cpp
+2
-1
src/Classic/AbsBeamline/BeamStripping.cpp
src/Classic/AbsBeamline/BeamStripping.cpp
+1
-4
src/Classic/AbsBeamline/Component.h
src/Classic/AbsBeamline/Component.h
+0
-1
src/Classic/AbsBeamline/Degrader.cpp
src/Classic/AbsBeamline/Degrader.cpp
+16
-29
src/Classic/AbsBeamline/Degrader.h
src/Classic/AbsBeamline/Degrader.h
+2
-0
src/Classic/AbsBeamline/ElementBase.h
src/Classic/AbsBeamline/ElementBase.h
+1
-2
src/Classic/AbsBeamline/RFCavity.cpp
src/Classic/AbsBeamline/RFCavity.cpp
+5
-4
src/Classic/AbsBeamline/SBend.cpp
src/Classic/AbsBeamline/SBend.cpp
+2
-5
src/Classic/AbsBeamline/TravelingWave.cpp
src/Classic/AbsBeamline/TravelingWave.cpp
+0
-1
src/Classic/AbsBeamline/TravelingWave.h
src/Classic/AbsBeamline/TravelingWave.h
+2
-2
src/Classic/Algorithms/PBunchDefs.h
src/Classic/Algorithms/PBunchDefs.h
+1
-30
src/Classic/Algorithms/PartBins.h
src/Classic/Algorithms/PartBins.h
+0
-2
src/Classic/Algorithms/PartBunch.cpp
src/Classic/Algorithms/PartBunch.cpp
+8
-48
src/Classic/Algorithms/PartBunchBase.h
src/Classic/Algorithms/PartBunchBase.h
+22
-17
src/Classic/Algorithms/PartBunchBase.hpp
src/Classic/Algorithms/PartBunchBase.hpp
+6
-9
src/Classic/Algorithms/PartData.h
src/Classic/Algorithms/PartData.h
+0
-3
src/Classic/Algorithms/PolynomialTimeDependence.cpp
src/Classic/Algorithms/PolynomialTimeDependence.cpp
+2
-0
src/Classic/Algorithms/PolynomialTimeDependence.h
src/Classic/Algorithms/PolynomialTimeDependence.h
+2
-3
src/Classic/Algorithms/SplineTimeDependence.cpp
src/Classic/Algorithms/SplineTimeDependence.cpp
+2
-0
src/Classic/Algorithms/SplineTimeDependence.h
src/Classic/Algorithms/SplineTimeDependence.h
+3
-2
src/Classic/Algorithms/Tracker.cpp
src/Classic/Algorithms/Tracker.cpp
+2
-4
src/Classic/Algorithms/Tracker.h
src/Classic/Algorithms/Tracker.h
+4
-4
src/Classic/Algorithms/Vektor.h
src/Classic/Algorithms/Vektor.h
+0
-7
src/Classic/Beamlines/Beamline.h
src/Classic/Beamlines/Beamline.h
+0
-3
src/Classic/Beamlines/TBeamline.h
src/Classic/Beamlines/TBeamline.h
+1
-1
src/Classic/Fields/Fieldmap.cpp
src/Classic/Fields/Fieldmap.cpp
+4
-0
src/Classic/Fields/Interpolation/MMatrix.cpp
src/Classic/Fields/Interpolation/MMatrix.cpp
+0
-11
src/Classic/Fields/Interpolation/MMatrix.h
src/Classic/Fields/Interpolation/MMatrix.h
+1
-8
src/Classic/Fields/Interpolation/MVector.cpp
src/Classic/Fields/Interpolation/MVector.cpp
+0
-5
src/Classic/Fields/Interpolation/MVector.h
src/Classic/Fields/Interpolation/MVector.h
+0
-9
src/Classic/Fields/Interpolation/PPSolveFactory.h
src/Classic/Fields/Interpolation/PPSolveFactory.h
+1
-1
src/Classic/Fields/SectorField.h
src/Classic/Fields/SectorField.h
+2
-2
src/Classic/Fields/SectorMagneticFieldMap.cpp
src/Classic/Fields/SectorMagneticFieldMap.cpp
+5
-3
src/Classic/Fields/SectorMagneticFieldMap.h
src/Classic/Fields/SectorMagneticFieldMap.h
+2
-2
src/Classic/FixedAlgebra/FTpsData.h
src/Classic/FixedAlgebra/FTpsData.h
+0
-2
src/Classic/MemoryManagement/RCObject.h
src/Classic/MemoryManagement/RCObject.h
+0
-2
src/Classic/Parser/Statement.h
src/Classic/Parser/Statement.h
+1
-1
src/Classic/Solvers/BeamStrippingPhysics.cpp
src/Classic/Solvers/BeamStrippingPhysics.cpp
+1
-7
src/Classic/Solvers/BeamStrippingPhysics.hh
src/Classic/Solvers/BeamStrippingPhysics.hh
+8
-9
src/Classic/Solvers/CollimatorPhysics.cpp
src/Classic/Solvers/CollimatorPhysics.cpp
+11
-34
src/Classic/Solvers/CollimatorPhysics.hh
src/Classic/Solvers/CollimatorPhysics.hh
+13
-14
src/Classic/Solvers/ParticleMatterInteractionHandler.hh
src/Classic/Solvers/ParticleMatterInteractionHandler.hh
+0
-1
src/Classic/Structure/LossDataSink.cpp
src/Classic/Structure/LossDataSink.cpp
+0
-1
src/Classic/Structure/LossDataSink.h
src/Classic/Structure/LossDataSink.h
+3
-5
src/Classic/Structure/MeshGenerator.h
src/Classic/Structure/MeshGenerator.h
+22
-1
src/Classic/Structure/PeakFinder.cpp
src/Classic/Structure/PeakFinder.cpp
+3
-1
src/Classic/Structure/PeakFinder.h
src/Classic/Structure/PeakFinder.h
+0
-1
src/Classic/TrimCoils/OpalTrimCoil.cpp
src/Classic/TrimCoils/OpalTrimCoil.cpp
+1
-1
src/Classic/TrimCoils/OpalTrimCoil.h
src/Classic/TrimCoils/OpalTrimCoil.h
+1
-0
src/Classic/Utilities/ClassicField.h
src/Classic/Utilities/ClassicField.h
+0
-27
src/Distribution/ClosedOrbitFinder.h
src/Distribution/ClosedOrbitFinder.h
+0
-1
src/Distribution/Distribution.cpp
src/Distribution/Distribution.cpp
+7
-8
src/Distribution/SigmaGenerator.h
src/Distribution/SigmaGenerator.h
+5
-2
src/Elements/OpalBeamline.cpp
src/Elements/OpalBeamline.cpp
+27
-26
src/Elements/OpalCavity.cpp
src/Elements/OpalCavity.cpp
+1
-12
src/Elements/OpalCavity.h
src/Elements/OpalCavity.h
+0
-5
src/Elements/OpalElement.h
src/Elements/OpalElement.h
+1
-0
src/Elements/OpalFlexibleCollimator.cpp
src/Elements/OpalFlexibleCollimator.cpp
+1
-1
src/Elements/OpalPepperPot.cpp
src/Elements/OpalPepperPot.cpp
+2
-2
src/Elements/OpalQuadrupole.cpp
src/Elements/OpalQuadrupole.cpp
+2
-4
src/Elements/OpalTravelingWave.cpp
src/Elements/OpalTravelingWave.cpp
+1
-14
src/Elements/OpalTravelingWave.h
src/Elements/OpalTravelingWave.h
+0
-6
src/Expressions/Expressions.cpp
src/Expressions/Expressions.cpp
+1
-1
src/Expressions/SDeferred.h
src/Expressions/SDeferred.h
+2
-2
src/Expressions/SRefAttr.h
src/Expressions/SRefAttr.h
+1
-1
src/Lines/SequenceMember.h
src/Lines/SequenceMember.h
+1
-1
src/Main.cpp
src/Main.cpp
+15
-35
src/OpalParser/IfStatement.cpp
src/OpalParser/IfStatement.cpp
+1
-0
src/OpalParser/OpalParser.cpp
src/OpalParser/OpalParser.cpp
+3
-1
src/OpalParser/WhileStatement.cpp
src/OpalParser/WhileStatement.cpp
+3
-0
src/Sample/Sampler.cpp
src/Sample/Sampler.cpp
+1
-0
src/Sample/Sampler.h
src/Sample/Sampler.h
+2
-3
src/Solvers/BoxCornerDomain.h
src/Solvers/BoxCornerDomain.h
+5
-11
src/Solvers/FFTBoxPoissonSolver.h
src/Solvers/FFTBoxPoissonSolver.h
+5
-0
src/Solvers/FFTPoissonSolver.h
src/Solvers/FFTPoissonSolver.h
+4
-0
src/Solvers/IrregularDomain.h
src/Solvers/IrregularDomain.h
+3
-2
src/Solvers/P3MPoissonSolver.h
src/Solvers/P3MPoissonSolver.h
+7
-1
src/Solvers/PoissonSolver.h
src/Solvers/PoissonSolver.h
+7
-0
src/Structure/Beam.cpp
src/Structure/Beam.cpp
+1
-39
src/Structure/Beam.h
src/Structure/Beam.h
+1
-18
src/Structure/BoundaryGeometry.cpp
src/Structure/BoundaryGeometry.cpp
+0
-12
src/Structure/BoundaryGeometry.h
src/Structure/BoundaryGeometry.h
+0
-25
src/Structure/DataSink.cpp
src/Structure/DataSink.cpp
+4
-8
src/Structure/DataSink.h
src/Structure/DataSink.h
+10
-3
src/Structure/ElementPositionWriter.h
src/Structure/ElementPositionWriter.h
+1
-1
src/Structure/FieldSolver.cpp
src/Structure/FieldSolver.cpp
+8
-9
src/Structure/H5PartWrapper.h
src/Structure/H5PartWrapper.h
+8
-4
src/Structure/H5PartWrapperForPC.cpp
src/Structure/H5PartWrapperForPC.cpp
+0
-2
src/Structure/H5PartWrapperForPC.h
src/Structure/H5PartWrapperForPC.h
+1
-2
src/Structure/H5PartWrapperForPT.cpp
src/Structure/H5PartWrapperForPT.cpp
+2
-1
src/Structure/H5PartWrapperForPT.h
src/Structure/H5PartWrapperForPT.h
+0
-3
src/Structure/IpplInfoWrapper.h
src/Structure/IpplInfoWrapper.h
+1
-1
src/Structure/MemoryProfiler.h
src/Structure/MemoryProfiler.h
+0
-1
src/Structure/SDDSWriter.h
src/Structure/SDDSWriter.h
+0
-1
src/Track/TrackCmd.cpp
src/Track/TrackCmd.cpp
+0
-2
src/Track/TrackEnd.cpp
src/Track/TrackEnd.cpp
+1
-1
src/Track/TrackEnd.h
src/Track/TrackEnd.h
+0
-1
src/opal.cpp
src/opal.cpp
+6
-1
src/opal.h
src/opal.h
+1
-2
tests/classic_src/AbsBeamline/MultipoleTTest.cpp
tests/classic_src/AbsBeamline/MultipoleTTest.cpp
+2
-3
tests/ippl_src/Index/Index.cpp
tests/ippl_src/Index/Index.cpp
+1
-0
tests/ippl_src/Meshes/Average.cpp
tests/ippl_src/Meshes/Average.cpp
+1
-0
tests/ippl_src/Meshes/CartesianCentering.cpp
tests/ippl_src/Meshes/CartesianCentering.cpp
+2
-2
tests/ippl_src/Particle/EdgeCentering.cpp
tests/ippl_src/Particle/EdgeCentering.cpp
+1
-4
tools/README
tools/README
+4
-1
tools/opal2sdds/main.cpp
tools/opal2sdds/main.cpp
+0
-1
No files found.
CMakeLists.txt
View file @
fdb171eb
...
...
@@ -41,6 +41,7 @@ set (CMAKE_CXX_STANDARD 11)
set
(
CMAKE_CXX_STANDARD_REQUIRED ON
)
set
(
CMAKE_CXX_EXTENSIONS OFF
)
# Disable compile time assert (used by IPPL)
add_definitions
(
-DNOCTAssert
)
add_compile_options
(
-Wall
)
...
...
@@ -171,7 +172,7 @@ if (ENABLE_AMR)
endif
()
option
(
ENABLE_AMR_MG_SOLVER
"Enable AMR MG solver"
OFF
)
option
(
ENABLE_SAAMG_SOLVER
"Enable ite
ar
tive SA-AMG-PCG self field solver"
OFF
)
option
(
ENABLE_SAAMG_SOLVER
"Enable ite
ra
tive SA-AMG-PCG self field solver"
OFF
)
if
(
ENABLE_SAAMG_SOLVER OR ENABLE_AMR_MG_SOLVER
)
#
# :FIXME: We have to add checks whether the required Trilinos modules
...
...
CMakeModules/FindGTest.cmake
View file @
fdb171eb
#
# Find gtest Google Test includes and library
#
# gtest
# It can be found at:
# http://amas.web.psi.ch/tools/GSL/index.html
#
# GTEST_INCLUDE_DIR - where to find gtest/gtest.h
# GTEST_LIBRARY - libgtest.a path
# GTEST_MAIN_LIBRARY - libgtest_main.a path
...
...
ippl/src/AppTypes/Vektor.h
View file @
fdb171eb
...
...
@@ -17,6 +17,7 @@
#include "PETE/IpplExpressions.h"
#include "AppTypes/TSVMeta.h"
#include <cmath>
#include <iostream>
#include <iomanip>
...
...
@@ -277,6 +278,17 @@ cross(const Vektor<T1,D> &lhs, const Vektor<T2,D> &rhs)
return
TSV_MetaCross
<
Vektor
<
T1
,
D
>
,
Vektor
<
T2
,
D
>
>
::
apply
(
lhs
,
rhs
);
}
//----------------------------------------------------------------------
// euclidean norm
//----------------------------------------------------------------------
template
<
class
T
,
unsigned
D
>
inline
double
euclidean_norm
(
const
Vektor
<
T
,
D
>
&
a
)
{
return
std
::
sqrt
(
dot
(
a
,
a
));
}
//----------------------------------------------------------------------
// I/O
template
<
class
T
,
unsigned
D
>
...
...
@@ -296,10 +308,4 @@ inline std::ostream& operator<<(std::ostream& out, const Vektor<T,D>& rhs)
return
out
;
}
#endif // VEKTOR_H
/***************************************************************************
* $RCSfile: Vektor.h,v $ $Author: adelmann $
* $Revision: 1.1.1.1 $ $Date: 2003/01/23 07:40:24 $
* IPPL_VERSION_ID: $Id: Vektor.h,v 1.1.1.1 2003/01/23 07:40:24 adelmann Exp $
***************************************************************************/
\ No newline at end of file
#endif // VEKTOR_H
\ No newline at end of file
ippl/src/FFT/CMakeLists.txt
View file @
fdb171eb
...
...
@@ -7,6 +7,7 @@ set (_HDRS
FFTBase.h
FFT.hpp
FFT.h
fftpack.h
fftpack_FFT.h
)
...
...
ippl/src/FFT/FFT.hpp
View file @
fdb171eb
...
...
@@ -15,7 +15,7 @@
#include "FFT/FFT.h"
#include "FieldLayout/FieldLayout.h"
#include "Field/BareField.h"
#include "Utility/IpplStats.h"
//
#include "Utility/IpplStats.h"
//=============================================================================
// FFT CCTransform Constructors
...
...
ippl/src/Field/BareField.h
View file @
fdb171eb
...
...
@@ -31,6 +31,7 @@
#include "Index/SIndex.h"
#include "SubField/SubBareField.h"
#include "Utility/IpplInfo.h"
#include "Utility/IpplStats.h"
#include "Utility/PAssert.h"
#include "Utility/Unique.h"
#include "Utility/my_auto_ptr.h"
...
...
ippl/src/Field/BareField.hpp
View file @
fdb171eb
...
...
@@ -33,10 +33,9 @@
#include "Utility/Inform.h"
#include "Utility/Unique.h"
#include "Utility/IpplInfo.h"
#include "Utility/IpplStats.h"
//
#include "Utility/IpplStats.h"
#include <map>
#include <utility>
#include <cstdlib>
...
...
ippl/src/Field/CMakeLists.txt
View file @
fdb171eb
...
...
@@ -3,10 +3,10 @@ set (_SRCS
set
(
_HDRS
Assign.hpp
Assign.h
AssignDefs.h
AssignGeneralBF.hpp
AssignGeneralIBF.hpp
Assign.h
AssignTags.h
BareField.hpp
BareField.h
...
...
ippl/src/Index/SIndexAssign.hpp
View file @
fdb171eb
...
...
@@ -27,9 +27,9 @@
#include "Index/SIndexAssign.h"
#include "Index/SIndex.h"
#include "Field/BrickIterator.h"
#include "Field/Field.h"
#include "Field/IndexedField.h"
#include "Field/Assign.h"
//
#include "Field/Field.h"
//
#include "Field/IndexedField.h"
//
#include "Field/Assign.h"
#include "Utility/IpplInfo.h"
...
...
ippl/src/Meshes/UniformCartesian.hpp
View file @
fdb171eb
...
...
@@ -14,7 +14,6 @@
#include "Field/BareField.h"
#include "Field/BrickExpression.h"
#include "Field/LField.h"
#include "Field/Field.h"
#include "Field/Assign.h"
#include "Field/AssignDefs.h"
...
...
ippl/src/Message/Communicate.cpp
View file @
fdb171eb
...
...
@@ -38,7 +38,6 @@
#include "Utility/IpplInfo.h"
#include "Utility/IpplStats.h"
#include "Utility/RandomNumberGen.h"
#include "Utility/PAssert.h"
#include <cstdio>
...
...
ippl/src/Message/Message.h
View file @
fdb171eb
...
...
@@ -31,7 +31,6 @@
* of resolving who needs to free up the storage used for the Message elements.
***************************************************************************/
#include "Utility/Inform.h"
#include <complex>
#include <cstddef>
#include <vector>
...
...
ippl/src/Message/Message.hpp
View file @
fdb171eb
...
...
@@ -12,7 +12,6 @@
***************************************************************************/
#include "Message/Message.h"
#include "Utility/Inform.h"
#include "Utility/IpplInfo.h"
#include <iterator>
...
...
ippl/src/Particle/AbstractParticle.h
View file @
fdb171eb
...
...
@@ -22,7 +22,9 @@
#define ABSTRACT_PARTICLE_H
#include "Particle/ParticleLayout.h"
#include "Particle/ParticleAttrib.h"
template
<
class
T
>
class
ParticleAttrib
;
class
ParticleAttribBase
;
template
<
class
T
,
unsigned
Dim
>
class
AbstractParticle
{
...
...
ippl/src/Particle/CMakeLists.txt
View file @
fdb171eb
...
...
@@ -2,6 +2,7 @@ set (_SRCS
)
set
(
_HDRS
AbstractParticle.h
BoxParticleCachingPolicy.h
CellParticleCachingPolicy.h
GenArrayParticle.h
...
...
@@ -9,8 +10,8 @@ set (_HDRS
IntCIC.h
Interpolator.h
IntNGP.h
IntTSC.h
IntSUDS.h
IntTSC.h
NoParticleCachingPolicy.h
PairBuilder/BasicPairBuilder.h
PairBuilder/HashPairBuilder.h
...
...
ippl/src/Particle/Interpolator.h
View file @
fdb171eb
...
...
@@ -16,14 +16,13 @@
#include "Field/LField.h"
#include "Field/CompressedBrickIterator.h"
#include "Index/NDIndex.h"
#include "Meshes/Centering.h"
#include "AppTypes/Vektor.h"
#include "Utility/IpplInfo.h"
#include "Utility/IpplException.h"
#include <
i
ostream>
#include <ostream>
#include <vector>
#include <utility>
#include <cmath>
// Helper class and functions for finding nearest grid point given centering
...
...
ippl/src/Particle/IpplParticleBase.h
View file @
fdb171eb
...
...
@@ -95,15 +95,18 @@
// include files
#include "Particle/AbstractParticle.h"
#include "Particle/ParticleAttribBase.h"
#include "Particle/ParticleLayout.h"
#include "AppTypes/Vektor.h"
#include "DataSource/DataSource.h"
#include "DataSource/MakeDataSource.h"
#include "Message/Formatter.h"
#include <vector>
#include <algorithm> // Include algorithms
#include <utility>
#include <iostream>
template
<
class
T
,
unsigned
Dim
>
using
PLayout
=
ParticleLayout
<
T
,
Dim
>
;
// forward declarations
class
Inform
;
...
...
@@ -120,7 +123,6 @@ template <class T, unsigned D> class ParticleBConds;
template
<
class
PLayout
>
class
IpplParticleBase
:
public
DataSource
,
public
AbstractParticle
<
typename
PLayout
::
Position_t
,
PLayout
::
Dimension
>
{
public:
// useful enums
enum
{
Dim
=
PLayout
::
Dimension
};
...
...
ippl/src/Particle/PAssignDefs.h
View file @
fdb171eb
...
...
@@ -18,7 +18,8 @@
// forward declarations
template
<
class
T
>
class
ParticleAttrib
;
template
<
class
T
,
unsigned
Dim
>
class
ParticleAttribElem
;
template
<
class
T
>
class
ParticleAttribIterator
;
template
<
class
T
>
class
ParticleAttribConstIterator
;
//////////////////////////////////////////////////////////////////////
//
...
...
ippl/src/Particle/ParticleAttrib.h
View file @
fdb171eb
...
...
@@ -73,6 +73,7 @@
// include files
#include "Particle/ParticleAttribBase.h"
#include "Particle/ParticleAttribElem.h"
#include "Particle/PAssign.h"
#include "SubParticle/SubParticleAttrib.h"
#include "DataSource/DataSource.h"
#include "DataSource/MakeDataSource.h"
...
...
ippl/src/SubParticle/SubParticleAssignDefs.h
View file @
fdb171eb
...
...
@@ -13,7 +13,7 @@
// include files
#include "SubField/SubFieldAssignDefs.h"
#include "SubParticle/SubParticleA
ssign
.h"
#include "SubParticle/SubParticleA
ttrib
.h"
//////////////////////////////////////////////////////////////////////
//
...
...
ippl/src/Utility/DiscField.h
View file @
fdb171eb
...
...
@@ -14,7 +14,6 @@
// include files
#include "Index/NDIndex.h"
#include "Field/BrickExpression.h"
#include "Field/Field.h"
#include "Utility/DiscBuffer.h"
#include "Utility/DiscConfig.h"
#include "Utility/Inform.h"
...
...
@@ -24,8 +23,6 @@
#include <cstdlib>
#include <unistd.h>
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <vector>
#include <iostream>
...
...
ippl/src/Utility/DiscField.hpp
View file @
fdb171eb
...
...
@@ -27,7 +27,6 @@
#include "Utility/DiscField.h"
#include "Utility/DiscConfig.h"
#include "Utility/DiscMeta.h"
#include "Field/BrickIterator.h"
#include "Message/Tags.h"
#include "Utility/PAssert.h"
...
...
ippl/src/Utility/DiscParticle.h
View file @
fdb171eb
...
...
@@ -15,9 +15,9 @@
#include "Utility/DiscConfig.h"
#include "Utility/IpplInfo.h"
#include "Utility/PAssert.h"
#include "Message/Communicate.h"
#include "Message/Message.h"
#include "Message/Tags.h"
#include <vector>
#include <iostream>
...
...
@@ -26,7 +26,6 @@
// forward declarations
template
<
class
T
>
class
IpplParticleBase
;
template
<
class
T
>
class
ParticleAttrib
;
class
Message
;
class
DiscParticle
{
...
...
ippl/src/Utility/Inform.h
View file @
fdb171eb
...
...
@@ -34,6 +34,7 @@
#include <iostream>
#include <iomanip>
#include <sstream>
#include <string>
#define INFORM_ALL_NODES (-1)
...
...
ippl/src/Utility/IpplInfo.cpp
View file @
fdb171eb
...
...
@@ -25,6 +25,7 @@
// include files
#include "Utility/IpplInfo.h"
#include "Utility/Inform.h"
#include "Utility/IpplStats.h"
#include "Utility/PAssert.h"
#include "Utility/RandomNumberGen.h"
...
...
ippl/src/Utility/IpplInfo.h
View file @
fdb171eb
...
...
@@ -43,9 +43,8 @@
*/
// include files
#include "Utility/Inform.h"
#include "Message/Communicate.h"
#include "Utility/StaticIpplInfo.h"
#include "Utility/Inform.h"
#include <iostream>
#include <stack>
...
...
@@ -56,6 +55,7 @@
#include <mpi.h>
// forward declarations
class
Communicate
;
class
IpplStats
;
class
IpplInfo
;
std
::
ostream
&
operator
<<
(
std
::
ostream
&
,
const
IpplInfo
&
);
...
...
ippl/src/Utility/IpplMemoryUsage.cpp
View file @
fdb171eb
...
...
@@ -40,6 +40,9 @@
//
#include "Utility/IpplMemoryUsage.h"
#include "Message/GlobalComm.h"
#include "Utility/IpplInfo.h"
//////////////////////////////////////////////////////////////////////
IpplMemoryUsage
::
IpplMemoryUsage
()
{
}
...
...
ippl/src/Utility/IpplMemoryUsage.h
View file @
fdb171eb
...
...
@@ -38,11 +38,11 @@
// You should have received a copy of the GNU General Public License
// along with OPAL. If not, see <https://www.gnu.org/licenses/>.
//
#ifndef IPPL_MEM
P
RYUSAGE_H
#define IPPL_MEM
P
RYUSAGE_H
#ifndef IPPL_MEM
O
RYUSAGE_H
#define IPPL_MEM
O
RYUSAGE_H
#include "Ippl.h"
#include <memory>
#include <string>
#include <sys/resource.h>
#include <sys/time.h> // not required but increases portability
...
...
ippl/src/Utility/IpplStats.h
View file @
fdb171eb
...
...
@@ -38,10 +38,11 @@
// include files
#include "Utility/IpplInfo.h"
#include "Utility/Timer.h"
#include "Utility/Inform.h"
#include <vector>
class
Inform
;
class
IpplStats
{
public:
...
...
ippl/src/Utility/IpplTimings.cpp
View file @
fdb171eb
...
...
@@ -7,7 +7,6 @@
#include "Utility/IpplTimings.h"
#include "Utility/Inform.h"
#include "Utility/IpplInfo.h"
#include "Message/GlobalComm.h"
#include "PETE/IpplExpressions.h"
...
...
ippl/src/Utility/PAssert.h
View file @
fdb171eb
...
...
@@ -6,7 +6,6 @@
#ifndef PASSERT_H
#define PASSERT_H
#include "Utility/IpplInfo.h"
#include <exception>
#include <stdexcept>
...
...
ippl/test/FFT/SeaborgRes/TestFFT-PPP.cpp
View file @
fdb171eb
...
...
@@ -49,10 +49,6 @@ bool Configure(int argc, char *argv[], InterPolT *interPol,
Inform
msg
(
"Configure "
);
Inform
errmsg
(
"Error "
);
string
bc_str
;
string
interPol_str
;
string
dist_str
;
for
(
int
i
=
1
;
i
<
argc
;
++
i
)
{
string
s
(
argv
[
i
]);
if
(
s
==
"-grid"
)
{
...
...
ippl/test/FFT/SeaborgRes/TestFFT-SPP.cpp
View file @
fdb171eb
...
...
@@ -24,10 +24,6 @@ bool Configure(int argc, char *argv[], InterPolT *interPol,
Inform
msg
(
"Configure "
);
Inform
errmsg
(
"Error "
);
string
bc_str
;
string
interPol_str
;
string
dist_str
;
for
(
int
i
=
1
;
i
<
argc
;
++
i
)
{
string
s
(
argv
[
i
]);
if
(
s
==
"-grid"
)
{
...
...
ippl/test/FFT/SeaborgRes/TestFFT-SSP.cpp
View file @
fdb171eb
...
...
@@ -49,10 +49,6 @@ bool Configure(int argc, char *argv[], InterPolT *interPol,
Inform
msg
(
"Configure "
);
Inform
errmsg
(
"Error "
);
string
bc_str
;
string
interPol_str
;
string
dist_str
;
for
(
int
i
=
1
;
i
<
argc
;
++
i
)
{
string
s
(
argv
[
i
]);
if
(
s
==
"-grid"
)
{
...
...
@@ -247,16 +243,4 @@ int main(int argc, char *argv[])
testmsg
<<
" nx= "
<<
nx
<<
" ny= "
<<
ny
<<
" nz= "
<<
nz
;
testmsg
<<
" ||d||= "
<<
fabs
(
realDiff
)
<<
endl
;
return
0
;
}
/***************************************************************************
* $RCSfile: TestFFT-SSP.cpp,v $ $Author: adelmann $
* $Revision: 1.1.1.1 $ $Date: 2003/01/23 07:40:36 $
***************************************************************************/
/***************************************************************************
* $RCSfile: addheaderfooter,v $ $Author: adelmann $
* $Revision: 1.1.1.1 $ $Date: 2003/01/23 07:40:17 $
* IPPL_VERSION_ID: $Id: addheaderfooter,v 1.1.1.1 2003/01/23 07:40:17 adelmann Exp $
***************************************************************************/
}
\ No newline at end of file
ippl/test/FFT/SeaborgRes/TestFFT.cpp
View file @
fdb171eb
...
...
@@ -49,10 +49,6 @@ bool Configure(int argc, char *argv[], InterPolT *interPol,
Inform
msg
(
"Configure "
);
Inform
errmsg
(
"Error "
);
string
bc_str
;
string
interPol_str
;
string
dist_str
;
for
(
int
i
=
1
;
i
<
argc
;
++
i
)
{
string
s
(
argv
[
i
]);
if
(
s
==
"-grid"
)
{
...
...
ippl/test/FFT/TestFFT-XT3.cpp
View file @
fdb171eb
...
...
@@ -51,10 +51,6 @@ bool Configure(int argc, char *argv[], InterPolT *interPol,
Inform
msg
(
"Configure "
);
Inform
errmsg
(
"Error "
);
string
bc_str
;
string
interPol_str
;
string
dist_str
;
for
(
int
i
=
1
;
i
<
argc
;
++
i
)
{
string
s
(
argv
[
i
]);
if
(
s
==
"-grid"
)
{
...
...
ippl/test/FFT/TestRCMIC.cpp
View file @
fdb171eb
...
...
@@ -26,9 +26,6 @@ bool Configure(int argc, char *argv[],
Inform
msg
(
"Configure "
);
Inform
errmsg
(
"Error "
);
string
bc_str
;
string
dist_str
;
for
(
int
i
=
1
;
i
<
argc
;
++
i
)
{
string
s
(
argv
[
i
]);
if
(
s
==
"-grid"
)
{
...
...
@@ -167,8 +164,8 @@ int main(int argc, char *argv[])
BareField
<
double
,
D
>
RFieldSPStan_save
(
layoutSPStan
);
BareField
<
std
::
complex
<
double
>
,
D
>
CFieldSPStan0h
(
layoutSPStan0h
);
INFOMSG
(
"RFieldSPStan layout= "
<<
layoutSPStan
<<
endl
;
);
INFOMSG
(
"CFieldSPStan0h layout= "
<<
layoutSPStan0h
<<
endl
;
);
INFOMSG
(
"RFieldSPStan layout= "
<<
layoutSPStan
<<
endl
);
INFOMSG
(
"CFieldSPStan0h layout= "
<<
layoutSPStan0h
<<
endl
);
// For calling FieldDebug functions from debugger, set up output format:
setFormat
(
4
,
3
);
...
...
ippl/test/PwrSpec/PwrSpec.cpp
View file @
fdb171eb
...
...
@@ -195,7 +195,7 @@ void PwrSpec<T,Dim>::CICforward(ChargedParticles<T,Dim> *univ)
rho_m
[
gDomainL_m
]
=
rhocic_m
[
gDomainL_m
];
INFOMSG
(
"rhocic_m= "
<<
sum
(
rhocic_m
)
<<
" sum(M)= "
<<
sum
(
univ
->
M
)
<<
" rho_m= "
<<
sum
(
rho_m
)
<<
endl
;
);
INFOMSG
(
"rhocic_m= "
<<
sum
(
rhocic_m
)
<<
" sum(M)= "
<<
sum
(
univ
->
M
)
<<
" rho_m= "
<<
sum
(
rho_m
)
<<
endl
);
}
/***************************************************************************
...
...
ippl/test/particle/PIC3d.cpp
View file @
fdb171eb
...
...
@@ -474,7 +474,7 @@ public:
smsg
->
put
(
tmp
[
i
]);
bool
res
=
Ippl
::
Comm
->
send
(
smsg
,
0
,
tag
);
if
(
!
res
)
ERRORMSG
(
"Ippl::Comm->send(smsg, 0, tag) failed "
<<
endl
;
);
ERRORMSG
(
"Ippl::Comm->send(smsg, 0, tag) failed "
<<
endl
);
}
}
...
...
ippl/test/toyfdtf/ipplToyFDTD2.cpp
View file @
fdb171eb
...
...
@@ -211,8 +211,6 @@ int main(int argc, char *argv[]){
Inform
msg
(
argv
[
0
]);
Inform
msg2all
(
argv
[
0
],
INFORM_ALL_NODES
);
// variable declarations
int
i
,
j
,
k
;
// indices of the 3D array of cells
int
nx
,
ny
,
nz
;
// total number of cells along the x, y, and z axes, respectively
...
...
optimizer/Comm/types.h
View file @
fdb171eb
...
...
@@ -21,8 +21,6 @@
#ifndef __COMM_TYPES__
#define __COMM_TYPES__
#include <vector>
#include "mpi.h"
namespace
Comm
{
...
...
optimizer/Util/CmdArguments.cpp
View file @
fdb171eb
...
...
@@ -27,6 +27,8 @@
//
#include "Util/CmdArguments.h"
#include "boost/algorithm/string.hpp"
void
CmdArguments
::
addArguments
(
int
argc
,
char
**
argv
)
{
for
(
int
i
=
1
;
i
<
argc
;
i
++
)
{
...
...
optimizer/Util/CmdArguments.h
View file @
fdb171eb
...
...
@@ -35,7 +35,6 @@
#include <set>
#include "boost/smart_ptr.hpp"
#include "boost/algorithm/string.hpp"
#include "boost/utility/value_init.hpp"
#include "Util/OptPilotException.h"
...
...
optimizer/Util/MPIHelper.cpp
View file @
fdb171eb
...
...
@@ -22,6 +22,7 @@
#include <boost/static_assert.hpp>
#include <boost/serialization/map.hpp>
#include <boost/serialization/vector.hpp>
#include <boost/archive/text_oarchive.hpp>
#include <boost/archive/text_iarchive.hpp>
...
...
optimizer/Util/Types.h
View file @
fdb171eb
...
...
@@ -21,17 +21,12 @@
#ifndef __TYPES_H__
#define __TYPES_H__
#include <vector>
#include <map>
#include <utility>
#include <vector>
#include <boost/serialization/map.hpp>
#include "boost/serialization/vector.hpp"
#include "boost/tuple/tuple.hpp"
#include "boost/variant.hpp"
#include "boost/fusion/adapted/struct/adapt_struct.hpp"
#include "boost/fusion/include/adapt_struct.hpp"
#include "Expression/Expression.h"
//FIXME: add namespaces
...
...
src/AbstractObjects/Attribute.cpp
View file @
fdb171eb
...
...
@@ -20,6 +20,8 @@
#include "AbstractObjects/AttributeBase.h"
#include "Utilities/Options.h"
#include "Utility/Inform.h"
#include <set>
#include <iostream>
...
...
src/AbstractObjects/Attribute.h
View file @
fdb171eb
...
...
@@ -24,9 +24,6 @@
#include <iosfwd>
#include <string>
// #include <Ippl.h>
#include <Utility/Inform.h>
class
Statement
;
// Class Attribute
...
...
src/AbstractObjects/OpalData.h
View file @
fdb171eb
...
...
@@ -38,9 +38,6 @@ class BoundaryGeometry;
// store element name, max phase
typedef
std
::
pair
<
std
::
string
,
double
>
MaxPhasesT
;
typedef
std
::
map
<
double
,
double
>
energyEvolution_t
;
typedef
energyEvolution_t
::
value_type
energyEvData_t
;
// Class OpalData
// ------------------------------------------------------------------------
...
...
src/Algorithms/ParallelCyclotronTracker.cpp
View file @
fdb171eb
...
...
@@ -899,7 +899,7 @@ void ParallelCyclotronTracker::visitRFCavity(const RFCavity &as) {
RFCavity
*
elptr
=
dynamic_cast
<
RFCavity
*>
(
as
.
clone
());
myElements
.
push_back
(
elptr
);
if
((
elptr
->
getComponentType
()
!=
"SINGLEGAP"
)
&&
(
elptr
->
getComponentType
()
!=
"DOUBLEGAP"
)
)
{
if
(
elptr
->
getComponentType
()
!=
"SINGLEGAP"
)
{
*
gmsg
<<
(
elptr
->
getComponentType
())
<<
endl
;
throw
OpalException
(
"ParallelCyclotronTracker::visitRFCavity"
,
"The ParallelCyclotronTracker can only play with cyclotron type RF system currently ..."
);
...
...
@@ -1633,7 +1633,7 @@ double ParallelCyclotronTracker::getHarmonicNumber() const {
return
elcycl
->
getCyclHarm
();
throw
OpalException
(
"ParallelCyclotronTracker::getHarmonicNumber()"
,
std
::
string
(
"The first item in the FieldDimensions list does not "
)
+
std
::
string
(
"seem to be a
n
Ring or a Cyclotron element"
));
+
std
::
string
(
"seem to be a Ring or a Cyclotron element"
));
}