diff --git a/ippl/test/FFT/TestFFT.cpp b/ippl/test/FFT/TestFFT.cpp index c0554e3f718b0dd8cba46e57f1b4cefc344870f5..ff1dfc7c8aac67c1738159a409ee772f3b5a1ae5 100644 --- a/ippl/test/FFT/TestFFT.cpp +++ b/ippl/test/FFT/TestFFT.cpp @@ -352,7 +352,7 @@ int main(int argc, char *argv[]) ccfft.setDirectionName(-1, "inverse"); testmsg << nLoop << " x In-place CC transform using all-parallel layout ..." << endl; - for (uint i=0; i<nLoop; i++) { + for (unsigned int i=0; i<nLoop; i++) { IpplTimings::startTimer(fftccppTimer); ccfft.transform("forward", CFieldPPStan); IpplTimings::stopTimer(fftccppTimer); @@ -370,7 +370,7 @@ int main(int argc, char *argv[]) } testmsg << "In-place CC transform using layout with zeroth dim serial ..." << endl; - for (uint i=0; i<nLoop; i++) { + for (unsigned int i=0; i<nLoop; i++) { IpplTimings::startTimer(fftccpsTimer); ccfft.transform("forward", CFieldSPStan); IpplTimings::stopTimer(fftccpsTimer); @@ -430,7 +430,7 @@ int main(int argc, char *argv[]) rcfft.setDirectionName(-1, "inverse"); testmsg << "RC transform using all-parallel layout ..." << endl; - for (uint i=0; i<nLoop; i++) { + for (unsigned int i=0; i<nLoop; i++) { IpplTimings::startTimer(fftrcppTimer); rcfft.transform("forward", RFieldPPStan, CFieldPPStan0h, constInput); IpplTimings::stopTimer(fftrcppTimer); @@ -449,7 +449,7 @@ int main(int argc, char *argv[]) testmsg << "RC transform using layout with zeroth dim serial ..." << endl; - for (uint i=0; i<nLoop; i++) { + for (unsigned int i=0; i<nLoop; i++) { IpplTimings::startTimer(fftrcpsTimer); rcfft.transform("forward", RFieldSPStan, CFieldSPStan0h, constInput); IpplTimings::stopTimer(fftrcpsTimer); diff --git a/src/Solvers/MGPoissonSolver.h b/src/Solvers/MGPoissonSolver.h index e30d8b6a797e18c99d6a7f41befda792b95929c1..ff2145bf4feae44487530806618a35698f97b4e3 100644 --- a/src/Solvers/MGPoissonSolver.h +++ b/src/Solvers/MGPoissonSolver.h @@ -182,7 +182,7 @@ private: Teuchos::RCP<const Comm_t> comm_mp; /// last N LHS's for extrapolating the new LHS as starting vector - uint nLHS_m; + unsigned int nLHS_m; Teuchos::RCP<TpetraMultiVector_t> P_mp; std::deque< TpetraVector_t > OldLHS;