From d68dc46796508d100920d3376d73035b075f703c Mon Sep 17 00:00:00 2001 From: Henry <henry.korb@geo.uu.se> Date: Wed, 14 Dec 2022 14:32:31 +0100 Subject: [PATCH] bug fix in probe: no array names in parallel file --- .../VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.cu | 3 ++- .../VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.h | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.cu b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.cu index 44f76220f..03c18f5a9 100644 --- a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.cu +++ b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.cu @@ -379,9 +379,10 @@ void Probe::writeParallelFile(Parameter* para, int t) int t_write = this->fileNameLU ? t: t/this->tOut; std::string filename = this->outputPath + "/" + this->makeParallelFileName(para->getMyProcessID(), t_write); + std::vector<std::string> nodedatanames = this->getVarNames(); std::vector<std::string> cellNames; - getWriter()->writeParallelFile(filename, fileNamesForCollectionFile, varNames, cellNames); + getWriter()->writeParallelFile(filename, fileNamesForCollectionFile, nodedatanames, cellNames); this->fileNamesForCollectionFile.clear(); } diff --git a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.h b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.h index cc67a5535..aaf294e87 100644 --- a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.h +++ b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/Probe.h @@ -208,7 +208,6 @@ protected: bool hasDeviceQuantityArray; //!> flag initiating memCopy in Point and PlaneProbe. Other probes are only based on thrust reduce functions and therefore dont need explict memCopy in interact() bool outputTimeSeries; //!> flag initiating overwrite of output vtk files, skipping collection files and limiting the length of the written data to the current time step (currently only used for WallModelProbe) std::vector<std::string> fileNamesForCollectionFile; - std::vector<std::string> varNames; bool fileNameLU = true; //!> if true, written file name contains time step in LU, else is the number of the written probe files -- GitLab