diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e2caf2738a611ea617d12cb78913ab7497c75111..51e2f2b5aa2c9af6d1cdccc8a2d8b1031c1fc335 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -264,7 +264,6 @@ nvidia_test: gpu_numerical_tests: stage: benchmark - # when: manual rules: - if: $CI_PIPELINE_SOURCE == "schedule" diff --git a/apps/gpu/tests/NumericalTests/Utilities/Calculator/FFTCalculator/FFTCalculator.cpp b/apps/gpu/tests/NumericalTests/Utilities/Calculator/FFTCalculator/FFTCalculator.cpp index 1e06c7083b579a1657a2b474b1a3576eb815bdf8..f35e962733a45e6dda845ad10d62023ff5584807 100644 --- a/apps/gpu/tests/NumericalTests/Utilities/Calculator/FFTCalculator/FFTCalculator.cpp +++ b/apps/gpu/tests/NumericalTests/Utilities/Calculator/FFTCalculator/FFTCalculator.cpp @@ -3,12 +3,9 @@ #include "Utilities/Results/SimulationResults/SimulationResults.h" #define _USE_MATH_DEFINES -#include <math.h> -#include <stdlib.h> +#include <cmath> #include <fstream> -#include <iostream> - std::shared_ptr<FFTCalculator> FFTCalculator::getInstance() { static std::shared_ptr<FFTCalculator> uniqueInstance; @@ -77,24 +74,9 @@ void FFTCalculator::init() double FFTCalculator::calcNy() { - std::cout << "======== BEGIN SUPER IMPORTANT OUTPUT ========" << std::endl; std::vector<double> logAmplitude = calcLogAmplitudeForAllSteps(); std::vector<double> linReg = calcLinReg(logAmplitude); - - std::cout << "lz: " << lz << "\t" << "lx: " << lx << "\t" << std::endl; - std::cout << "timestepLength: " << timeStepLength << "\t" << "linReg[0]: " << linReg.at(0) << "\t" << std::endl; - - std::cout << "amplitude: " << "\t"; - for (auto ampli : logAmplitude) { - std::cout << ampli << "\t"; - } - std::cout << std::endl; - double nu = -(1.0 / (((2.0 * M_PI / lz) * (2.0 * M_PI / lz) + (2.0 * M_PI / lx)*(2.0 * M_PI / lx)) * timeStepLength)) * linReg.at(0); - - std::cout << nu << std::endl; - std::cout << "======== END SUPER IMPORTANT OUTPUT ========" << std::endl; - return nu; } @@ -169,10 +151,6 @@ std::vector<double> FFTCalculator::calcAmplitudeForAllSteps() else pos = 2 + (lz - 1); - std::cout << "DataSize: " << data.size() << std::endl; - std::cout << "fftResultsRe Size: " << fftResultsRe.size() << std::endl; - std::cout << "fftResultsIm Size: " << fftResultsIm.size() << std::endl; - for (int step = 0; step < data.size(); step++) amplitude.push_back(4.0 / (lx * lz) * sqrt(fftResultsRe.at(step).at(pos) * fftResultsRe.at(step).at(pos) + fftResultsIm.at(step).at(pos) * fftResultsIm.at(step).at(pos))); diff --git a/apps/gpu/tests/NumericalTests/Utilities/DataWriter/Y2dSliceToResults/Y2dSliceToResults.cpp b/apps/gpu/tests/NumericalTests/Utilities/DataWriter/Y2dSliceToResults/Y2dSliceToResults.cpp index fb98a991d58267abf5b99185e54a9efd3a17082f..c13f6f748463287fc4e7401d56d7c7ab40cc1a77 100644 --- a/apps/gpu/tests/NumericalTests/Utilities/DataWriter/Y2dSliceToResults/Y2dSliceToResults.cpp +++ b/apps/gpu/tests/NumericalTests/Utilities/DataWriter/Y2dSliceToResults/Y2dSliceToResults.cpp @@ -51,19 +51,6 @@ void Y2dSliceToResults::writeTimestep(std::shared_ptr<Parameter> para, unsigned y.at(posResults) = (double)para->getParH(level)->coordinateY[posPara] - (double)1.0; z.at(posResults) = (double)para->getParH(level)->coordinateZ[posPara] - (double)1.0; vx.at(posResults) = (double)para->getParH(level)->velocityX[posPara] * (double)para->getVelocityRatio(); - // if (std::isnan(para->getParH(level)->velocityX[posPara])) { - // std::ostringstream oss; - // oss << "Vx is nan. Velocity in para->getParH(" << level << ")->velocityX[" << posPara - // << "] = " << para->getParH(level)->velocityX[posPara] << std::endl - // << "posResults is " << posResults << std::endl - // << "velocityRatio: " << para->getVelocityRatio() << std::endl - // << "maxY= " << maxY << std::endl - // << "ySlice= " << ySliceForCalculation << std::endl - // << "Broken 3D Index: (" << posX << ", " << ySliceForCalculation << ", " << posZ << ")" << std::endl; - - // throw std::runtime_error(oss.str()); - // } - vy.at(posResults) = (double)para->getParH(level)->velocityY[posPara] * (double)para->getVelocityRatio(); vz.at(posResults) = (double)para->getParH(level)->velocityZ[posPara] * (double)para->getVelocityRatio(); press.at(posResults) = (double)para->getParH(level)->pressure[posPara] / (double)3.0 *