Skip to content

Commit

Permalink
clangformat
Browse files Browse the repository at this point in the history
  • Loading branch information
SamNewcome committed May 26, 2024
1 parent 2d9ea2a commit 1253588
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 12 deletions.
18 changes: 10 additions & 8 deletions examples/md-flexible/src/TypeDefinitions.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ using ParticleType = mdLib::MultisiteMoleculeLJ;
using ParticleType = mdLib::MoleculeLJ;
#endif

namespace mdFlexibleTypeDefs{
namespace mdFlexibleTypeDefs {
/**
* If AutoPas is compiled with FLOP logging enabled, use functors with FLOP counting enabled.
*/
Expand All @@ -60,7 +60,7 @@ constexpr bool countFLOPs =
#else
false;
#endif
} // namespace
} // namespace mdFlexibleTypeDefs

#if defined(MD_FLEXIBLE_FUNCTOR_AUTOVEC)
/**
Expand All @@ -69,8 +69,8 @@ constexpr bool countFLOPs =
* MD_FLEXIBLE_MODE.
*/
#if MD_FLEXIBLE_MODE == MULTISITE
using LJFunctorTypeAutovec =
mdLib::LJMultisiteFunctor<ParticleType, true, true, autopas::FunctorN3Modes::Both, false, mdFlexibleTypeDefs::countFLOPs>;
using LJFunctorTypeAutovec = mdLib::LJMultisiteFunctor<ParticleType, true, true, autopas::FunctorN3Modes::Both, false,
mdFlexibleTypeDefs::countFLOPs>;
#ifdef AUTOPAS_LOG_FLOPS
#warning "AUTOPAS_LOG_FLOPS enabled but is not suported for compiled functor (LJMultisiteFunctor)!"
#endif
Expand All @@ -88,8 +88,8 @@ using LJFunctorTypeAutovec =
* MD_FLEXIBLE_MODE.
*/
#if MD_FLEXIBLE_MODE == MULTISITE
using LJFunctorTypeAutovecGlobals =
mdLib::LJMultisiteFunctor<ParticleType, true, true, autopas::FunctorN3Modes::Both, true, mdFlexibleTypeDefs::countFLOPs>;
using LJFunctorTypeAutovecGlobals = mdLib::LJMultisiteFunctor<ParticleType, true, true, autopas::FunctorN3Modes::Both,
true, mdFlexibleTypeDefs::countFLOPs>;
#ifdef AUTOPAS_LOG_FLOPS
#warning "AUTOPAS_LOG_FLOPS enabled but is not suported for compiled functor (LJMultisiteFunctor)!"
#endif
Expand All @@ -110,7 +110,8 @@ using LJFunctorTypeAutovecGlobals =
#if MD_FLEXIBLE_MODE == MULTISITE
#error "Multi-Site Lennard-Jones Functor does not have AVX support!"
#else
using LJFunctorTypeAVX = mdLib::LJFunctorAVX<ParticleType, true, true, autopas::FunctorN3Modes::Both, true, mdFlexibleTypeDefs::countFLOPs>;
using LJFunctorTypeAVX =
mdLib::LJFunctorAVX<ParticleType, true, true, autopas::FunctorN3Modes::Both, true, mdFlexibleTypeDefs::countFLOPs>;
#ifdef AUTOPAS_LOG_FLOPS
#warning "AUTOPAS_LOG_FLOPS enabled but is not suported for compiled functor (LJFunctorAVX)!"
#endif
Expand All @@ -128,7 +129,8 @@ using LJFunctorTypeAVX = mdLib::LJFunctorAVX<ParticleType, true, true, autopas::
#if MD_FLEXIBLE_MODE == MULTISITE
#error "Multi-Site Lennard-Jones Functor does not have SVE support!"
#else
using LJFunctorTypeSVE = mdLib::LJFunctorSVE<ParticleType, true, true, autopas::FunctorN3Modes::Both, true, mdFlexibleTypeDefs::countFLOPs>;
using LJFunctorTypeSVE =
mdLib::LJFunctorSVE<ParticleType, true, true, autopas::FunctorN3Modes::Both, true, mdFlexibleTypeDefs::countFLOPs>;
#ifdef AUTOPAS_LOG_FLOPS
#warning "AUTOPAS_LOG_FLOPS enabled but is not suported for compiled functor (LJFunctorSVE)!"
#endif
Expand Down
8 changes: 4 additions & 4 deletions tests/testAutopas/testingHelpers/commonTypedefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ using FMCell = autopas::FullParticleCell<Molecule>;
*/
using MFunctor = MockFunctor<autopas::Particle>;

namespace autopasTestingTypeDefs{
namespace autopasTestingTypeDefs {
/**
* If AutoPas is compiled with FLOP logging enabled, use functors with FLOP counting enabled.
*/
Expand All @@ -48,7 +48,7 @@ constexpr bool countFLOPs =
#else
false;
#endif
} // namespace
} // namespace autopasTestingTypeDefs

/**
* Helper alias for LJFunctor, which specifies Particle as Molecule (as defined above) and countFLOPs as defined above.
Expand All @@ -58,5 +58,5 @@ constexpr bool countFLOPs =
template <bool applyShift = false, bool useMixing = false,
autopas::FunctorN3Modes useNewton3 = autopas::FunctorN3Modes::Both, bool calculateGlobals = false,
bool relevantForTuning = true>
using LJFunctorType =
mdLib::LJFunctor<Molecule, applyShift, useMixing, useNewton3, calculateGlobals, autopasTestingTypeDefs::countFLOPs, relevantForTuning>;
using LJFunctorType = mdLib::LJFunctor<Molecule, applyShift, useMixing, useNewton3, calculateGlobals,
autopasTestingTypeDefs::countFLOPs, relevantForTuning>;

0 comments on commit 1253588

Please sign in to comment.