Skip to content

Commit

Permalink
core: clang-format most of the things.
Browse files Browse the repository at this point in the history
  • Loading branch information
fweik committed Aug 22, 2018
1 parent af8ded8 commit 1f06a12
Show file tree
Hide file tree
Showing 329 changed files with 14,324 additions and 13,116 deletions.
5 changes: 0 additions & 5 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ BreakBeforeBinaryOperators: None
BreakBeforeBraces: Attach
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false
BreakAfterJavaFieldAnnotations: false
BreakStringLiterals: true
ColumnLimit: 80
CommentPragmas: '^ IWYU pragma:'
ConstructorInitializerAllOnOneLineOrOnePerLine: false
Expand All @@ -55,12 +53,9 @@ IncludeCategories:
Priority: 3
- Regex: '.*'
Priority: 1
IncludeIsMainRegex: '$'
IndentCaseLabels: false
IndentWidth: 2
IndentWrappedFunctionNames: false
JavaScriptQuotes: Leave
JavaScriptWrapImports: true
KeepEmptyLinesAtTheStartOfBlocks: true
MacroBlockBegin: ''
MacroBlockEnd: ''
Expand Down
2 changes: 1 addition & 1 deletion src/core/ComFixed.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
#include "Vector.hpp"
#include "utils/keys.hpp"

#include <boost/mpi/communicator.hpp>
#include <boost/mpi/collectives/all_reduce.hpp>
#include <boost/mpi/communicator.hpp>

#include <unordered_map>
#include <vector>
Expand Down
3 changes: 1 addition & 2 deletions src/core/EspressoSystemInterface.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,7 @@ class EspressoSystemInterface : public SystemInterface {
: m_gpu_npart(0), m_gpu(false), m_r_gpu_begin(0), m_r_gpu_end(0),
m_dip_gpu_begin(0), m_v_gpu_begin(0), m_v_gpu_end(0), m_q_gpu_begin(0),
m_q_gpu_end(0), m_quatu_gpu_begin(0), m_quatu_gpu_end(0),
m_needsParticleStructGpu(false), m_splitParticleStructGpu(false)
{};
m_needsParticleStructGpu(false), m_splitParticleStructGpu(false){};
virtual ~EspressoSystemInterface() {}

void gatherParticles();
Expand Down
3 changes: 1 addition & 2 deletions src/core/Geometry.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
#include "config.hpp"
#include "Geometry.hpp"

#include "config.hpp"
24 changes: 12 additions & 12 deletions src/core/Geometry.hpp
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
#include "EspressoSystemInterface.hpp"

class Geometry {
public:
void set_box_l(Vector3d x) {m_box_l =x;}
void set_my_left(Vector3d x) {m_my_left=x;}
void set_my_right(Vector3d x) { m_my_right=x;}
Vector3d get_box_l() {return m_box_l;}
Vector3d get_my_left() { return m_my_left; }
Vector3d get_my_right() { return m_my_right; }
private:
Vector3d m_box_l;
Vector3d m_my_left;
Vector3d m_my_right;
};
public:
void set_box_l(Vector3d x) { m_box_l = x; }
void set_my_left(Vector3d x) { m_my_left = x; }
void set_my_right(Vector3d x) { m_my_right = x; }
Vector3d get_box_l() { return m_box_l; }
Vector3d get_my_left() { return m_my_left; }
Vector3d get_my_right() { return m_my_right; }

private:
Vector3d m_box_l;
Vector3d m_my_left;
Vector3d m_my_right;
};
3 changes: 1 addition & 2 deletions src/core/PartCfg.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ class GetLocalParts {
public:
Range operator()() const {
if (local_particles == nullptr) {
auto begin =
skip_it(nullptr, nullptr, SkipIfNullOrGhost());
auto begin = skip_it(nullptr, nullptr, SkipIfNullOrGhost());
return Utils::make_range(make_indirect_iterator(begin),
make_indirect_iterator(begin));
}
Expand Down
4 changes: 2 additions & 2 deletions src/core/ParticleIterator.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ struct ParticleIterator : public boost::iterator_facade<
public:
friend typename std::iterator_traits<ParticleIterator>::difference_type
distance(ParticleIterator const &begin, ParticleIterator const &end) {
if(begin == end)
if (begin == end)
return 0;

/* Remaining parts in this cell */
auto dist = ((*begin.m_cell)->n - begin.m_part_id);
/* Now add the size of all cells between the next
Expand Down
Loading

0 comments on commit 1f06a12

Please sign in to comment.