ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding/removing underscores

Browse Source
This commit is contained in:
jtclemm
2022-11-10 16:25:34 -07:00
parent d1dd8d3c11
commit d6b5878dce
8 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/GRANULAR/gran_sub_mod.h
View File

@ -11,8 +11,8 @@
See the README file in the top-level LAMMPS directory. See the README file in the top-level LAMMPS directory.
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */
#ifndef LMP_GRAN_SUB_MOD_H_ #ifndef LMP_GRAN_SUB_MOD_H
#define LMP_GRAN_SUB_MOD_H_ #define LMP_GRAN_SUB_MOD_H
#include "granular_model.h" #include "granular_model.h"
#include "pointers.h" // IWYU pragma: export #include "pointers.h" // IWYU pragma: export
@ -59,4 +59,4 @@ class GranSubMod : protected Pointers {
} // namespace GranularModel } // namespace GranularModel
} // namespace LAMMPS_NS } // namespace LAMMPS_NS
#endif /* GRAN_SUB_MOD_H_ */ #endif /* GRAN_SUB_MOD_H */

8
src/GRANULAR/gran_sub_mod_damping.h
View File

@ -35,8 +35,8 @@ GranSubModStyle(tsuji,
// clang-format on // clang-format on
#else #else
#ifndef GRAN_SUB_MOD_DAMPING_H_ #ifndef GRAN_SUB_MOD_DAMPING_H
#define GRAN_SUB_MOD_DAMPING_H_ #define GRAN_SUB_MOD_DAMPING_H
#include "gran_sub_mod.h" #include "gran_sub_mod.h"
#include "pointers.h" #include "pointers.h"
@ -102,5 +102,5 @@ class GranSubModDampingTsuji : public GranSubModDamping {
} // namespace Granular_NS } // namespace Granular_NS
} // namespace LAMMPS_NS } // namespace LAMMPS_NS
#endif /*GRAN_SUB_MOD_DAMPING_H_ */ #endif /*GRAN_SUB_MOD_DAMPING_H */
#endif /*GRAN_SUB_MOD_CLASS_H_ */ #endif /*GRAN_SUB_MOD_CLASS_H */

8
src/GRANULAR/gran_sub_mod_heat.h
View File

@ -23,8 +23,8 @@ GranSubModStyle(area,
// clang-format on // clang-format on
#else #else
#ifndef GRAN_SUB_MOD_HEAT_H_ #ifndef GRAN_SUB_MOD_HEAT_H
#define GRAN_SUB_MOD_HEAT_H_ #define GRAN_SUB_MOD_HEAT_H
#include "gran_sub_mod.h" #include "gran_sub_mod.h"
@ -62,5 +62,5 @@ class GranSubModHeatArea : public GranSubModHeat {
} // namespace Granular_NS } // namespace Granular_NS
} // namespace LAMMPS_NS } // namespace LAMMPS_NS
#endif /*GRAN_SUB_MOD_HEAT_H_ */ #endif /*GRAN_SUB_MOD_HEAT_H */
#endif /*GRAN_SUB_MOD_CLASS_H_ */ #endif /*GRAN_SUB_MOD_CLASS_H */

8
src/GRANULAR/gran_sub_mod_normal.h
View File

@ -39,8 +39,8 @@ GranSubModStyle(jkr,
// clang-format on // clang-format on
#else #else
#ifndef GRAN_SUB_MOD_NORMAL_H_ #ifndef GRAN_SUB_MOD_NORMAL_H
#define GRAN_SUB_MOD_NORMAL_H_ #define GRAN_SUB_MOD_NORMAL_H
#include "gran_sub_mod.h" #include "gran_sub_mod.h"
@ -137,5 +137,5 @@ class GranSubModNormalJKR : public GranSubModNormal {
} // namespace Granular_NS } // namespace Granular_NS
} // namespace LAMMPS_NS } // namespace LAMMPS_NS
#endif /*GRAN_SUB_MOD_NORMAL_H_ */ #endif /*GRAN_SUB_MOD_NORMAL_H */
#endif /*GRAN_SUB_MOD_CLASS_H_ */ #endif /*GRAN_SUB_MOD_CLASS_H */

8
src/GRANULAR/gran_sub_mod_rolling.h
View File

