diff --git a/lib/gpu/lal_base_amoeba.cpp b/lib/gpu/lal_base_amoeba.cpp index 6f65c8c934..3b67ee31a1 100644 --- a/lib/gpu/lal_base_amoeba.cpp +++ b/lib/gpu/lal_base_amoeba.cpp @@ -518,7 +518,8 @@ void BaseAmoebaT::compute_umutual2b(int *host_amtype, int *host_amgroup, double void** fieldp_ptr) { // all the necessary data arrays are already copied from host to device - cast_extra_data(host_amtype, host_amgroup, host_rpole, host_uind, host_uinp, host_pval); + //cast_extra_data(host_amtype, host_amgroup, host_rpole, host_uind, host_uinp, host_pval); + cast_extra_data(host_amtype, host_amgroup, nullptr, host_uind, host_uinp, nullptr); atom->add_extra_data(); _off2_polar = off2_polar; diff --git a/src/AMOEBA/amoeba_convolution.h b/src/AMOEBA/amoeba_convolution.h index 270a501a71..00f2b8ed91 100644 --- a/src/AMOEBA/amoeba_convolution.h +++ b/src/AMOEBA/amoeba_convolution.h @@ -47,7 +47,7 @@ class AmoebaConvolution : protected Pointers { FFT_SCALAR *pre_convolution(); void *post_convolution(); - private: + protected: int which; // caller name for convolution being performed int flag3d; // 1 if using 3d grid_brick, 0 for 4d cgrid_brick int nbrick_owned; // owned grid points in brick decomp @@ -71,9 +71,9 @@ class AmoebaConvolution : protected Pointers { void *zero_3d(); void *zero_4d(); FFT_SCALAR *pre_convolution_3d(); - FFT_SCALAR *pre_convolution_4d(); + virtual FFT_SCALAR *pre_convolution_4d(); void *post_convolution_3d(); - void *post_convolution_4d(); + virtual void *post_convolution_4d(); void kspacebbox(double, double *); void procs2grid2d(int, int, int, int &, int &); diff --git a/src/AMOEBA/pair_amoeba.h b/src/AMOEBA/pair_amoeba.h index 8195b1d16f..93978ab1f2 100644 --- a/src/AMOEBA/pair_amoeba.h +++ b/src/AMOEBA/pair_amoeba.h @@ -381,7 +381,7 @@ class PairAmoeba : public Pair { void ufield0c(double **, double **); void uscale0b(int, double **, double **, double **, double **); void dfield0c(double **, double **); - void umutual1(double **, double **); + virtual void umutual1(double **, double **); virtual void umutual2b(double **, double **); void udirect1(double **); virtual void udirect2b(double **, double **);