Unverified Commit 537704fd authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

eliminate the use of the "using" keyword in headers of the KOKKOS package

parent 52a13f31
Loading
Loading
Loading
Loading
+6 −4
Original line number Diff line number Diff line
@@ -36,10 +36,12 @@ class DomainKokkos : public Domain {
  void image_flip(int, int, int);
  void x2lamda(int);
  void lamda2x(int);
  // these lines bring in the x2lamda signatures from Domain
  // that are not overloaded here
  using Domain::x2lamda;
  using Domain::lamda2x;
  // forward remaining x2lamda() and lambda2x() variants to parent class
  void x2lamda(double *a, double *b) { Domain::x2lamda(a,b); }
  void lamda2x(double *a, double *b) { Domain::lamda2x(a,b); }
  void x2lamda(double *a, double *b, double *c, double *d) {
    Domain::x2lamda(a,b,c,d);
  }

  int closest_image(const int, int) const;

+2 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@
#define MAXLINE 1024
#define MAXWORD 3

using namespace LAMMPS_NS;
namespace LAMMPS_NS {

// Outstanding issues with quadratic term
// 1. there seems to a problem with compute_optimized energy calc
@@ -674,3 +674,4 @@ double PairSNAPKokkos<DeviceType>::memory_usage()
  bytes += snaKK.memory_usage();
  return bytes;
}
}
+3 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@
#include <cstring>
#include <cstdlib>

using namespace LAMMPS_NS;
namespace LAMMPS_NS {

static const double MY_PI  = 3.14159265358979323846; // pi

@@ -1300,3 +1300,5 @@ double SNAKokkos<DeviceType>::memory_usage()
  bytes += jdim * jdim * jdim * jdim * jdim * sizeof(std::complex<double>);
  return bytes;
}

} // namespace LAMMPS_NS