Commit 04fe0719 authored by Stan Moore's avatar Stan Moore Committed by GitHub
Browse files

Merge pull request #6 from ibaned/cuda-lj-ctor-warning 

fix a CUDA constructor warning
parents 7162cafd c94030d9

src/KOKKOS/kokkos_type.h

+8 −0
Original line number Diff line number Diff line
@@ -915,6 +915,14 @@ void memset_kokkos (ViewType &view) { 
  ViewType::execution_space::fence();

}



struct params_lj_coul {

  KOKKOS_INLINE_FUNCTION

  params_lj_coul(){cut_ljsq=0;cut_coulsq=0;lj1=0;lj2=0;lj3=0;lj4=0;offset=0;};   

  KOKKOS_INLINE_FUNCTION

  params_lj_coul(int i){cut_ljsq=0;cut_coulsq=0;lj1=0;lj2=0;lj3=0;lj4=0;offset=0;};

  F_FLOAT cut_ljsq,cut_coulsq,lj1,lj2,lj3,lj4,offset;

};



#if defined(KOKKOS_HAVE_CXX11)

#undef ISFINITE

#define ISFINITE(x) std::isfinite(x)

src/KOKKOS/pair_lj_charmm_coul_charmm_implicit_kokkos.h

+0 −5
Original line number Diff line number Diff line
@@ -44,11 +44,6 @@ class PairLJCharmmCoulCharmmImplicitKokkos : public PairLJCharmmCoulCharmmImplic 
  void init_style();

  double init_one(int, int);



  struct params_lj_coul{

    params_lj_coul(){cut_ljsq=0;cut_coulsq=0;lj1=0;lj2=0;lj3=0;lj4=0;offset=0;};

    params_lj_coul(int i){cut_ljsq=0;cut_coulsq=0;lj1=0;lj2=0;lj3=0;lj4=0;offset=0;};

    F_FLOAT cut_ljsq,cut_coulsq,lj1,lj2,lj3,lj4,offset;

  };



 protected:

  void cleanup_copy();

src/KOKKOS/pair_lj_charmm_coul_charmm_kokkos.h

+0 −5
Original line number Diff line number Diff line
@@ -44,11 +44,6 @@ class PairLJCharmmCoulCharmmKokkos : public PairLJCharmmCoulCharmm { 
  void init_style();

  double init_one(int, int);



  struct params_lj_coul{

    params_lj_coul(){cut_ljsq=0;cut_coulsq=0;lj1=0;lj2=0;lj3=0;lj4=0;offset=0;};

    params_lj_coul(int i){cut_ljsq=0;cut_coulsq=0;lj1=0;lj2=0;lj3=0;lj4=0;offset=0;};

    F_FLOAT cut_ljsq,cut_coulsq,lj1,lj2,lj3,lj4,offset;

  };



 protected:

  void cleanup_copy();

src/KOKKOS/pair_lj_charmm_coul_long_kokkos.h

+0 −6
Original line number Diff line number Diff line
@@ -43,12 +43,6 @@ class PairLJCharmmCoulLongKokkos : public PairLJCharmmCoulLong { 
  void init_style();

  double init_one(int, int);



  struct params_lj_coul{

    params_lj_coul(){cut_ljsq=0;cut_coulsq=0;lj1=0;lj2=0;lj3=0;lj4=0;offset=0;};

    params_lj_coul(int i){cut_ljsq=0;cut_coulsq=0;lj1=0;lj2=0;lj3=0;lj4=0;offset=0;};

    F_FLOAT cut_ljsq,cut_coulsq,lj1,lj2,lj3,lj4,offset;

  };



 protected:

  void cleanup_copy();

src/KOKKOS/pair_lj_class2_coul_cut_kokkos.h

+0 −5
Original line number Diff line number Diff line
@@ -43,11 +43,6 @@ class PairLJClass2CoulCutKokkos : public PairLJClass2CoulCut { 
  void init_style();

  double init_one(int, int);



  struct params_lj_coul{

    params_lj_coul(){cut_ljsq=0;cut_coulsq=0;lj1=0;lj2=0;lj3=0;lj4=0;offset=0;};

    params_lj_coul(int i){cut_ljsq=0;cut_coulsq=0;lj1=0;lj2=0;lj3=0;lj4=0;offset=0;};

    F_FLOAT cut_ljsq,cut_coulsq,lj1,lj2,lj3,lj4,offset;

  };



 protected:

  void cleanup_copy();

CRA Git | Maintained and supported by SUSTech CRA and CCSE