From 21bffd5258a8f2fd17c674416d52e54fef166dad Mon Sep 17 00:00:00 2001 From: Stan Moore Date: Thu, 7 Jan 2021 08:48:41 -0700 Subject: [PATCH] Fix compile error --- src/KOKKOS/pppm_kokkos.cpp | 44 +++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/KOKKOS/pppm_kokkos.cpp b/src/KOKKOS/pppm_kokkos.cpp index 0b86c01d42..0de2edf4fb 100644 --- a/src/KOKKOS/pppm_kokkos.cpp +++ b/src/KOKKOS/pppm_kokkos.cpp @@ -1653,7 +1653,7 @@ void PPPMKokkos::poisson_ik() Kokkos::parallel_for(Kokkos::RangePolicy(0,nfft),*this); copymode = 0; - fft1->compute(d_work1,d_work1,FFT3d::FORWARD); + fft1->compute(d_work1,d_work1,FFT3dKokkos::FORWARD); // global energy and virial contribution @@ -1716,7 +1716,7 @@ void PPPMKokkos::poisson_ik() Kokkos::parallel_for(Kokkos::RangePolicy(0,inum_fft),*this); copymode = 0; - fft2->compute(d_work2,d_work2,FFT3d::BACKWARD); + fft2->compute(d_work2,d_work2,FFT3dKokkos::BACKWARD); copymode = 1; @@ -1730,7 +1730,7 @@ void PPPMKokkos::poisson_ik() Kokkos::parallel_for(Kokkos::RangePolicy(0,inum_fft),*this); copymode = 0; - fft2->compute(d_work2,d_work2,FFT3d::BACKWARD); + fft2->compute(d_work2,d_work2,FFT3dKokkos::BACKWARD); copymode = 1; @@ -1743,7 +1743,7 @@ void PPPMKokkos::poisson_ik() Kokkos::parallel_for(Kokkos::RangePolicy(0,inum_fft),*this); copymode = 0; - fft2->compute(d_work2,d_work2,FFT3d::BACKWARD); + fft2->compute(d_work2,d_work2,FFT3dKokkos::BACKWARD); copymode = 1; @@ -1882,7 +1882,7 @@ void PPPMKokkos::poisson_ik_triclinic() // n += 2; // } // -// fft2->compute(d_work2,d_work2,FFT3d::BACKWARD); +// fft2->compute(d_work2,d_work2,FFT3dKokkos::BACKWARD); // // n = 0; // for (k = nzlo_in-nzlo_out; k <= nzhi_in-nzlo_out; k++) // parallel_for2 @@ -1897,7 +1897,7 @@ void PPPMKokkos::poisson_ik_triclinic() // n += 2; // } // -// fft2->compute(d_work2,d_work2,FFT3d::BACKWARD); +// fft2->compute(d_work2,d_work2,FFT3dKokkos::BACKWARD); // // n = 0; // for (k = nzlo_in-nzlo_out; k <= nzhi_in-nzlo_out; k++) // parallel_for4 @@ -1916,7 +1916,7 @@ void PPPMKokkos::poisson_ik_triclinic() // n += 2; // } // -// fft2->compute(d_work2,d_work2,FFT3d::BACKWARD); +// fft2->compute(d_work2,d_work2,FFT3dKokkos::BACKWARD); // // n = 0; // for (k = nzlo_in-nzlo_out; k <= nzhi_in-nzlo_out; k++) // parallel_for6 @@ -1999,7 +1999,7 @@ void PPPMKokkos::poisson_peratom() Kokkos::parallel_for(Kokkos::RangePolicy(0,nfft),*this); copymode = 0; - fft2->compute(d_work2,d_work2,FFT3d::BACKWARD); + fft2->compute(d_work2,d_work2,FFT3dKokkos::BACKWARD); copymode = 1; @@ -2016,7 +2016,7 @@ void PPPMKokkos::poisson_peratom() Kokkos::parallel_for(Kokkos::RangePolicy(0,nfft),*this); copymode = 0; - fft2->compute(d_work2,d_work2,FFT3d::BACKWARD); + fft2->compute(d_work2,d_work2,FFT3dKokkos::BACKWARD); copymode = 1; @@ -2028,7 +2028,7 @@ void PPPMKokkos::poisson_peratom() Kokkos::parallel_for(Kokkos::RangePolicy(0,nfft),*this); copymode = 0; - fft2->compute(d_work2,d_work2,FFT3d::BACKWARD); + fft2->compute(d_work2,d_work2,FFT3dKokkos::BACKWARD); copymode = 1; @@ -2040,7 +2040,7 @@ void PPPMKokkos::poisson_peratom() Kokkos::parallel_for(Kokkos::RangePolicy(0,nfft),*this); copymode = 0; - fft2->compute(d_work2,d_work2,FFT3d::BACKWARD); + fft2->compute(d_work2,d_work2,FFT3dKokkos::BACKWARD); copymode = 1; @@ -2051,7 +2051,7 @@ void PPPMKokkos::poisson_peratom() Kokkos::parallel_for(Kokkos::RangePolicy(0,nfft),*this); copymode = 0; - fft2->compute(d_work2,d_work2,FFT3d::BACKWARD); + fft2->compute(d_work2,d_work2,FFT3dKokkos::BACKWARD); copymode = 1; @@ -2063,7 +2063,7 @@ void PPPMKokkos::poisson_peratom() Kokkos::parallel_for(Kokkos::RangePolicy(0,nfft),*this); copymode = 0; - fft2->compute(d_work2,d_work2,FFT3d::BACKWARD); + fft2->compute(d_work2,d_work2,FFT3dKokkos::BACKWARD); copymode = 1; @@ -2075,7 +2075,7 @@ void PPPMKokkos::poisson_peratom() Kokkos::parallel_for(Kokkos::RangePolicy(0,nfft),*this); copymode = 0; - fft2->compute(d_work2,d_work2,FFT3d::BACKWARD); + fft2->compute(d_work2,d_work2,FFT3dKokkos::BACKWARD); copymode = 1; @@ -2817,10 +2817,10 @@ int PPPMKokkos::timing_1d(int n, double &time1d) time1 = MPI_Wtime(); for (int i = 0; i < n; i++) { - fft1->timing1d(d_work1,nfft_both,FFT3d::FORWARD); - fft2->timing1d(d_work1,nfft_both,FFT3d::BACKWARD); - fft2->timing1d(d_work1,nfft_both,FFT3d::BACKWARD); - fft2->timing1d(d_work1,nfft_both,FFT3d::BACKWARD); + fft1->timing1d(d_work1,nfft_both,FFT3dKokkos::FORWARD); + fft2->timing1d(d_work1,nfft_both,FFT3dKokkos::BACKWARD); + fft2->timing1d(d_work1,nfft_both,FFT3dKokkos::BACKWARD); + fft2->timing1d(d_work1,nfft_both,FFT3dKokkos::BACKWARD); } MPI_Barrier(world); @@ -2854,10 +2854,10 @@ int PPPMKokkos::timing_3d(int n, double &time3d) time1 = MPI_Wtime(); for (int i = 0; i < n; i++) { - fft1->compute(d_work1,d_work1,FFT3d::FORWARD); - fft2->compute(d_work1,d_work1,FFT3d::BACKWARD); - fft2->compute(d_work1,d_work1,FFT3d::BACKWARD); - fft2->compute(d_work1,d_work1,FFT3d::BACKWARD); + fft1->compute(d_work1,d_work1,FFT3dKokkos::FORWARD); + fft2->compute(d_work1,d_work1,FFT3dKokkos::BACKWARD); + fft2->compute(d_work1,d_work1,FFT3dKokkos::BACKWARD); + fft2->compute(d_work1,d_work1,FFT3dKokkos::BACKWARD); } MPI_Barrier(world);