From e906fae88ce7c7421858ec05a3dfa40678ea62e0 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Fri, 16 Apr 2021 17:10:07 -0400 Subject: [PATCH] whitespace fixes --- src/KOKKOS/atom_vec_spin_kokkos.cpp | 24 ++++++++++++------------ src/KOKKOS/atom_vec_spin_kokkos.h | 2 +- src/KOKKOS/verlet_kokkos.cpp | 6 +++--- src/SPIN/fix_nve_spin.cpp | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/KOKKOS/atom_vec_spin_kokkos.cpp b/src/KOKKOS/atom_vec_spin_kokkos.cpp index e9bbeebe28..399ab23a5f 100644 --- a/src/KOKKOS/atom_vec_spin_kokkos.cpp +++ b/src/KOKKOS/atom_vec_spin_kokkos.cpp @@ -56,7 +56,7 @@ AtomVecSpinKokkos::AtomVecSpinKokkos(LAMMPS *lmp) : AtomVecKokkos(lmp) xcol_data = 4; atom->sp_flag = 1; - + k_count = DAT::tdual_int_1d("atom::k_count",1); atomKK = (AtomKokkos *) atom; commKK = (CommKokkos *) comm; @@ -84,13 +84,13 @@ void AtomVecSpinKokkos::grow(int n) memoryKK->grow_kokkos(atomKK->k_type,atomKK->type,nmax,"atom:type"); memoryKK->grow_kokkos(atomKK->k_mask,atomKK->mask,nmax,"atom:mask"); memoryKK->grow_kokkos(atomKK->k_image,atomKK->image,nmax,"atom:image"); - + // allocating mech. quantities memoryKK->grow_kokkos(atomKK->k_x,atomKK->x,nmax,"atom:x"); memoryKK->grow_kokkos(atomKK->k_v,atomKK->v,nmax,"atom:v"); memoryKK->grow_kokkos(atomKK->k_f,atomKK->f,nmax,"atom:f"); - + // allocating mag. quantities memoryKK->grow_kokkos(atomKK->k_sp,atomKK->sp,nmax,"atom:sp"); @@ -134,11 +134,11 @@ void AtomVecSpinKokkos::grow_pointers() f = atomKK->f; d_f = atomKK->k_f.d_view; h_f = atomKK->k_f.h_view; - - sp = atomKK->sp; + + sp = atomKK->sp; d_sp = atomKK->k_sp.d_view; h_sp = atomKK->k_sp.h_view; - fm = atomKK->fm; + fm = atomKK->fm; d_fm = atomKK->k_fm.d_view; h_fm = atomKK->k_fm.h_view; fm_long = atomKK->fm_long; @@ -163,7 +163,7 @@ void AtomVecSpinKokkos::copy(int i, int j, int delflag) h_v(j,1) = h_v(i,1); h_v(j,2) = h_v(i,2); - h_sp(j,0) = h_sp(i,0); + h_sp(j,0) = h_sp(i,0); h_sp(j,1) = h_sp(i,1); h_sp(j,2) = h_sp(i,2); h_sp(j,3) = h_sp(i,3); @@ -186,7 +186,7 @@ struct AtomVecSpinKokkos_PackComm { const int _iswap; X_FLOAT _xprd,_yprd,_zprd,_xy,_xz,_yz; X_FLOAT _pbc[6]; - + AtomVecSpinKokkos_PackComm( const typename DAT::tdual_x_array &x, const typename DAT::tdual_float_1d_4 &sp, @@ -268,7 +268,7 @@ struct AtomVecSpinKokkos_PackBorder { _buf(buf),_list(list),_iswap(iswap), _x(x),_tag(tag),_type(type),_mask(mask),_sp(sp), _dx(dx),_dy(dy),_dz(dz) {} - + KOKKOS_INLINE_FUNCTION void operator() (const int& i) const { const int j = _list(_iswap,i); @@ -741,9 +741,9 @@ struct AtomVecSpinKokkos_PackExchangeFunctor { } } }; - + /* ---------------------------------------------------------------------- */ - + int AtomVecSpinKokkos::pack_exchange_kokkos(const int &nsend,DAT::tdual_xfloat_2d &k_buf, DAT::tdual_int_1d k_sendlist, DAT::tdual_int_1d k_copylist, @@ -768,7 +768,7 @@ int AtomVecSpinKokkos::pack_exchange_kokkos(const int &nsend,DAT::tdual_xfloat_2 } /* ---------------------------------------------------------------------- */ - + int AtomVecSpinKokkos::pack_exchange(int i, double *buf) { int m = 1; diff --git a/src/KOKKOS/atom_vec_spin_kokkos.h b/src/KOKKOS/atom_vec_spin_kokkos.h index 5dca7b4e13..bcb5ea3b45 100644 --- a/src/KOKKOS/atom_vec_spin_kokkos.h +++ b/src/KOKKOS/atom_vec_spin_kokkos.h @@ -51,7 +51,7 @@ class AtomVecSpinKokkos : public AtomVecKokkos { void write_data(FILE *, int, double **); int write_data_hybrid(FILE *, double *); double memory_usage(); - + // clear magnetic and mechanic forces void force_clear(int, size_t); diff --git a/src/KOKKOS/verlet_kokkos.cpp b/src/KOKKOS/verlet_kokkos.cpp index 27f4646366..254e269671 100644 --- a/src/KOKKOS/verlet_kokkos.cpp +++ b/src/KOKKOS/verlet_kokkos.cpp @@ -594,7 +594,7 @@ void VerletKokkos::force_clear() Kokkos::parallel_for(nall, Zero::t_f_array>(atomKK->k_torque.view())); atomKK->modified(Device,TORQUE_MASK); } - + // reset SPIN forces if (extraflag) { @@ -616,7 +616,7 @@ void VerletKokkos::force_clear() Kokkos::parallel_for(atomKK->nfirst, Zero::t_f_array>(atomKK->k_torque.view())); atomKK->modified(Device,TORQUE_MASK); } - + // reset SPIN forces if (extraflag) { @@ -635,7 +635,7 @@ void VerletKokkos::force_clear() Kokkos::parallel_for(range, Zero::t_f_array>(atomKK->k_torque.view())); atomKK->modified(Device,TORQUE_MASK); } - + // reset SPIN forces if (extraflag) { diff --git a/src/SPIN/fix_nve_spin.cpp b/src/SPIN/fix_nve_spin.cpp index faf9e5c1db..eb6d918ab0 100644 --- a/src/SPIN/fix_nve_spin.cpp +++ b/src/SPIN/fix_nve_spin.cpp @@ -524,7 +524,7 @@ void FixNVESpin::sectoring() sublo[dim]=sublotmp[dim]; subhi[dim]=subhitmp[dim]; } - } + } const double rsx = subhi[0] - sublo[0]; const double rsy = subhi[1] - sublo[1];