From c588b44cf11eaca2bc3343eb6a499d002c51657c Mon Sep 17 00:00:00 2001
From: Axel Kohlmeyer <akohlmey@gmail.com>
Date: Sat, 29 Dec 2018 12:35:01 -0500
Subject: [PATCH] consistent formating: replace "} else{" with "} else {"
---
src/KOKKOS/pair_reaxc_kokkos.cpp | 2 +-
src/SRD/fix_srd.cpp | 4 ++--
src/USER-LB/fix_lb_fluid.cpp | 6 +++---
src/USER-LB/fix_lb_pc.cpp | 6 +++---
src/USER-LB/fix_lb_rigid_pc_sphere.cpp | 6 +++---
src/USER-REAXC/reaxc_ffield.cpp | 2 +-
src/USER-REAXC/reaxc_lookup.cpp | 2 +-
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/KOKKOS/pair_reaxc_kokkos.cpp b/src/KOKKOS/pair_reaxc_kokkos.cpp
index d4dc976c4a..e9b6527725 100644
--- a/src/KOKKOS/pair_reaxc_kokkos.cpp
+++ b/src/KOKKOS/pair_reaxc_kokkos.cpp
@@ -2572,7 +2572,7 @@ void PairReaxCKokkos<DeviceType>::operator()(PairReaxComputeAngular<NEIGHFLAG,EV
if (vlpex >= 0.0) {
vlpadj = 0.0;
dSBO2 = prod_SBO - 1.0;
- } else{
+ } else {
vlpadj = nlp;
dSBO2 = (prod_SBO - 1.0) * (1.0 - p_val8 * d_dDelta_lp[i]);
}
diff --git a/src/SRD/fix_srd.cpp b/src/SRD/fix_srd.cpp
index 186f51e06a..d87d2b5e56 100644
--- a/src/SRD/fix_srd.cpp
+++ b/src/SRD/fix_srd.cpp
@@ -1348,7 +1348,7 @@ void FixSRD::collisions_single()
atom->tag[i],atom->tag[j],update->ntimestep,ibounce+1);
if (insideflag == INSIDE_ERROR) error->one(FLERR,str);
error->warning(FLERR,str);
- } else{
+ } else {
sprintf(str,
"SRD particle " TAGINT_FORMAT " started "
"inside wall %d on step " BIGINT_FORMAT " bounce %d",
@@ -1507,7 +1507,7 @@ void FixSRD::collisions_multi()
atom->tag[i],atom->tag[j],update->ntimestep,ibounce+1);
if (insideflag == INSIDE_ERROR) error->one(FLERR,str);
error->warning(FLERR,str);
- } else{
+ } else {
sprintf(str,
"SRD particle " TAGINT_FORMAT " started "
"inside wall %d on step " BIGINT_FORMAT " bounce %d",
diff --git a/src/USER-LB/fix_lb_fluid.cpp b/src/USER-LB/fix_lb_fluid.cpp
index 7e1ea89531..222b0eea3c 100644
--- a/src/USER-LB/fix_lb_fluid.cpp
+++ b/src/USER-LB/fix_lb_fluid.cpp
@@ -1023,7 +1023,7 @@ void FixLbFluid::peskin_interpolation(int i)
r=sqrt(rsq);
if(rsq>1){
weightx=(5.0-2.0*r-sqrt(-7.0+12.0*r-4.0*rsq))/8.;
- } else{
+ } else {
weightx=(3.0-2.0*r+sqrt(1.0+4.0*r-4.0*rsq))/8.;
}
}
@@ -1035,7 +1035,7 @@ void FixLbFluid::peskin_interpolation(int i)
r=sqrt(rsq);
if(rsq>1){
weighty=(5.0-2.0*r-sqrt(-7.0+12.0*r-4.0*rsq))/8.;
- } else{
+ } else {
weighty=(3.0-2.0*r+sqrt(1.0+4.0*r-4.0*rsq))/8.;
}
}
@@ -1047,7 +1047,7 @@ void FixLbFluid::peskin_interpolation(int i)
r=sqrt(rsq);
if(rsq>1){
weightz=(5.0-2.0*r-sqrt(-7.0+12.0*r-4.0*rsq))/8.;
- } else{
+ } else {
weightz=(3.0-2.0*r+sqrt(1.0+4.0*r-4.0*rsq))/8.;
}
}
diff --git a/src/USER-LB/fix_lb_pc.cpp b/src/USER-LB/fix_lb_pc.cpp
index 89c0bf59a7..30b7059c74 100644
--- a/src/USER-LB/fix_lb_pc.cpp
+++ b/src/USER-LB/fix_lb_pc.cpp
@@ -393,7 +393,7 @@ int FixLbPC::unpack_exchange(int nlocal, double *buf)
r=sqrt(rsq);
if(rsq>1){
weightx=(5.0-2.0*r-sqrt(-7.0+12.0*r-4.0*rsq))/8.;
- } else{
+ } else {
weightx=(3.0-2.0*r+sqrt(1.0+4.0*r-4.0*rsq))/8.;
}
}
@@ -405,7 +405,7 @@ int FixLbPC::unpack_exchange(int nlocal, double *buf)
r=sqrt(rsq);
if(rsq>1){
weighty=(5.0-2.0*r-sqrt(-7.0+12.0*r-4.0*rsq))/8.;
- } else{
+ } else {
weighty=(3.0-2.0*r+sqrt(1.0+4.0*r-4.0*rsq))/8.;
}
}
@@ -417,7 +417,7 @@ int FixLbPC::unpack_exchange(int nlocal, double *buf)
r=sqrt(rsq);
if(rsq>1){
weightz=(5.0-2.0*r-sqrt(-7.0+12.0*r-4.0*rsq))/8.;
- } else{
+ } else {
weightz=(3.0-2.0*r+sqrt(1.0+4.0*r-4.0*rsq))/8.;
}
}
diff --git a/src/USER-LB/fix_lb_rigid_pc_sphere.cpp b/src/USER-LB/fix_lb_rigid_pc_sphere.cpp
index 0b3d75b984..14dbeb0f1d 100644
--- a/src/USER-LB/fix_lb_rigid_pc_sphere.cpp
+++ b/src/USER-LB/fix_lb_rigid_pc_sphere.cpp
@@ -1614,7 +1614,7 @@ double FixLbRigidPCSphere::compute_array(int i, int j)
r=sqrt(rsq);
if(rsq>1){
weightx=(5.0-2.0*r-sqrt(-7.0+12.0*r-4.0*rsq))/8.;
- } else{
+ } else {
weightx=(3.0-2.0*r+sqrt(1.0+4.0*r-4.0*rsq))/8.;
}
}
@@ -1626,7 +1626,7 @@ double FixLbRigidPCSphere::compute_array(int i, int j)
r=sqrt(rsq);
if(rsq>1){
weighty=(5.0-2.0*r-sqrt(-7.0+12.0*r-4.0*rsq))/8.;
- } else{
+ } else {
weighty=(3.0-2.0*r+sqrt(1.0+4.0*r-4.0*rsq))/8.;
}
}
@@ -1638,7 +1638,7 @@ double FixLbRigidPCSphere::compute_array(int i, int j)
r=sqrt(rsq);
if(rsq>1){
weightz=(5.0-2.0*r-sqrt(-7.0+12.0*r-4.0*rsq))/8.;
- } else{
+ } else {
weightz=(3.0-2.0*r+sqrt(1.0+4.0*r-4.0*rsq))/8.;
}
}
diff --git a/src/USER-REAXC/reaxc_ffield.cpp b/src/USER-REAXC/reaxc_ffield.cpp
index ce032f4f3a..66acb6ea9a 100644
--- a/src/USER-REAXC/reaxc_ffield.cpp
+++ b/src/USER-REAXC/reaxc_ffield.cpp
@@ -270,7 +270,7 @@ char Read_Force_Field( FILE *fp, reax_interaction *reax,
"Keeping vdWaals-setting for earlier atoms.\n",
reax->sbp[i].name );
errorflag = 0;
- } else{
+ } else {
reax->gp.vdw_type = 3;
}
}
diff --git a/src/USER-REAXC/reaxc_lookup.cpp b/src/USER-REAXC/reaxc_lookup.cpp
index 918099a631..0e71c662aa 100644
--- a/src/USER-REAXC/reaxc_lookup.cpp
+++ b/src/USER-REAXC/reaxc_lookup.cpp
@@ -264,7 +264,7 @@ int Init_Lookup_Tables( reax_system *system, control_params *control,
Natural_Cubic_Spline( &h[1], &fCEclmb[1],
&(LR[i][j].CEclmb[1]), control->tabulate+1,
comm );
- } else{
+ } else {
LR[i][j].n = 0;
}
}
--
GitLab