@ -23,8 +23,8 @@ GranSubModStyle(sds,
// clang-format on // clang-format on
#else #else
#ifndef GRAN_SUB_MOD_ROLLING_H_ #ifndef GRAN_SUB_MOD_ROLLING_H
#define GRAN_SUB_MOD_ROLLING_H_ #define GRAN_SUB_MOD_ROLLING_H
#include "gran_sub_mod.h" #include "gran_sub_mod.h"
@ -62,5 +62,5 @@ class GranSubModRollingSDS : public GranSubModRolling {
} // namespace Granular_NS } // namespace Granular_NS
} // namespace LAMMPS_NS } // namespace LAMMPS_NS
#endif /*GRAN_SUB_MOD_ROLLING_H_ */ #endif /*GRAN_SUB_MOD_ROLLING_H */
#endif /*GRAN_SUB_MOD_CLASS_H_ */ #endif /*GRAN_SUB_MOD_CLASS_H */

8
src/GRANULAR/gran_sub_mod_tangential.h
View File

@ -51,8 +51,8 @@ GranSubModStyle(mindlin_rescale/force,
// clang-format on // clang-format on
#else #else
#ifndef GRAN_SUB_MOD_TANGENTIAL_H_ #ifndef GRAN_SUB_MOD_TANGENTIAL_H
#define GRAN_SUB_MOD_TANGENTIAL_H_ #define GRAN_SUB_MOD_TANGENTIAL_H
#include "gran_sub_mod.h" #include "gran_sub_mod.h"
@ -153,5 +153,5 @@ class GranSubModTangentialMindlinRescaleForce : public GranSubModTangentialMindl
} // namespace Granular_NS } // namespace Granular_NS
} // namespace LAMMPS_NS } // namespace LAMMPS_NS
#endif /*GRAN_SUB_MOD_TANGENTIAL_H_ */ #endif /*GRAN_SUB_MOD_TANGENTIAL_H */
#endif /*GRAN_SUB_MOD_CLASS_H_ */ #endif /*GRAN_SUB_MOD_CLASS_H */

8
src/GRANULAR/gran_sub_mod_twisting.h
View File

@ -27,8 +27,8 @@ GranSubModStyle(sds,
// clang-format on // clang-format on
#else #else
#ifndef GRAN_SUB_MOD_TWISTING_H_ #ifndef GRAN_SUB_MOD_TWISTING_H
#define GRAN_SUB_MOD_TWISTING_H_ #define GRAN_SUB_MOD_TWISTING_H
#include "gran_sub_mod.h" #include "gran_sub_mod.h"
@ -77,5 +77,5 @@ class GranSubModTwistingSDS : public GranSubModTwisting {
} // namespace Granular_NS } // namespace Granular_NS
} // namespace LAMMPS_NS } // namespace LAMMPS_NS
#endif /*GRAN_SUB_MOD_TWISTING_H_ */ #endif /*GRAN_SUB_MOD_TWISTING_H */
#endif /*GRAN_SUB_MOD_CLASS_H_ */ #endif /*GRAN_SUB_MOD_CLASS_H */

8
src/GRANULAR/granular_model.cpp
View File

@ -68,25 +68,25 @@ GranularModel::GranularModel(LAMMPS *lmp) : Pointers(lmp)
nclass = 0; nclass = 0;
#define GRANSUBMOD_CLASS #define GRAN_SUB_MOD_CLASS
#define GranSubModStyle(key,Class,type) nclass++; #define GranSubModStyle(key,Class,type) nclass++;
#include "style_gran_sub_mod.h" // IWYU pragma: keep #include "style_gran_sub_mod.h" // IWYU pragma: keep
#undef GranSubModStyle #undef GranSubModStyle
#undef GRANSUBMOD_CLASS #undef GRAN_SUB_MOD_CLASS
gran_sub_mod_class = new GranSubModCreator[nclass]; gran_sub_mod_class = new GranSubModCreator[nclass];
gran_sub_mod_names = new char*[nclass]; gran_sub_mod_names = new char*[nclass];
gran_sub_mod_types = new int[nclass]; gran_sub_mod_types = new int[nclass];
nclass = 0; nclass = 0;
#define GRANSUBMOD_CLASS #define GRAN_SUB_MOD_CLASS
#define GranSubModStyle(key,Class,type) \ #define GranSubModStyle(key,Class,type) \
gran_sub_mod_class[nclass] = &gran_sub_mod_creator<Class>; \ gran_sub_mod_class[nclass] = &gran_sub_mod_creator<Class>; \
gran_sub_mod_names[nclass] = (char *) #key; \ gran_sub_mod_names[nclass] = (char *) #key; \
gran_sub_mod_types[nclass++] = type; gran_sub_mod_types[nclass++] = type;
#include "style_gran_sub_mod.h" // IWYU pragma: keep #include "style_gran_sub_mod.h" // IWYU pragma: keep
#undef GranSubModStyle #undef GranSubModStyle
#undef GRANSUBMOD_CLASS #undef GRAN_SUB_MOD_CLASS
} }
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */