From 648248e6ca26f722e1cc88c36fc73728877b6390 Mon Sep 17 00:00:00 2001
From: Henry <henry.korb@geo.uu.se>
Date: Fri, 14 Apr 2023 10:23:56 +0200
Subject: [PATCH] fix bugs introduced in merge
---
apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp | 1 -
pythonbindings/src/gpu/submodules/grid_generator.cpp | 6 +++---
src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp | 8 ++------
.../PreCollisionInteractor/Probes/PlanarAverageProbe.cu | 4 ++--
.../PreCollisionInteractor/Probes/WallModelProbe.cu | 4 ++--
5 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp b/apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp
index f1d30db4d..046e20bb8 100644
--- a/apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp
+++ b/apps/gpu/LBM/ActuatorLine/ActuatorLine.cpp
@@ -165,7 +165,6 @@ void multipleLevel(const std::string& configPath)
scalingFactory.setScalingFactory(GridScalingFactory::GridScaling::ScaleCompressible);
gridBuilder->setPeriodicBoundaryCondition(false, false, false);
- gridBuilder->setPeriodicShiftOnXBoundaryInYDirection(L_y/10);
gridBuilder->buildGrids(false); // buildGrids() has to be called before setting the BCs!!!!
diff --git a/pythonbindings/src/gpu/submodules/grid_generator.cpp b/pythonbindings/src/gpu/submodules/grid_generator.cpp
index b18a2976d..6a7164780 100644
--- a/pythonbindings/src/gpu/submodules/grid_generator.cpp
+++ b/pythonbindings/src/gpu/submodules/grid_generator.cpp
@@ -42,9 +42,9 @@
#include "gpu/GridGenerator/grid/GridBuilder/GridBuilder.h"
#include "gpu/GridGenerator/grid/GridBuilder/LevelGridBuilder.h"
#include "gpu/GridGenerator/grid/GridBuilder/MultipleGridBuilder.h"
-#include "lbm/constants/NumericConstants.h"
+#include "basics/constants/NumericConstants.h"
-using namespace vf::lbm::constant;
+using namespace vf::basics::constant;
namespace grid_generator
@@ -95,7 +95,7 @@ namespace grid_generator
.def("set_pressure_boundary_condition", &LevelGridBuilder::setPressureBoundaryCondition, py::arg("side_type"), py::arg("rho"))
.def("set_periodic_boundary_condition", &LevelGridBuilder::setPeriodicBoundaryCondition, py::arg("periodic_x"), py::arg("periodic_y"), py::arg("periodic_z"))
.def("set_no_slip_boundary_condition", &LevelGridBuilder::setNoSlipBoundaryCondition, py::arg("side_type"))
- .def("set_precursor_boundary_condition", &LevelGridBuilder::setPrecursorBoundaryCondition, py::arg("side_type"), py::arg("file_collection"), py::arg("n_t_read"), py::arg("velocity_x")=0.0f, py::arg("velocity_y")=0.0f, py::arg("velocity_z")=0.0f, py::arg("file_level_to_grid_level_map")=std::vector<uint>())
+ .def("set_precursor_boundary_condition", &LevelGridBuilder::setPrecursorBoundaryCondition, py::arg("side_type"), py::arg("file_collection"), py::arg("n_t_read"), py::arg("velocity_x")=c0o1, py::arg("velocity_y")=c0o1, py::arg("velocity_z")=c0o1, py::arg("file_level_to_grid_level_map")=std::vector<uint>())
.def("set_stress_boundary_condition", &LevelGridBuilder::setStressBoundaryCondition, py::arg("side_type"), py::arg("normal_x"), py::arg("normal_y"), py::arg("normal_z"), py::arg("sampling_offset"), py::arg("z0"), py::arg("dx"));
py::class_<MultipleGridBuilder, LevelGridBuilder, std::shared_ptr<MultipleGridBuilder>>(gridGeneratorModule, "MultipleGridBuilder")
diff --git a/src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp b/src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp
index 17bd8436a..a624a4c5b 100644
--- a/src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp
+++ b/src/gpu/VirtualFluids_GPU/Output/FileWriter.cpp
@@ -104,7 +104,6 @@ void FileWriter::writeTimestep(std::shared_ptr<Parameter> para, unsigned int tim
std::vector<std::string> fnamesMedianLong = writeUnstrucuredGridMedianLT(para, level, fnamesMed);
for(auto fname : fnamesMedianLong)
this->fileNamesForCollectionFileMedian.push_back(fname.substr( fname.find_last_of('/') + 1 ));
-
}
}
@@ -135,6 +134,7 @@ std::vector<std::string> FileWriter::getNodeDataNames(std::shared_ptr<Parameter>
nodedatanames.push_back("Fy");
nodedatanames.push_back("Fz");
}
+
if(para->getUseTurbulentViscosity())
{
nodedatanames.push_back("nut");
@@ -153,7 +153,6 @@ std::vector<std::string> FileWriter::getNodeDataNames(std::shared_ptr<Parameter>
std::vector<std::string> FileWriter::getMedianNodeDataNames(std::shared_ptr<Parameter> para)
{
-
std::vector<std::string> nodedatanames;
if(para->getDiffOn())
@@ -170,19 +169,16 @@ std::vector<std::string> FileWriter::getMedianNodeDataNames(std::shared_ptr<Para
std::string VIRTUALFLUIDS_GPU_EXPORT FileWriter::writeCollectionFile(std::shared_ptr<Parameter> para, unsigned int timestep)
{
-
std::string filename = makeCollectionFileName(para->getFName(), para->getMyProcessID(), timestep);
auto nodedatanames = this->getNodeDataNames(para);
std::vector<std::string> celldatanames;
std::string pFileName= WbWriterVtkXmlBinary::getInstance()->writeParallelFile(filename, this->fileNamesForCollectionFile, nodedatanames, celldatanames);
this->fileNamesForCollectionFile.clear();
return pFileName;
-
}
std::string VIRTUALFLUIDS_GPU_EXPORT FileWriter::writeCollectionFileMedian(std::shared_ptr<Parameter> para, unsigned int timestep)
{
-
std::string filename = makeMedianCollectionFileName(para->getFName(), para->getMyProcessID(), timestep);
std::vector<std::string> nodedatanames = getMedianNodeDataNames(para);
std::vector<std::string> celldatanames;
@@ -260,7 +256,7 @@ std::vector<std::string> FileWriter::writeUnstrucuredGridLT(std::shared_ptr<Para
nodedata[5][dn1] = (double)para->getParH(level)->typeOfGridNode[pos];
if(para->getDiffOn())
- nodedata[firstConcNode][dn1] = (double)para->getParH(level)->Conc[pos];
+ nodedata[firstConcNode][dn1] = (double)para->getParH(level)->concentration[pos];
if(para->getIsBodyForce())
{
diff --git a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PlanarAverageProbe.cu b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PlanarAverageProbe.cu
index ac4177bf1..705b71736 100644
--- a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PlanarAverageProbe.cu
+++ b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/PlanarAverageProbe.cu
@@ -16,11 +16,11 @@
#include "DataStructureInitializer/GridProvider.h"
#include "GPU/CudaMemoryManager.h"
#include "GPU/GPU_Interface.h"
-#include "lbm/constants/NumericConstants.h"
+#include "basics/constants/NumericConstants.h"
#include <algorithm>
-using namespace vf::lbm::constant;
+using namespace vf::basics::constant;
///////////////////////////////////////////////////////////////////////////////////
/// Functors for thrust reductions
///////////////////////////////////////////////////////////////////////////////////
diff --git a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/WallModelProbe.cu b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/WallModelProbe.cu
index d2ed278a8..f52c666c9 100644
--- a/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/WallModelProbe.cu
+++ b/src/gpu/VirtualFluids_GPU/PreCollisionInteractor/Probes/WallModelProbe.cu
@@ -14,9 +14,9 @@
#include "Parameter/Parameter.h"
#include "DataStructureInitializer/GridProvider.h"
#include "GPU/CudaMemoryManager.h"
-#include "lbm/constants/NumericConstants.h"
+#include "basics/constants/NumericConstants.h"
-using namespace vf::lbm::constant;
+using namespace vf::basics::constant;
typedef thrust::device_vector<real>::iterator valIterator;
typedef thrust::device_vector<uint>::iterator indIterator;
///////////////////////////////////////////////////////////////////////////////////
--
GitLab