From 3c52be6a441d2e521fa0aa6189cd772c00ebfc85 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Tue, 30 Aug 2022 13:20:59 -0400 Subject: [PATCH] prevent clang-format from messing up Style macros --- src/MESONT/angle_mesocnt.h | 2 ++ src/MESONT/bond_mesocnt.h | 2 ++ src/MESONT/pair_mesocnt.h | 2 ++ src/MESONT/pair_mesocnt_viscous.h | 6 ++++-- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/MESONT/angle_mesocnt.h b/src/MESONT/angle_mesocnt.h index 2388b06e32..06e15c730d 100644 --- a/src/MESONT/angle_mesocnt.h +++ b/src/MESONT/angle_mesocnt.h @@ -17,7 +17,9 @@ ------------------------------------------------------------------------- */ #ifdef ANGLE_CLASS +// clang-format off AngleStyle(mesocnt, AngleMesoCNT); +// clang-format on #else #ifndef LMP_ANGLE_MESOCNT_H diff --git a/src/MESONT/bond_mesocnt.h b/src/MESONT/bond_mesocnt.h index 69bb3aef0e..7a4ae81128 100644 --- a/src/MESONT/bond_mesocnt.h +++ b/src/MESONT/bond_mesocnt.h @@ -17,7 +17,9 @@ ------------------------------------------------------------------------- */ #ifdef BOND_CLASS +// clang-format off BondStyle(mesocnt, BondMesoCNT); +// clang-format on #else #ifndef LMP_BOND_MESOCNT_H diff --git a/src/MESONT/pair_mesocnt.h b/src/MESONT/pair_mesocnt.h index 5b56f70184..941caba34f 100644 --- a/src/MESONT/pair_mesocnt.h +++ b/src/MESONT/pair_mesocnt.h @@ -17,7 +17,9 @@ ------------------------------------------------------------------------- */ #ifdef PAIR_CLASS +// clang-format off PairStyle(mesocnt, PairMesoCNT); +// clang-format on #else #ifndef LMP_PAIR_MESOCNT_H diff --git a/src/MESONT/pair_mesocnt_viscous.h b/src/MESONT/pair_mesocnt_viscous.h index e6fb88a9d2..84a2391031 100644 --- a/src/MESONT/pair_mesocnt_viscous.h +++ b/src/MESONT/pair_mesocnt_viscous.h @@ -15,11 +15,13 @@ Contributing author: Philipp Kloza (University of Cambridge) pak37@cam.ac.uk ------------------------------------------------------------------------- */ - #ifdef PAIR_CLASS -PairStyle(mesocnt / viscous, PairMesoCNTViscous); +// clang-format off +PairStyle(mesocnt/viscous, PairMesoCNTViscous); +// clang-format on #else + #ifndef LMP_PAIR_MESOCNT_VISCOUS_H #define LMP_PAIR_MESOCNT_VISCOUS_H