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

consistent formating: replace "} else{" with "} else {"

Browse Source
This commit is contained in:
Axel Kohlmeyer
2018-12-29 12:35:01 -05:00
parent 31427a2380
commit c588b44cf1
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/KOKKOS/pair_reaxc_kokkos.cpp
View File

@ -2572,7 +2572,7 @@ void PairReaxCKokkos<DeviceType>::operator()(PairReaxComputeAngular<NEIGHFLAG,EV
if (vlpex >= 0.0) { if (vlpex >= 0.0) {
vlpadj = 0.0; vlpadj = 0.0;
dSBO2 = prod_SBO - 1.0; dSBO2 = prod_SBO - 1.0;
} else{ } else {
vlpadj = nlp; vlpadj = nlp;
dSBO2 = (prod_SBO - 1.0) * (1.0 - p_val8 * d_dDelta_lp[i]); dSBO2 = (prod_SBO - 1.0) * (1.0 - p_val8 * d_dDelta_lp[i]);
} }

4
src/SRD/fix_srd.cpp
View File

@ -1348,7 +1348,7 @@ void FixSRD::collisions_single()
atom->tag[i],atom->tag[j],update->ntimestep,ibounce+1); atom->tag[i],atom->tag[j],update->ntimestep,ibounce+1);
if (insideflag == INSIDE_ERROR) error->one(FLERR,str); if (insideflag == INSIDE_ERROR) error->one(FLERR,str);
error->warning(FLERR,str); error->warning(FLERR,str);
} else{ } else {
sprintf(str, sprintf(str,
"SRD particle " TAGINT_FORMAT " started " "SRD particle " TAGINT_FORMAT " started "
"inside wall %d on step " BIGINT_FORMAT " bounce %d", "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); atom->tag[i],atom->tag[j],update->ntimestep,ibounce+1);
if (insideflag == INSIDE_ERROR) error->one(FLERR,str); if (insideflag == INSIDE_ERROR) error->one(FLERR,str);
error->warning(FLERR,str); error->warning(FLERR,str);
} else{ } else {
sprintf(str, sprintf(str,
"SRD particle " TAGINT_FORMAT " started " "SRD particle " TAGINT_FORMAT " started "
"inside wall %d on step " BIGINT_FORMAT " bounce %d", "inside wall %d on step " BIGINT_FORMAT " bounce %d",

6
src/USER-LB/fix_lb_fluid.cpp
View File

@ -1023,7 +1023,7 @@ void FixLbFluid::peskin_interpolation(int i)
r=sqrt(rsq); r=sqrt(rsq);
if(rsq>1){ if(rsq>1){
weightx=(5.0-2.0*r-sqrt(-7.0+12.0*r-4.0*rsq))/8.; 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.; 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); r=sqrt(rsq);
if(rsq>1){ if(rsq>1){
weighty=(5.0-2.0*r-sqrt(-7.0+12.0*r-4.0*rsq))/8.; 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.; 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); r=sqrt(rsq);
if(rsq>1){ if(rsq>1){
weightz=(5.0-2.0*r-sqrt(-7.0+12.0*r-4.0*rsq))/8.; 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.; weightz=(3.0-2.0*r+sqrt(1.0+4.0*r-4.0*rsq))/8.;
} }
} }

6
src/USER-LB/fix_lb_pc.cpp
View File

@ -393,7 +393,7 @@ int FixLbPC::unpack_exchange(int nlocal, double *buf)
r=sqrt(rsq); r=sqrt(rsq);
if(rsq>1){ if(rsq>1){
weightx=(5.0-2.0*r-sqrt(-7.0+12.0*r-4.0*rsq))/8.; 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.; 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); r=sqrt(rsq);
if(rsq>1){ if(rsq>1){
weighty=(5.0-2.0*r-sqrt(-7.0+12.0*r-4.0*rsq))/8.; 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.; 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); r=sqrt(rsq);
if(rsq>1){ if(rsq>1){
weightz=(5.0-2.0*r-sqrt(-7.0+12.0*r-4.0*rsq))/8.; 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.; weightz=(3.0-2.0*r+sqrt(1.0+4.0*r-4.0*rsq))/8.;
} }
} }

6
src/USER-LB/fix_lb_rigid_pc_sphere.cpp
View File

@ -1614,7 +1614,7 @@ double FixLbRigidPCSphere::compute_array(int i, int j)
r=sqrt(rsq); r=sqrt(rsq);
if(rsq>1){ if(rsq>1){
weightx=(5.0-2.0*r-sqrt(-7.0+12.0*r-4.0*rsq))/8.; 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.; 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); r=sqrt(rsq);
if(rsq>1){ if(rsq>1){
weighty=(5.0-2.0*r-sqrt(-7.0+12.0*r-4.0*rsq))/8.; 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.; 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); r=sqrt(rsq);
if(rsq>1){ if(rsq>1){
weightz=(5.0-2.0*r-sqrt(-7.0+12.0*r-4.0*rsq))/8.; 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.; weightz=(3.0-2.0*r+sqrt(1.0+4.0*r-4.0*rsq))/8.;
} }
} }

2
src/USER-REAXC/reaxc_ffield.cpp
View File

@ -270,7 +270,7 @@ char Read_Force_Field( FILE *fp, reax_interaction *reax,
"Keeping vdWaals-setting for earlier atoms.\n", "Keeping vdWaals-setting for earlier atoms.\n",
reax->sbp[i].name ); reax->sbp[i].name );
errorflag = 0; errorflag = 0;
} else{ } else {
reax->gp.vdw_type = 3; reax->gp.vdw_type = 3;
} }
} }

2
src/USER-REAXC/reaxc_lookup.cpp
View File

@ -264,7 +264,7 @@ int Init_Lookup_Tables( reax_system *system, control_params *control,
Natural_Cubic_Spline( &h[1], &fCEclmb[1], Natural_Cubic_Spline( &h[1], &fCEclmb[1],
&(LR[i][j].CEclmb[1]), control->tabulate+1, &(LR[i][j].CEclmb[1]), control->tabulate+1,
comm ); comm );
} else{ } else {
LR[i][j].n = 0; LR[i][j].n = 0;
} }
} }