diff --git a/apps/gpu/ActuatorLine/ActuatorLine.cpp b/apps/gpu/ActuatorLine/ActuatorLine.cpp index 1deeea035b4c72588de57c0fde76486ca533607e..f4f37c71fa426372e7483012964b546a17fa2679 100644 --- a/apps/gpu/ActuatorLine/ActuatorLine.cpp +++ b/apps/gpu/ActuatorLine/ActuatorLine.cpp @@ -55,7 +55,6 @@ #include "gpu/core/BoundaryConditions/BoundaryConditionFactory.h" #include "gpu/core/DataStructureInitializer/GridProvider.h" -#include "gpu/core/DataStructureInitializer/GridReaderFiles/GridReader.h" #include "gpu/core/DataStructureInitializer/GridReaderGenerator/GridGenerator.h" #include "gpu/core/Cuda/CudaMemoryManager.h" #include "gpu/core/GridScaling/GridScalingFactory.h" diff --git a/apps/gpu/AtmosphericBoundaryLayer/AtmosphericBoundaryLayer.cpp b/apps/gpu/AtmosphericBoundaryLayer/AtmosphericBoundaryLayer.cpp index b232d2a02ef93e84f27cd1e6ca5fa47dbf72d60d..148e39e283a79f7cc81fa01f5064307da0b0a13f 100644 --- a/apps/gpu/AtmosphericBoundaryLayer/AtmosphericBoundaryLayer.cpp +++ b/apps/gpu/AtmosphericBoundaryLayer/AtmosphericBoundaryLayer.cpp @@ -63,7 +63,6 @@ #include "gpu/core/BoundaryConditions/BoundaryConditionFactory.h" #include "gpu/core/DataStructureInitializer/GridProvider.h" -#include "gpu/core/DataStructureInitializer/GridReaderFiles/GridReader.h" #include "gpu/core/DataStructureInitializer/GridReaderGenerator/GridGenerator.h" #include "gpu/core/Cuda/CudaMemoryManager.h" #include "gpu/core/GridScaling/GridScalingFactory.h" diff --git a/apps/gpu/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp b/apps/gpu/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp index df3308ac0634ea428b66516aabdd3dea24ea9222..fd67c405a22df4747b8b2c7b8f94a603a866899a 100755 --- a/apps/gpu/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp +++ b/apps/gpu/DrivenCavityMultiGPU/DrivenCavityMultiGPU.cpp @@ -35,7 +35,6 @@ #include "gpu/core/BoundaryConditions/BoundaryConditionFactory.h" #include "gpu/core/DataStructureInitializer/GridProvider.h" -#include "gpu/core/DataStructureInitializer/GridReaderFiles/GridReader.h" #include "gpu/core/DataStructureInitializer/GridReaderGenerator/GridGenerator.h" #include "gpu/core/Cuda/CudaMemoryManager.h" #include "gpu/core/GridScaling/GridScalingFactory.h" diff --git a/apps/gpu/SphereMultiGPU/SphereMultiGPU.cpp b/apps/gpu/SphereMultiGPU/SphereMultiGPU.cpp index 127f8ba774633b3692465ccc028eb839bf4c2ef0..983f824d841b3a48258ac60ccbb79e8242e45a51 100755 --- a/apps/gpu/SphereMultiGPU/SphereMultiGPU.cpp +++ b/apps/gpu/SphereMultiGPU/SphereMultiGPU.cpp @@ -36,7 +36,6 @@ #include "gpu/core/BoundaryConditions/BoundaryConditionFactory.h" #include "gpu/core/DataStructureInitializer/GridProvider.h" -#include "gpu/core/DataStructureInitializer/GridReaderFiles/GridReader.h" #include "gpu/core/DataStructureInitializer/GridReaderGenerator/GridGenerator.h" #include "gpu/core/Cuda/CudaMemoryManager.h" #include "gpu/core/GridScaling/GridScalingFactory.h" diff --git a/apps/gpu/TGV_3D/TGV_3D.cpp b/apps/gpu/TGV_3D/TGV_3D.cpp index 5d3d73c704cdff68b417b38a4484e12231ed42f4..1dcba804138bd7d1fc030d084ce0c3c0f1e304d7 100644 --- a/apps/gpu/TGV_3D/TGV_3D.cpp +++ b/apps/gpu/TGV_3D/TGV_3D.cpp @@ -68,7 +68,6 @@ ////////////////////////////////////////////////////////////////////////// #include "gpu/core/DataStructureInitializer/GridProvider.h" -#include "gpu/core/DataStructureInitializer/GridReaderFiles/GridReader.h" #include "gpu/core/DataStructureInitializer/GridReaderGenerator/GridGenerator.h" #include "gpu/core/BoundaryConditions/BoundaryConditionFactory.h" #include "gpu/core/Cuda/CudaMemoryManager.h" diff --git a/cpu.cmake b/cpu.cmake index da0cb69ce6da954ca3dac49b2a1f7391d5b4de47..099b922b0f65a283748338403d258a233347569c 100644 --- a/cpu.cmake +++ b/cpu.cmake @@ -1,3 +1,32 @@ +# ####################################################################################### +# ____ ____ __ ______ __________ __ __ __ __ +# \ \ | | | | | _ \ |___ ___| | | | | / \ | | +# \ \ | | | | | |_) | | | | | | | / \ | | +# \ \ | | | | | _ / | | | | | | / /\ \ | | +# \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +# \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +# \ \ | | ________________________________________________________________ +# \ \ | | | ______________________________________________________________| +# \ \| | | | __ __ __ __ ______ _______ +# \ | | |_____ | | | | | | | | | _ \ / _____) +# \ | | _____| | | | | | | | | | | \ \ \_______ +# \ | | | | |_____ | \_/ | | | | |_/ / _____ | +# \ _____| |__| |________| \_______/ |__| |______/ (_______/ +# +# This file is part of VirtualFluids. VirtualFluids is free software: you can +# redistribute it and/or modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation, either version 3 of +# the License, or (at your option) any later version. +# +# VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License along +# with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +# ####################################################################################### + ############################################################# ### Options ### ############################################################# diff --git a/gpu.cmake b/gpu.cmake index 71008e8d15d42bdcbe9f6d9f7d928c2391248150..06150e463570199c8737f98a277c2ccca605ae40 100644 --- a/gpu.cmake +++ b/gpu.cmake @@ -1,3 +1,32 @@ +# ####################################################################################### +# ____ ____ __ ______ __________ __ __ __ __ +# \ \ | | | | | _ \ |___ ___| | | | | / \ | | +# \ \ | | | | | |_) | | | | | | | / \ | | +# \ \ | | | | | _ / | | | | | | / /\ \ | | +# \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +# \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +# \ \ | | ________________________________________________________________ +# \ \ | | | ______________________________________________________________| +# \ \| | | | __ __ __ __ ______ _______ +# \ | | |_____ | | | | | | | | | _ \ / _____) +# \ | | _____| | | | | | | | | | | \ \ \_______ +# \ | | | | |_____ | \_/ | | | | |_/ / _____ | +# \ _____| |__| |________| \_______/ |__| |______/ (_______/ +# +# This file is part of VirtualFluids. VirtualFluids is free software: you can +# redistribute it and/or modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation, either version 3 of +# the License, or (at your option) any later version. +# +# VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License along +# with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +# ####################################################################################### + ############################################################# ### Options ### ############################################################# diff --git a/src/basics/CMakeLists.txt b/src/basics/CMakeLists.txt index f6cbe79327504930fd13e64a2724678d2f383dca..21286460508c1f7592252e61388720a3fe31b7cd 100644 --- a/src/basics/CMakeLists.txt +++ b/src/basics/CMakeLists.txt @@ -1,3 +1,33 @@ +#======================================================================================= +# ____ ____ __ ______ __________ __ __ __ __ +# \ \ | | | | | _ \ |___ ___| | | | | / \ | | +# \ \ | | | | | |_) | | | | | | | / \ | | +# \ \ | | | | | _ / | | | | | | / /\ \ | | +# \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +# \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +# \ \ | | ________________________________________________________________ +# \ \ | | | ______________________________________________________________| +# \ \| | | | __ __ __ __ ______ _______ +# \ | | |_____ | | | | | | | | | _ \ / _____) +# \ | | _____| | | | | | | | | | | \ \ \_______ +# \ | | | | |_____ | \_/ | | | | |_/ / _____ | +# \ _____| |__| |________| \_______/ |__| |______/ (_______/ +# +# This file is part of VirtualFluids. VirtualFluids is free software: you can +# redistribute it and/or modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation, either version 3 of +# the License, or (at your option) any later version. +# +# VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License along +# with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +# +#! \author Soeren Peters +#======================================================================================= include(buildInfo.cmake) diff --git a/src/cpu/core/CMakeLists.txt b/src/cpu/core/CMakeLists.txt index d6c1b539174718e630556ace7b04dfcab6759443..1fa5d16eeba413bf39f119bc3b63cd9d39fcb69f 100644 --- a/src/cpu/core/CMakeLists.txt +++ b/src/cpu/core/CMakeLists.txt @@ -1,3 +1,33 @@ +#======================================================================================= +# ____ ____ __ ______ __________ __ __ __ __ +# \ \ | | | | | _ \ |___ ___| | | | | / \ | | +# \ \ | | | | | |_) | | | | | | | / \ | | +# \ \ | | | | | _ / | | | | | | / /\ \ | | +# \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +# \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +# \ \ | | ________________________________________________________________ +# \ \ | | | ______________________________________________________________| +# \ \| | | | __ __ __ __ ______ _______ +# \ | | |_____ | | | | | | | | | _ \ / _____) +# \ | | _____| | | | | | | | | | | \ \ \_______ +# \ | | | | |_____ | \_/ | | | | |_/ / _____ | +# \ _____| |__| |________| \_______/ |__| |______/ (_______/ +# +# This file is part of VirtualFluids. VirtualFluids is free software: you can +# redistribute it and/or modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation, either version 3 of +# the License, or (at your option) any later version. +# +# VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License along +# with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +# +#! \author Soeren Peters +#======================================================================================= set(VF_LIBRARIES) diff --git a/src/gpu/GridGenerator/CMakeLists.txt b/src/gpu/GridGenerator/CMakeLists.txt index 845b3fa434d755734b861791288f206e3b717630..8081f0ea939bc5e513b788a02ac7ef6163bcf666 100644 --- a/src/gpu/GridGenerator/CMakeLists.txt +++ b/src/gpu/GridGenerator/CMakeLists.txt @@ -1,3 +1,33 @@ +#======================================================================================= +# ____ ____ __ ______ __________ __ __ __ __ +# \ \ | | | | | _ \ |___ ___| | | | | / \ | | +# \ \ | | | | | |_) | | | | | | | / \ | | +# \ \ | | | | | _ / | | | | | | / /\ \ | | +# \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +# \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +# \ \ | | ________________________________________________________________ +# \ \ | | | ______________________________________________________________| +# \ \| | | | __ __ __ __ ______ _______ +# \ | | |_____ | | | | | | | | | _ \ / _____) +# \ | | _____| | | | | | | | | | | \ \ \_______ +# \ | | | | |_____ | \_/ | | | | |_/ / _____ | +# \ _____| |__| |________| \_______/ |__| |______/ (_______/ +# +# This file is part of VirtualFluids. VirtualFluids is free software: you can +# redistribute it and/or modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation, either version 3 of +# the License, or (at your option) any later version. +# +# VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License along +# with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +# +#! \author Soeren Peters +#======================================================================================= vf_add_library(NAME GridGenerator PUBLIC_LINK basics logger OpenMP::OpenMP_CXX PRIVATE_LINK project_options project_warnings) vf_add_tests() diff --git a/src/gpu/core/CMakeLists.txt b/src/gpu/core/CMakeLists.txt index 2ee5bba22fccd02a969d59ea79de2711a30f788a..291b9fe2224e3f23d901f2886ec9fbc03a104838 100644 --- a/src/gpu/core/CMakeLists.txt +++ b/src/gpu/core/CMakeLists.txt @@ -1,3 +1,33 @@ +#======================================================================================= +# ____ ____ __ ______ __________ __ __ __ __ +# \ \ | | | | | _ \ |___ ___| | | | | / \ | | +# \ \ | | | | | |_) | | | | | | | / \ | | +# \ \ | | | | | _ / | | | | | | / /\ \ | | +# \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +# \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +# \ \ | | ________________________________________________________________ +# \ \ | | | ______________________________________________________________| +# \ \| | | | __ __ __ __ ______ _______ +# \ | | |_____ | | | | | | | | | _ \ / _____) +# \ | | _____| | | | | | | | | | | \ \ \_______ +# \ | | | | |_____ | \_/ | | | | |_/ / _____ | +# \ _____| |__| |________| \_______/ |__| |______/ (_______/ +# +# This file is part of VirtualFluids. VirtualFluids is free software: you can +# redistribute it and/or modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation, either version 3 of +# the License, or (at your option) any later version. +# +# VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License along +# with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +# +#! \author Soeren Peters +#======================================================================================= project(gpu_core LANGUAGES CUDA CXX) diff --git a/src/gpu/core/DataStructureInitializer/GridProvider.cpp b/src/gpu/core/DataStructureInitializer/GridProvider.cpp index 418bc84d40932e12f93eb4ddfff369389b36981f..ced5eb4a31e526e585b9fbaa8d5911780845d876 100644 --- a/src/gpu/core/DataStructureInitializer/GridProvider.cpp +++ b/src/gpu/core/DataStructureInitializer/GridProvider.cpp @@ -1,14 +1,42 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//======================================================================================= #include "GridProvider.h" -#include <Parameter/Parameter.h> #include "GridReaderFiles/GridReader.h" #include "GridReaderGenerator/GridGenerator.h" +#include <Parameter/Parameter.h> #include <GridGenerator/grid/GridBuilder/GridBuilder.h> #include "Cuda/CudaMemoryManager.h" - std::shared_ptr<GridProvider> GridProvider::makeGridGenerator(std::shared_ptr<GridBuilder> builder, std::shared_ptr<Parameter> para, std::shared_ptr<CudaMemoryManager> cudaMemoryManager, vf::parallel::Communicator& communicator) { return std::shared_ptr<GridProvider>(new GridGenerator(builder, para, cudaMemoryManager, communicator)); diff --git a/src/gpu/core/DataStructureInitializer/GridProvider.h b/src/gpu/core/DataStructureInitializer/GridProvider.h index c05390a0a20e637a722ae53d62402dba6ddbe808..eb36cd9a6c250ac16446f1ea549ccccc09ec8b14 100644 --- a/src/gpu/core/DataStructureInitializer/GridProvider.h +++ b/src/gpu/core/DataStructureInitializer/GridProvider.h @@ -1,3 +1,32 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//======================================================================================= #ifndef GridReader_H #define GridReader_H diff --git a/src/gpu/core/DataStructureInitializer/GridReaderFiles/BoundaryQs.cpp b/src/gpu/core/DataStructureInitializer/GridReaderFiles/BoundaryQs.cpp index 06b0ddb837fdeefe2656f50f5c62bc1e3afcf059..8d1b630af56e7f1c7c47ad83e3cadb21866e0ece 100644 --- a/src/gpu/core/DataStructureInitializer/GridReaderFiles/BoundaryQs.cpp +++ b/src/gpu/core/DataStructureInitializer/GridReaderFiles/BoundaryQs.cpp @@ -1,3 +1,32 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//======================================================================================= #include "BoundaryQs.h" #include "Parameter/Parameter.h" diff --git a/src/gpu/core/DataStructureInitializer/GridReaderFiles/BoundaryQs.h b/src/gpu/core/DataStructureInitializer/GridReaderFiles/BoundaryQs.h index c74bcfb5e983fededbf543d46411d2f059d25cdd..d1cd8ecc4cc455eebb3469ea92bd37cdd2dba59d 100644 --- a/src/gpu/core/DataStructureInitializer/GridReaderFiles/BoundaryQs.h +++ b/src/gpu/core/DataStructureInitializer/GridReaderFiles/BoundaryQs.h @@ -1,3 +1,32 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//======================================================================================= #ifndef BoundaryQs_H #define BoundaryQs_H diff --git a/src/gpu/core/DataStructureInitializer/GridReaderFiles/BoundaryValues.cpp b/src/gpu/core/DataStructureInitializer/GridReaderFiles/BoundaryValues.cpp index d77bf9316349343594dafb0e75680e26c077feb5..fee8fc02572a932010e0253762801af5f50a2b63 100644 --- a/src/gpu/core/DataStructureInitializer/GridReaderFiles/BoundaryValues.cpp +++ b/src/gpu/core/DataStructureInitializer/GridReaderFiles/BoundaryValues.cpp @@ -1,3 +1,32 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//======================================================================================= #include "BoundaryValues.h" #include "Parameter/Parameter.h" diff --git a/src/gpu/core/DataStructureInitializer/GridReaderFiles/BoundaryValues.h b/src/gpu/core/DataStructureInitializer/GridReaderFiles/BoundaryValues.h index b0c24cf90ea0f89d7fd0ba654c6ccbd386135468..41daeed5f092981a094a7776868e9284ceda7414 100644 --- a/src/gpu/core/DataStructureInitializer/GridReaderFiles/BoundaryValues.h +++ b/src/gpu/core/DataStructureInitializer/GridReaderFiles/BoundaryValues.h @@ -1,3 +1,32 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//======================================================================================= #ifndef BoundaryValues_H #define BoundaryValues_H diff --git a/src/gpu/core/DataStructureInitializer/GridReaderFiles/CoordNeighborGeoV.cpp b/src/gpu/core/DataStructureInitializer/GridReaderFiles/CoordNeighborGeoV.cpp index c973f19b319c2d09fe2c1a4de9c6b4b58295f595..fb1894f9ed64bc1d13a3d495615f4a3aa8d62491 100644 --- a/src/gpu/core/DataStructureInitializer/GridReaderFiles/CoordNeighborGeoV.cpp +++ b/src/gpu/core/DataStructureInitializer/GridReaderFiles/CoordNeighborGeoV.cpp @@ -1,3 +1,32 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//======================================================================================= #include "CoordNeighborGeoV.h" #include <iostream> diff --git a/src/gpu/core/DataStructureInitializer/GridReaderFiles/CoordNeighborGeoV.h b/src/gpu/core/DataStructureInitializer/GridReaderFiles/CoordNeighborGeoV.h index b9b31170ea079f8fa6b2cc473cc8b38d3ec84b30..bf08b26178c5057da876c5c97f576d42e5f83fd1 100644 --- a/src/gpu/core/DataStructureInitializer/GridReaderFiles/CoordNeighborGeoV.h +++ b/src/gpu/core/DataStructureInitializer/GridReaderFiles/CoordNeighborGeoV.h @@ -1,3 +1,32 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//======================================================================================= #ifndef CoordNeighborGeoV_H #define CoordNeighborGeoV_H diff --git a/src/gpu/core/DataStructureInitializer/GridReaderFiles/GridReader.cpp b/src/gpu/core/DataStructureInitializer/GridReaderFiles/GridReader.cpp index f782a7bd93f13eda498e8dc8e3e03ea1ec042919..cb575903b7a0778f3195017a5697a310f1b858a7 100644 --- a/src/gpu/core/DataStructureInitializer/GridReaderFiles/GridReader.cpp +++ b/src/gpu/core/DataStructureInitializer/GridReaderFiles/GridReader.cpp @@ -1,3 +1,32 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//======================================================================================= #include "GridReader.h" #include <iostream> diff --git a/src/gpu/core/DataStructureInitializer/GridReaderFiles/GridReader.h b/src/gpu/core/DataStructureInitializer/GridReaderFiles/GridReader.h index e2ce842f3e1455dd1433e4b98ed51eab2fec1df4..d43600aef5b875b590c8ace460b725185bbbd368 100644 --- a/src/gpu/core/DataStructureInitializer/GridReaderFiles/GridReader.h +++ b/src/gpu/core/DataStructureInitializer/GridReaderFiles/GridReader.h @@ -1,3 +1,32 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//======================================================================================= #ifndef GridReaderFiles_H #define GridReaderFiles_H @@ -9,8 +38,6 @@ #include "Calculation/Calculation.h" -// - class Parameter; class BoundaryValues; class BoundaryQs; @@ -35,7 +62,7 @@ private: public: GridReader(FILEFORMAT format, std::shared_ptr<Parameter> para, std::shared_ptr<CudaMemoryManager> cudaMemoryManager); - ~GridReader() {}; + ~GridReader() = default; void allocArrays_CoordNeighborGeo() override; void allocArrays_BoundaryValues() override; void allocArrays_OffsetScale() override; diff --git a/src/gpu/core/DataStructureInitializer/GridReaderFiles/MeasuredPoints.cpp b/src/gpu/core/DataStructureInitializer/GridReaderFiles/MeasuredPoints.cpp index 3caaa5ae0195546ba519af136f4a62cc083038f7..5a0ea5a52396e43eba54d1620b2ebb3418ff6249 100644 --- a/src/gpu/core/DataStructureInitializer/GridReaderFiles/MeasuredPoints.cpp +++ b/src/gpu/core/DataStructureInitializer/GridReaderFiles/MeasuredPoints.cpp @@ -1,5 +1,34 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//======================================================================================= #include "MeasuredPoints.h" -#include <stdlib.h> +#include <cstdlib> #include <iostream> //using namespace std; diff --git a/src/gpu/core/DataStructureInitializer/GridReaderFiles/MeasuredPoints.h b/src/gpu/core/DataStructureInitializer/GridReaderFiles/MeasuredPoints.h index 2ce8b501758843a54d3b3fe7ead61a277100216d..267a85b054193971708c8e7b646ba9945af58b1e 100644 --- a/src/gpu/core/DataStructureInitializer/GridReaderFiles/MeasuredPoints.h +++ b/src/gpu/core/DataStructureInitializer/GridReaderFiles/MeasuredPoints.h @@ -1,11 +1,40 @@ -#pragma once +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//======================================================================================= +#ifndef READER_MEASUERPOINTS_H +#define READER_MEASUERPOINTS_H #include <string> #include <vector> #include "CoordNeighborGeoV.h" - class MeasuredPoints : public CoordNeighborGeoV { @@ -21,3 +50,4 @@ public: }; +#endif diff --git a/src/gpu/core/DataStructureInitializer/GridReaderFiles/OffsetScale.cpp b/src/gpu/core/DataStructureInitializer/GridReaderFiles/OffsetScale.cpp index 18960aaa3d15b05694a8cedbb872d9b253b7cd02..cf239fd390cc75a932306af6d5c74cbc9729a7de 100644 --- a/src/gpu/core/DataStructureInitializer/GridReaderFiles/OffsetScale.cpp +++ b/src/gpu/core/DataStructureInitializer/GridReaderFiles/OffsetScale.cpp @@ -1,6 +1,35 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//======================================================================================= #include "OffsetScale.h" -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> #include <iostream> using namespace std; diff --git a/src/gpu/core/DataStructureInitializer/GridReaderFiles/OffsetScale.h b/src/gpu/core/DataStructureInitializer/GridReaderFiles/OffsetScale.h index 1688673fd790012efd41897658c19aab6380a864..65406a9fe7366e6fd0bae8f85d45a8ad44472e20 100644 --- a/src/gpu/core/DataStructureInitializer/GridReaderFiles/OffsetScale.h +++ b/src/gpu/core/DataStructureInitializer/GridReaderFiles/OffsetScale.h @@ -1,3 +1,32 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//======================================================================================= #ifndef OFFSET_SCALE_H #define OFFSET_SCALE_H diff --git a/src/gpu/core/DataStructureInitializer/GridReaderGenerator/GridGenerator.cpp b/src/gpu/core/DataStructureInitializer/GridReaderGenerator/GridGenerator.cpp index 1d4d3f47892cefeb6119ad172f25f6d82a090f5a..2edb77c1b76cb3879a7cc0d111aeed4ab7063610 100644 --- a/src/gpu/core/DataStructureInitializer/GridReaderGenerator/GridGenerator.cpp +++ b/src/gpu/core/DataStructureInitializer/GridReaderGenerator/GridGenerator.cpp @@ -1,3 +1,33 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Martin Schoenherr +//======================================================================================= #include "GridGenerator.h" #include <algorithm> diff --git a/src/gpu/core/DataStructureInitializer/GridReaderGenerator/GridGenerator.h b/src/gpu/core/DataStructureInitializer/GridReaderGenerator/GridGenerator.h index a5641015bbde9e2107ee7cd7f406fa935c385a10..4690b4971d30d03bd0240ff5d41baa100ac87b09 100644 --- a/src/gpu/core/DataStructureInitializer/GridReaderGenerator/GridGenerator.h +++ b/src/gpu/core/DataStructureInitializer/GridReaderGenerator/GridGenerator.h @@ -1,33 +1,31 @@ //======================================================================================= -// ____ ____ __ ______ __________ __ __ __ __ -// \ \ | | | | | _ \ |___ ___| | | | | / \ | | -// \ \ | | | | | |_) | | | | | | | / \ | | -// \ \ | | | | | _ / | | | | | | / /\ \ | | -// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ -// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| -// \ \ | | ________________________________________________________________ -// \ \ | | | ______________________________________________________________| -// \ \| | | | __ __ __ __ ______ _______ -// \ | | |_____ | | | | | | | | | _ \ / _____) -// \ | | _____| | | | | | | | | | | \ \ \_______ +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ // \ | | | | |_____ | \_/ | | | | |_/ / _____ | -// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ // -// This file is part of VirtualFluids. VirtualFluids is free software: you can +// This file is part of VirtualFluids. VirtualFluids is free software: you can // redistribute it and/or modify it under the terms of the GNU General Public -// License as published by the Free Software Foundation, either version 3 of +// License as published by the Free Software Foundation, either version 3 of // the License, or (at your option) any later version. -// -// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT -// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License // for more details. -// +// // You should have received a copy of the GNU General Public License along // with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. // -//! \file GridGenerator.h -//! \ingroup DataStructureInitializer //! \author Martin Schoenherr //======================================================================================= #ifndef GridReaderGenerator_H diff --git a/src/gpu/core/DataStructureInitializer/GridReaderGenerator/GridGeneratorTest.cpp b/src/gpu/core/DataStructureInitializer/GridReaderGenerator/GridGeneratorTest.cpp index 8a4434fa87df4a11a079d75424b72991b9c9ac55..35f1d60f97d5dcf78c9e309676928ce850dbdd57 100644 --- a/src/gpu/core/DataStructureInitializer/GridReaderGenerator/GridGeneratorTest.cpp +++ b/src/gpu/core/DataStructureInitializer/GridReaderGenerator/GridGeneratorTest.cpp @@ -1,3 +1,33 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Martin Schoenherr +//======================================================================================= #include "GridGenerator.h" #include <gmock/gmock.h> diff --git a/src/gpu/core/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreams.cpp b/src/gpu/core/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreams.cpp index 15852ad5e55936bd9c1277b22d0b9df348851d69..7fc5a56bcdfd38b92a3f939db840552af22e661d 100644 --- a/src/gpu/core/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreams.cpp +++ b/src/gpu/core/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreams.cpp @@ -1,3 +1,34 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Anna Wellmann +//! \details See [master thesis of Anna Wellmann] +//======================================================================================= #include "IndexRearrangementForStreams.h" #include <algorithm> diff --git a/src/gpu/core/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreams.h b/src/gpu/core/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreams.h index 421e5aa4cb69cf56df79d9d4c2f0beb4504ce2c3..f45595e1b664ef4008487c6bff70f37fab4aa8cd 100644 --- a/src/gpu/core/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreams.h +++ b/src/gpu/core/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreams.h @@ -1,8 +1,34 @@ -//! \file IndexRearrangementForStreams.h -//! \ingroup GPU +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// //! \author Anna Wellmann //! \details See [master thesis of Anna Wellmann] - +//======================================================================================= #ifndef IndexRearrangementForStreams_H #define IndexRearrangementForStreams_H diff --git a/src/gpu/core/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreamsTest.cpp b/src/gpu/core/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreamsTest.cpp index bcdb22b9ce04cc2164feb6d0ed45ac23f569712e..3f05b7fdd4e9fa25ca0b5dab8e2774c80c2f5510 100644 --- a/src/gpu/core/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreamsTest.cpp +++ b/src/gpu/core/DataStructureInitializer/GridReaderGenerator/IndexRearrangementForStreamsTest.cpp @@ -1,3 +1,34 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Anna Wellmann +//! \details See [master thesis of Anna Wellmann] +//======================================================================================= #include <gmock/gmock.h> #include <algorithm> diff --git a/src/gpu/core/DataStructureInitializer/GridReaderGenerator/InterpolationCellGrouper.cpp b/src/gpu/core/DataStructureInitializer/GridReaderGenerator/InterpolationCellGrouper.cpp index f3717b58fca0e81e23be100eb8d15371703f8010..54052fe3d51dda352db03f02f1d58c565c6933de 100644 --- a/src/gpu/core/DataStructureInitializer/GridReaderGenerator/InterpolationCellGrouper.cpp +++ b/src/gpu/core/DataStructureInitializer/GridReaderGenerator/InterpolationCellGrouper.cpp @@ -1,3 +1,34 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Anna Wellmann +//! \details See [master thesis of Anna Wellmann] +//======================================================================================= #include "InterpolationCellGrouper.h" #include "Parameter/Parameter.h" diff --git a/src/gpu/core/DataStructureInitializer/GridReaderGenerator/InterpolationCellGrouper.h b/src/gpu/core/DataStructureInitializer/GridReaderGenerator/InterpolationCellGrouper.h index f619d785e1f6c30cee0c698cbc9d8dd8249f414f..87f700688a29a24536340c105559dd5f7a573179 100644 --- a/src/gpu/core/DataStructureInitializer/GridReaderGenerator/InterpolationCellGrouper.h +++ b/src/gpu/core/DataStructureInitializer/GridReaderGenerator/InterpolationCellGrouper.h @@ -1,7 +1,34 @@ -//! \file InterpolationCellGrouper.h -//! \ingroup GPU +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// //! \author Anna Wellmann //! \details See [master thesis of Anna Wellmann] +//======================================================================================= #ifndef InterpolationCellGrouper_H #define InterpolationCellGrouper_H diff --git a/src/gpu/core/DataStructureInitializer/GridReaderGenerator/InterpolationCellGrouperTest.cpp b/src/gpu/core/DataStructureInitializer/GridReaderGenerator/InterpolationCellGrouperTest.cpp index 4f4e8525f17ef004d65ee2eaa3d4d533d9d40734..939c5cb78093919dba76b1c8b129527209287ff4 100644 --- a/src/gpu/core/DataStructureInitializer/GridReaderGenerator/InterpolationCellGrouperTest.cpp +++ b/src/gpu/core/DataStructureInitializer/GridReaderGenerator/InterpolationCellGrouperTest.cpp @@ -1,3 +1,34 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Anna Wellmann +//! \details See [master thesis of Anna Wellmann] +//======================================================================================= #include <gmock/gmock.h> #include "Utilities/testUtilitiesGPU.h" diff --git a/src/gpu/core/GridScaling/GridScalingFactory.cpp b/src/gpu/core/GridScaling/GridScalingFactory.cpp index b75e1211a6a806f7fdf9c7ad0fc34d3c7be4a2e6..9eb24781c2f5e11c39381adef541ca72ed5df6a4 100644 --- a/src/gpu/core/GridScaling/GridScalingFactory.cpp +++ b/src/gpu/core/GridScaling/GridScalingFactory.cpp @@ -1,3 +1,33 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Anna Wellmann, Martin Schönherr +//======================================================================================= #include "GridScalingFactory.h" #include "Scaling.cuh" diff --git a/src/gpu/core/GridScaling/GridScalingFactory.h b/src/gpu/core/GridScaling/GridScalingFactory.h index 60c598e554f1895c129f918921332acea6b551e3..1df9102a3ebb65d5905601c1a4f550c28b0aca0a 100644 --- a/src/gpu/core/GridScaling/GridScalingFactory.h +++ b/src/gpu/core/GridScaling/GridScalingFactory.h @@ -26,8 +26,6 @@ // You should have received a copy of the GNU General Public License along // with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. // -//! \file GridScalingFactory.h -//! \ingroup Factories //! \author Anna Wellmann, Martin Schönherr //======================================================================================= #ifndef GS_FACTORY diff --git a/src/gpu/core/GridScaling/GridScalingKernelManager.cpp b/src/gpu/core/GridScaling/GridScalingKernelManager.cpp index d4c7806f4619808a82fb927681f8daf6bdf89a7a..611addf31f32f3b0957a32a1efb5b7c10f72656e 100644 --- a/src/gpu/core/GridScaling/GridScalingKernelManager.cpp +++ b/src/gpu/core/GridScaling/GridScalingKernelManager.cpp @@ -26,8 +26,6 @@ // You should have received a copy of the GNU General Public License along // with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. // -//! \file GridScalingKernelManager.h -//! \ingroup KernelManager //! \author Martin Schoenherr //======================================================================================= #include "GridScaling/GridScalingKernelManager.h" diff --git a/src/gpu/core/GridScaling/GridScalingKernelManager.h b/src/gpu/core/GridScaling/GridScalingKernelManager.h index 9837754e58b37b62b363e206038833cbcb3cfed4..29af993316427b8c46c1b97c7c9747f6f2a560ee 100644 --- a/src/gpu/core/GridScaling/GridScalingKernelManager.h +++ b/src/gpu/core/GridScaling/GridScalingKernelManager.h @@ -26,8 +26,6 @@ // You should have received a copy of the GNU General Public License along // with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. // -//! \file GridScalingKernelManager.h -//! \ingroup KernelManager //! \author Martin Schoenherr //======================================================================================= #ifndef GridScalingKernelManager_H diff --git a/src/gpu/core/GridScaling/GridScalingKernelManagerTest.cpp b/src/gpu/core/GridScaling/GridScalingKernelManagerTest.cpp index bb1daf2aa2c145a3052268070c1acf883dfbec9b..b6096e748929e0318cef9a83740beda7ff3028ee 100644 --- a/src/gpu/core/GridScaling/GridScalingKernelManagerTest.cpp +++ b/src/gpu/core/GridScaling/GridScalingKernelManagerTest.cpp @@ -1,3 +1,33 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Anna Wellmann, Martin Schönherr +//======================================================================================= #include <gmock/gmock.h> #include <stdexcept> @@ -78,4 +108,3 @@ TEST_F(GridScalingKernelManagerTest_Initialization, multipleLevelWithInterpolati para->getParD(0)->fineToCoarse.numberOfCells = 100; EXPECT_THROW(GridScalingKernelManager(para, &scalingFactory), std::runtime_error); } - diff --git a/src/gpu/core/GridScaling/RefinementStrategy.cpp b/src/gpu/core/GridScaling/RefinementStrategy.cpp index e3a457a8d4af2dcf959d937840d8b47131b2324b..0f3d476c2cc2a05c50921a8ba258cc0a86997b5b 100644 --- a/src/gpu/core/GridScaling/RefinementStrategy.cpp +++ b/src/gpu/core/GridScaling/RefinementStrategy.cpp @@ -26,8 +26,6 @@ // You should have received a copy of the GNU General Public License along // with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. // -//! \file GridScalingFactory.h -//! \ingroup Factories //! \author Anna Wellmann, Martin Schönherr //======================================================================================= #include "RefinementStrategy.h" diff --git a/src/gpu/core/GridScaling/RefinementStrategy.h b/src/gpu/core/GridScaling/RefinementStrategy.h index 882e127e6b1cc0f5f93fc21fe3be5deb98408a3f..7f116650bbcd96090675115e4133f8d144c6f71a 100644 --- a/src/gpu/core/GridScaling/RefinementStrategy.h +++ b/src/gpu/core/GridScaling/RefinementStrategy.h @@ -26,11 +26,8 @@ // You should have received a copy of the GNU General Public License along // with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. // -//! \file GridScalingFactory.h -//! \ingroup Factories //! \author Anna Wellmann, Martin Schönherr //======================================================================================= - #ifndef REFINEMENTSTRATEGY_H #define REFINEMENTSTRATEGY_H diff --git a/src/gpu/core/Parameter/EdgeNodeFinder.cpp b/src/gpu/core/Parameter/EdgeNodeFinder.cpp index fc1d9b19752be009c8105e5d2759c33afe8e9400..00d44ed2b2608655aff1c33e0e7a23cda09f0f0b 100644 --- a/src/gpu/core/Parameter/EdgeNodeFinder.cpp +++ b/src/gpu/core/Parameter/EdgeNodeFinder.cpp @@ -1,3 +1,36 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Anna Wellmann +//! \brief Functions for finding edge nodes in the multi-gpu implementation +//! \details Edge nodes are nodes, which are part of the communication in multiple directions +//! \ref master thesis of Anna Wellmann (p. 54-57) +//======================================================================================= #include <vector> #include <optional> diff --git a/src/gpu/core/Parameter/EdgeNodeFinder.h b/src/gpu/core/Parameter/EdgeNodeFinder.h index 440b307c871ca4d1b3e1a6457c37657f080a33a4..75738f95f68abab29f3667f85a4bd29566e7ca57 100644 --- a/src/gpu/core/Parameter/EdgeNodeFinder.h +++ b/src/gpu/core/Parameter/EdgeNodeFinder.h @@ -26,13 +26,10 @@ // You should have received a copy of the GNU General Public License along // with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. // -//! \file EdgeNodeFinder.h -//! \ingroup Parameter //! \author Anna Wellmann //! \brief Functions for finding edge nodes in the multi-gpu implementation //! \details Edge nodes are nodes, which are part of the communication in multiple directions //! \ref master thesis of Anna Wellmann (p. 54-57) - //======================================================================================= #ifndef GPU_EDGENODES_H #define GPU_EDGENODES_H diff --git a/src/gpu/core/Parameter/EdgeNodeFinderTest.cpp b/src/gpu/core/Parameter/EdgeNodeFinderTest.cpp index c63c1620ae368cdb31ed582814b472b4695114bf..39b8976c769756d5b5c7788b934436e9132413bb 100644 --- a/src/gpu/core/Parameter/EdgeNodeFinderTest.cpp +++ b/src/gpu/core/Parameter/EdgeNodeFinderTest.cpp @@ -1,3 +1,36 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Anna Wellmann +//! \brief Functions for finding edge nodes in the multi-gpu implementation +//! \details Edge nodes are nodes, which are part of the communication in multiple directions +//! \ref master thesis of Anna Wellmann (p. 54-57) +//======================================================================================= #include <gmock/gmock.h> #include <filesystem> diff --git a/src/gpu/core/PostProcessor/Cp.cpp b/src/gpu/core/PostProcessor/Cp.cpp index 7ad45028c9afb5638d2eb0677bd74243fd451169..0f0b81fbaa1c1bf35bbc955d7c89182f0f255ff0 100644 --- a/src/gpu/core/PostProcessor/Cp.cpp +++ b/src/gpu/core/PostProcessor/Cp.cpp @@ -1,3 +1,33 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Martin Schoenherr +//======================================================================================= #include "Cp.h" #include <cuda_runtime.h> diff --git a/src/gpu/core/PostProcessor/Cp.h b/src/gpu/core/PostProcessor/Cp.h index 4874280296378e05c1b2b05b2faac1aa211cb8c6..670d1e81652d9175a4e9c77421670f34d9614d46 100644 --- a/src/gpu/core/PostProcessor/Cp.h +++ b/src/gpu/core/PostProcessor/Cp.h @@ -1,10 +1,39 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Martin Schoenherr +//======================================================================================= #ifndef Cp_H #define Cp_H #include "Calculation/Calculation.h" - -#include "Parameter/Parameter.h" #include "Cuda/CudaMemoryManager.h" +#include "Parameter/Parameter.h" void calcCp(Parameter* para, CudaMemoryManager* cudaMemoryManager, int lev); void printCpTopIntermediateStep(Parameter* para, unsigned int t, int lev); diff --git a/src/gpu/core/PreCollisionInteractor/PreCollisionInteractor.h b/src/gpu/core/PreCollisionInteractor/PreCollisionInteractor.h index 65149ed8b52404cb54a5cfba29120ca56fd7bf50..a683a9d35cf74ed0656fba8d85906605ec683d70 100644 --- a/src/gpu/core/PreCollisionInteractor/PreCollisionInteractor.h +++ b/src/gpu/core/PreCollisionInteractor/PreCollisionInteractor.h @@ -1,32 +1,50 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//======================================================================================= #ifndef PreCollisionInteractor_H #define PreCollisionInteractor_H +#include <cassert> #include <string> #include <vector> #include <basics/DataTypes.h> #include <basics/PointerDefinitions.h> - -#include <cassert> - class Parameter; class GridProvider; class CudaMemoryManager; class PreCollisionInteractor { - -protected: - PreCollisionInteractor() - { - this->updateInterval = 1; - } - public: - virtual ~PreCollisionInteractor() - { - } + virtual ~PreCollisionInteractor() = default; virtual void init(Parameter *para, GridProvider *gridProvider, CudaMemoryManager *cudaMemoryManager) = 0; virtual void interact(Parameter *para, CudaMemoryManager *cudaMemoryManager, int level, uint t) = 0; @@ -34,7 +52,7 @@ public: virtual void getTaggedFluidNodes(Parameter *para, GridProvider* gridProvider) = 0; protected: - uint updateInterval; + uint updateInterval { 1 }; }; -#endif \ No newline at end of file +#endif diff --git a/src/gpu/core/PreProcessor/InitLattice.cpp b/src/gpu/core/PreProcessor/InitLattice.cpp index bf938fbeecc4eb485a33034416fac79512e5e474..4e480481896a01860b2e2e83b384cb5d270ebc49 100644 --- a/src/gpu/core/PreProcessor/InitLattice.cpp +++ b/src/gpu/core/PreProcessor/InitLattice.cpp @@ -1,33 +1,31 @@ //======================================================================================= -// ____ ____ __ ______ __________ __ __ __ __ -// \ \ | | | | | _ \ |___ ___| | | | | / \ | | -// \ \ | | | | | |_) | | | | | | | / \ | | -// \ \ | | | | | _ / | | | | | | / /\ \ | | -// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ -// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| -// \ \ | | ________________________________________________________________ -// \ \ | | | ______________________________________________________________| -// \ \| | | | __ __ __ __ ______ _______ -// \ | | |_____ | | | | | | | | | _ \ / _____) -// \ | | _____| | | | | | | | | | | \ \ \_______ +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ // \ | | | | |_____ | \_/ | | | | |_/ / _____ | -// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ // -// This file is part of VirtualFluids. VirtualFluids is free software: you can +// This file is part of VirtualFluids. VirtualFluids is free software: you can // redistribute it and/or modify it under the terms of the GNU General Public -// License as published by the Free Software Foundation, either version 3 of +// License as published by the Free Software Foundation, either version 3 of // the License, or (at your option) any later version. -// -// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT -// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License // for more details. -// +// // You should have received a copy of the GNU General Public License along // with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. // -//! \file InitLattice.h -//! \ingroup Init //! \author Martin Schoenherr //======================================================================================= #include "PreProcessor/InitLattice.h" diff --git a/src/gpu/core/PreProcessor/InitLattice.h b/src/gpu/core/PreProcessor/InitLattice.h index 2e51f911ce93525cf3cbc418ea14fe02aa598cd0..1cce9046eb8dc84cdc509e092419b62d8d0b1026 100644 --- a/src/gpu/core/PreProcessor/InitLattice.h +++ b/src/gpu/core/PreProcessor/InitLattice.h @@ -1,33 +1,31 @@ //======================================================================================= -// ____ ____ __ ______ __________ __ __ __ __ -// \ \ | | | | | _ \ |___ ___| | | | | / \ | | -// \ \ | | | | | |_) | | | | | | | / \ | | -// \ \ | | | | | _ / | | | | | | / /\ \ | | -// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ -// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| -// \ \ | | ________________________________________________________________ -// \ \ | | | ______________________________________________________________| -// \ \| | | | __ __ __ __ ______ _______ -// \ | | |_____ | | | | | | | | | _ \ / _____) -// \ | | _____| | | | | | | | | | | \ \ \_______ +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ // \ | | | | |_____ | \_/ | | | | |_/ / _____ | -// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ // -// This file is part of VirtualFluids. VirtualFluids is free software: you can +// This file is part of VirtualFluids. VirtualFluids is free software: you can // redistribute it and/or modify it under the terms of the GNU General Public -// License as published by the Free Software Foundation, either version 3 of +// License as published by the Free Software Foundation, either version 3 of // the License, or (at your option) any later version. -// -// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT -// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License // for more details. -// +// // You should have received a copy of the GNU General Public License along // with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. // -//! \file InitLattice.h -//! \ingroup Init //! \author Martin Schoenherr //======================================================================================= #ifndef INIT_LATTICE_H diff --git a/src/gpu/core/PreProcessor/ReaderMeasurePoints.cpp b/src/gpu/core/PreProcessor/ReaderMeasurePoints.cpp index 238bfbf7c32febe6dc1f37bfdb64340bb88505d9..77f0898f270bc78019c1e8d24ad73adf7f2a81cd 100644 --- a/src/gpu/core/PreProcessor/ReaderMeasurePoints.cpp +++ b/src/gpu/core/PreProcessor/ReaderMeasurePoints.cpp @@ -1,3 +1,33 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Martin Schoenherr +//======================================================================================= #include "ReaderMeasurePoints.h" #include "Parameter/Parameter.h" diff --git a/src/gpu/core/PreProcessor/ReaderMeasurePoints.h b/src/gpu/core/PreProcessor/ReaderMeasurePoints.h index 62dd9446c0ad9d0e3b1d1e5c34eb80d53ff8038a..ec03f956aaac334e31ef78b3de6f934b2c9bc114 100644 --- a/src/gpu/core/PreProcessor/ReaderMeasurePoints.h +++ b/src/gpu/core/PreProcessor/ReaderMeasurePoints.h @@ -1,3 +1,33 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Martin Schoenherr +//======================================================================================= #ifndef POSITION_READER_H #define POSITION_READER_H diff --git a/src/gpu/core/Restart/RestartObject.cpp b/src/gpu/core/Restart/RestartObject.cpp index 15813b7967a84e45f44eb4d286c41aa99c4ff343..585cd7669dadf01ba7afdcac52f6bd170f5b5c8b 100644 --- a/src/gpu/core/Restart/RestartObject.cpp +++ b/src/gpu/core/Restart/RestartObject.cpp @@ -1,3 +1,33 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Martin Schoenherr +//======================================================================================= #include "RestartObject.h" #include <fstream> diff --git a/src/gpu/core/Restart/RestartObject.h b/src/gpu/core/Restart/RestartObject.h index 963c6549fd41c80c77edc9a205679e8cbc627a1e..fe08d8a74cdb843de6f9f83020a204951ed475fa 100644 --- a/src/gpu/core/Restart/RestartObject.h +++ b/src/gpu/core/Restart/RestartObject.h @@ -1,3 +1,33 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Martin Schoenherr +//======================================================================================= #ifndef RestartObject_H #define RestartObject_H diff --git a/src/gpu/core/Restart/RestartObjectTests.cpp b/src/gpu/core/Restart/RestartObjectTests.cpp index c30f514c60ba1af2fb852ed8a68b36121ebced04..a9427ca101fb70e439391510fe99b74c71a4101d 100644 --- a/src/gpu/core/Restart/RestartObjectTests.cpp +++ b/src/gpu/core/Restart/RestartObjectTests.cpp @@ -1,8 +1,37 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Martin Schoenherr +//======================================================================================= #include <gmock/gmock.h> #include "RestartObject.h" - template <typename Type> void saveAndLoad() { @@ -16,7 +45,6 @@ void saveAndLoad() const std::string name {"test_do_check_point"}; write_object->serialize_internal(name); - std::shared_ptr<RestartObject> read_object = std::make_shared<Type>(); read_object->deserialize_internal(name); @@ -28,7 +56,6 @@ TEST(RestartObjectTests, saveAndLoad_ascii) saveAndLoad<ASCIIRestartObject>(); } - TEST(RestartObjectTests, saveAndLoad_binary) { saveAndLoad<BinaryRestartObject>(); diff --git a/src/gpu/core/TurbulenceModels/TurbulenceModelFactory.cpp b/src/gpu/core/TurbulenceModels/TurbulenceModelFactory.cpp index cd43d4eda1278cd322e2c90bff05c5bea6f7a3a5..a569c617197d5d538fa2a0abe19e99f6f2546511 100644 --- a/src/gpu/core/TurbulenceModels/TurbulenceModelFactory.cpp +++ b/src/gpu/core/TurbulenceModels/TurbulenceModelFactory.cpp @@ -26,8 +26,6 @@ // You should have received a copy of the GNU General Public License along // with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. // -//! \file TurbulentViscosityFactory.cpp -//! \ingroup TurbulentViscosity //! \author Henrik Asmuth //======================================================================================= @@ -63,31 +61,29 @@ void TurbulenceModelFactory::setModelConstant(real modelConstant) para->setSGSConstant(modelConstant); } -void TurbulenceModelFactory::readConfigFile(const vf::basics::ConfigurationFile &configData) +void TurbulenceModelFactory::readConfigFile(const vf::basics::ConfigurationFile& configData) { - if (configData.contains("TurbulenceModel")) - { + if (configData.contains("TurbulenceModel")) { std::string config = configData.getValue<std::string>("TurbulenceModel"); - - if (config == "Smagorinsky") this->setTurbulenceModel( vf::lbm::TurbulenceModel::Smagorinsky ); - else if (config == "AMD") this->setTurbulenceModel( vf::lbm::TurbulenceModel::AMD ); - else if (config == "QR" ) this->setTurbulenceModel( vf::lbm::TurbulenceModel::QR ); - else if (config == "None") this->setTurbulenceModel( vf::lbm::TurbulenceModel::None ); - else std::runtime_error("TurbulenceModelFactory: Invalid turbulence model!"); + + if (config == "Smagorinsky") this->setTurbulenceModel( vf::lbm::TurbulenceModel::Smagorinsky ); + else if (config == "AMD") this->setTurbulenceModel( vf::lbm::TurbulenceModel::AMD ); + else if (config == "QR" ) this->setTurbulenceModel( vf::lbm::TurbulenceModel::QR ); + else if (config == "None") this->setTurbulenceModel( vf::lbm::TurbulenceModel::None ); + else std::runtime_error("TurbulenceModelFactory: Invalid turbulence model!"); VF_LOG_INFO("Turbulence model: {}", config); } - if (configData.contains("SGSconstant")) - { + if (configData.contains("SGSconstant")) { para->setSGSConstant(configData.getValue<real>("SGSconstant")); - - VF_LOG_INFO("SGS constant: {}", para->getSGSConstant() ); + VF_LOG_INFO("SGS constant: {}", para->getSGSConstant()); } } void TurbulenceModelFactory::runTurbulenceModelKernel(const int level) const { - if(this->turbulenceModelKernel) this->turbulenceModelKernel(para.get(), level); + if (this->turbulenceModelKernel) + this->turbulenceModelKernel(para.get(), level); } diff --git a/src/gpu/core/TurbulenceModels/TurbulenceModelFactory.h b/src/gpu/core/TurbulenceModels/TurbulenceModelFactory.h index 57a38adab103640c5e00a56734f803a136a0b186..41c5d113271efffcdda7cdd0ca4b9a410ee7910b 100644 --- a/src/gpu/core/TurbulenceModels/TurbulenceModelFactory.h +++ b/src/gpu/core/TurbulenceModels/TurbulenceModelFactory.h @@ -26,8 +26,6 @@ // You should have received a copy of the GNU General Public License along // with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. // -//! \file TurbulentViscosityFactory.h -//! \ingroup TurbulentViscosity //! \author Henrik Asmuth //======================================================================================= #ifndef TurbulenceModelFactory_H @@ -35,9 +33,9 @@ #include <functional> #include <map> +#include <memory> #include <string> #include <variant> -#include <memory> #include "Calculation/Calculation.h" diff --git a/src/gpu/core/Utilities/FindNeighbors.h b/src/gpu/core/Utilities/FindNeighbors.h index 0e0a9b5691b03a567821f684c40fb1a20bf2d232..161340eb093cf0e71cfa84f94a1d77ee3b61ab81 100644 --- a/src/gpu/core/Utilities/FindNeighbors.h +++ b/src/gpu/core/Utilities/FindNeighbors.h @@ -1,10 +1,41 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Martin Schoenherr +//======================================================================================= #ifndef FIND_NEIGHBORS_H #define FIND_NEIGHBORS_H #include <map> +#include <lbm/constants/D3Q27.h> + #include "Parameter/Parameter.h" -#include "lbm/constants/D3Q27.h" using namespace vf::lbm::dir; diff --git a/src/gpu/core/Utilities/KernelUtilitiesTests.cpp b/src/gpu/core/Utilities/KernelUtilitiesTests.cpp index 24c690ba4dfaef64665b24ab35a8211b7bd8f52d..9c03d00d7089ccc30fed4e4d9bc63b459de23cd8 100644 --- a/src/gpu/core/Utilities/KernelUtilitiesTests.cpp +++ b/src/gpu/core/Utilities/KernelUtilitiesTests.cpp @@ -1,3 +1,33 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Martin Schoenherr +//======================================================================================= #include <gmock/gmock.h> #include <basics/tests/testUtilities.h> diff --git a/src/gpu/core/Utilities/RunCollision.cuh b/src/gpu/core/Utilities/RunCollision.cuh index 8a863ab956f787e2ea76fac2df6a3a40f54c68cf..ee89a8746acf11ca20f4613aa731a8dd8d415301 100644 --- a/src/gpu/core/Utilities/RunCollision.cuh +++ b/src/gpu/core/Utilities/RunCollision.cuh @@ -1,3 +1,33 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Martin Schoenherr +//======================================================================================= #ifndef GPU_RUNCOLLISIONKERNEL_CUH #define GPU_RUNCOLLISIONKERNEL_CUH diff --git a/src/gpu/core/Utilities/ScalingUtilities.h b/src/gpu/core/Utilities/ScalingUtilities.h index 5b9c2630551f95e34c2141f7be77949df7f6b6be..647cd9380846e5838b7f96e57230bac83bc39923 100644 --- a/src/gpu/core/Utilities/ScalingUtilities.h +++ b/src/gpu/core/Utilities/ScalingUtilities.h @@ -26,8 +26,6 @@ // You should have received a copy of the GNU General Public License along // with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. // -//! \file ScalingUtilities.h -//! \ingroup LBM/GPUHelperFunctions //! \author Martin Schoenherr, Anna Wellmann //======================================================================================= #ifndef SCALING_HELPER_FUNCTIONS_H diff --git a/src/gpu/core/Utilities/testUtilitiesGPU.h b/src/gpu/core/Utilities/testUtilitiesGPU.h index 884c33fad875f80569ecbbdba6d05cbe0c0c6ba7..7655421dbf716ee7bcc39d0ebdadfdd76660a5bb 100644 --- a/src/gpu/core/Utilities/testUtilitiesGPU.h +++ b/src/gpu/core/Utilities/testUtilitiesGPU.h @@ -1,4 +1,34 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Martin Schoenherr +//======================================================================================= #ifndef TESTUTILITIESGPU_H #define TESTUTILITIESGPU_H diff --git a/src/gpu/cuda_helper/CMakeLists.txt b/src/gpu/cuda_helper/CMakeLists.txt index 1e73721a8be5f98923f88537b41d86147284c8fd..7ddc62b184bca564a4a0338507bea7354cbe9b15 100644 --- a/src/gpu/cuda_helper/CMakeLists.txt +++ b/src/gpu/cuda_helper/CMakeLists.txt @@ -1,3 +1,33 @@ +#======================================================================================= +# ____ ____ __ ______ __________ __ __ __ __ +# \ \ | | | | | _ \ |___ ___| | | | | / \ | | +# \ \ | | | | | |_) | | | | | | | / \ | | +# \ \ | | | | | _ / | | | | | | / /\ \ | | +# \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +# \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +# \ \ | | ________________________________________________________________ +# \ \ | | | ______________________________________________________________| +# \ \| | | | __ __ __ __ ______ _______ +# \ | | |_____ | | | | | | | | | _ \ / _____) +# \ | | _____| | | | | | | | | | | \ \ \_______ +# \ | | | | |_____ | \_/ | | | | |_/ / _____ | +# \ _____| |__| |________| \_______/ |__| |______/ (_______/ +# +# This file is part of VirtualFluids. VirtualFluids is free software: you can +# redistribute it and/or modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation, either version 3 of +# the License, or (at your option) any later version. +# +# VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License along +# with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +# +#! \author Soeren Peters +#======================================================================================= project(cuda LANGUAGES CUDA CXX) vf_add_library(PUBLIC_LINK logger PRIVATE_LINK project_options project_warnings) diff --git a/src/gpu/cuda_helper/CudaGrid.cpp b/src/gpu/cuda_helper/CudaGrid.cpp index 10e36dd98efa2a1a1d4b11ec00f7df7e60a6bd46..5c9487dc126e3e69f98ad71d3f30b59c20e53505 100644 --- a/src/gpu/cuda_helper/CudaGrid.cpp +++ b/src/gpu/cuda_helper/CudaGrid.cpp @@ -1,3 +1,33 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Soeren Peters +//======================================================================================= #include "CudaGrid.h" #include <logger/Logger.h> @@ -14,7 +44,7 @@ void CudaGrid::print() const VF_LOG_INFO("blocks: ({},{},{}), threads: ({},{},{})", grid.x, grid.y, grid.z, threads.x, threads.y, threads.z); } -dim3 getCudaGrid(const unsigned int numberOfThreads, const unsigned int numberOfEntities) +dim3 getCudaGrid(unsigned int numberOfThreads, unsigned int numberOfEntities) { unsigned int Grid = (numberOfEntities / numberOfThreads) + 1; unsigned int Grid1, Grid2; diff --git a/src/gpu/cuda_helper/CudaGrid.h b/src/gpu/cuda_helper/CudaGrid.h index 6b60a4c9d05d5fdfa9c586e454d20123c0021043..9e2d8bd46b08b7b4aeaf104da5886abcfb814d0b 100644 --- a/src/gpu/cuda_helper/CudaGrid.h +++ b/src/gpu/cuda_helper/CudaGrid.h @@ -1,7 +1,36 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Soeren Peters +//======================================================================================= #ifndef CUDA_GRID_H #define CUDA_GRID_H - #include <cuda_runtime.h> namespace vf::cuda @@ -18,7 +47,7 @@ struct CudaGrid void print() const; }; -dim3 getCudaGrid(const unsigned int numberOfThreads, const unsigned int numberOfEntities); +dim3 getCudaGrid(unsigned int numberOfThreads, unsigned int numberOfEntities); } // namespace vf::cuda diff --git a/src/gpu/cuda_helper/CudaTimer.cpp b/src/gpu/cuda_helper/CudaTimer.cpp index 36f87070bc837a62788d1e959fa4b2277a163b04..ab7f3a589d46a884b6b24ac8779c12969ddb0a0e 100644 --- a/src/gpu/cuda_helper/CudaTimer.cpp +++ b/src/gpu/cuda_helper/CudaTimer.cpp @@ -1,3 +1,33 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Soeren Peters +//======================================================================================= #include "CudaTimer.h" namespace vf::cuda diff --git a/src/gpu/cuda_helper/CudaTimer.h b/src/gpu/cuda_helper/CudaTimer.h index 51193c2f73959e31dab8661a952756f2d0882e06..8a0ee566247f3a98a22505a171c494fee0a459f4 100644 --- a/src/gpu/cuda_helper/CudaTimer.h +++ b/src/gpu/cuda_helper/CudaTimer.h @@ -1,7 +1,36 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Soeren Peters +//======================================================================================= #ifndef CUDA_CudaTimer_H #define CUDA_CudaTimer_H - #include <cuda_runtime.h> #include <helper_functions.h> #include <helper_cuda.h> diff --git a/src/gpu/cuda_helper/DeviceInfo.cpp b/src/gpu/cuda_helper/DeviceInfo.cpp index 81fea1cf21418ef98217293985f8c1101f8635be..8e416532dee9bd6818dcdc3830f7077f9f31c996 100644 --- a/src/gpu/cuda_helper/DeviceInfo.cpp +++ b/src/gpu/cuda_helper/DeviceInfo.cpp @@ -1,7 +1,37 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Soeren Peters +//======================================================================================= #include "DeviceInfo.h" -#include <stdio.h> -#include <stdlib.h> +#include <cstdio> +#include <cstdlib> #include <cuda_runtime.h> @@ -120,4 +150,4 @@ void printCudaInformation(int deviceId) printf("Free: %zu MB, Total: %zu MB\n", free / 1000 / 1000, total / 1000 / 1000); } -} \ No newline at end of file +} // namespace vf::cuda diff --git a/src/gpu/cuda_helper/DeviceInfo.h b/src/gpu/cuda_helper/DeviceInfo.h index 9a34824f38ecf5a7db035e87826b732325fdfddd..37b501fd9556813007e8ccf385e4cbcbdf42445c 100644 --- a/src/gpu/cuda_helper/DeviceInfo.h +++ b/src/gpu/cuda_helper/DeviceInfo.h @@ -1,3 +1,33 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Soeren Peters +//======================================================================================= #ifndef CUDA_DEVICEINFO_H #define CUDA_DEVICEINFO_H @@ -8,6 +38,6 @@ void verifyAndSetDevice(int deviceId); void printCudaInformation(int deviceId); -} +} // namespace vf::cuda #endif diff --git a/src/lbm/CMakeLists.txt b/src/lbm/CMakeLists.txt index 84deceb01d7e68326958e8ea20a830517388106a..2840757c7a2144f21272f40ede8652181fba55e5 100644 --- a/src/lbm/CMakeLists.txt +++ b/src/lbm/CMakeLists.txt @@ -1,3 +1,33 @@ +#======================================================================================= +# ____ ____ __ ______ __________ __ __ __ __ +# \ \ | | | | | _ \ |___ ___| | | | | / \ | | +# \ \ | | | | | |_) | | | | | | | / \ | | +# \ \ | | | | | _ / | | | | | | / /\ \ | | +# \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +# \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +# \ \ | | ________________________________________________________________ +# \ \ | | | ______________________________________________________________| +# \ \| | | | __ __ __ __ ______ _______ +# \ | | |_____ | | | | | | | | | _ \ / _____) +# \ | | _____| | | | | | | | | | | \ \ \_______ +# \ | | | | |_____ | \_/ | | | | |_/ / _____ | +# \ _____| |__| |________| \_______/ |__| |______/ (_______/ +# +# This file is part of VirtualFluids. VirtualFluids is free software: you can +# redistribute it and/or modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation, either version 3 of +# the License, or (at your option) any later version. +# +# VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License along +# with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +# +#! \author Soeren Peters +#======================================================================================= vf_add_library(PUBLIC_LINK basics logger PRIVATE_LINK project_warnings project_options) diff --git a/src/lbm/ChimeraTests.cpp b/src/lbm/ChimeraTests.cpp index 4e0370c60a5d2ead900b562390acec0646cf8400..74113bbe1c6bc17f0b444a43a9599351478ac2ba 100644 --- a/src/lbm/ChimeraTests.cpp +++ b/src/lbm/ChimeraTests.cpp @@ -1,3 +1,33 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Soeren Peters +//======================================================================================= #include <gmock/gmock.h> #include "ChimeraTransformation.h" diff --git a/src/lbm/ChimeraTransformation.h b/src/lbm/ChimeraTransformation.h index cf59d32a6b599e4a6640b51b4a0f03669fb62bb5..d132304316b1f6dd3309e350cbca5d49076c3796 100644 --- a/src/lbm/ChimeraTransformation.h +++ b/src/lbm/ChimeraTransformation.h @@ -1,3 +1,33 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Soeren Peters +//======================================================================================= #ifndef LBM_CHIMERA_H #define LBM_CHIMERA_H diff --git a/src/lbm/MacroscopicQuantities.h b/src/lbm/MacroscopicQuantities.h index a81de110dcd7f53264546209a8ea0f3c0333aef9..7ee572e45cb9ae60956e4c06d71c47b544d528a5 100644 --- a/src/lbm/MacroscopicQuantities.h +++ b/src/lbm/MacroscopicQuantities.h @@ -1,3 +1,33 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Soeren Peters +//======================================================================================= #ifndef LBM_CALCMAC_H #define LBM_CALCMAC_H @@ -13,7 +43,6 @@ #include "constants/D3Q27.h" - namespace vf::lbm { diff --git a/src/lbm/MacroscopicQuantitiesTests.cpp b/src/lbm/MacroscopicQuantitiesTests.cpp index 246c3370e48225c2b31b6d89d0bc6314e18975da..6d1ea97e2d23b96dcaa730ae0ccefa10fd6bbb97 100644 --- a/src/lbm/MacroscopicQuantitiesTests.cpp +++ b/src/lbm/MacroscopicQuantitiesTests.cpp @@ -1,4 +1,35 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Soeren Peters +//======================================================================================= #include <gmock/gmock.h> + #include <array> #include "MacroscopicQuantities.h" diff --git a/src/lbm/collision/CollisionParameter.h b/src/lbm/collision/CollisionParameter.h index 1f358f32f5bcf6116ade856442e2a6c1fe1627a1..504d970fa1f33cb9194fe4305fa29188f5768fcc 100644 --- a/src/lbm/collision/CollisionParameter.h +++ b/src/lbm/collision/CollisionParameter.h @@ -1,3 +1,33 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Soeren Peters +//======================================================================================= #ifndef LBM_KERNEL_PARAMETER_H #define LBM_KERNEL_PARAMETER_H diff --git a/src/lbm/collision/K17CompressibleNavierStokes.h b/src/lbm/collision/K17CompressibleNavierStokes.h index 5c437311bad80aee70c01199fd5cc8acdf040df1..dac1359ae5dd01b6f6f0baa1392c2bb8a1b85d1b 100644 --- a/src/lbm/collision/K17CompressibleNavierStokes.h +++ b/src/lbm/collision/K17CompressibleNavierStokes.h @@ -26,7 +26,6 @@ // You should have received a copy of the GNU General Public License along // with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. // -//! \file CumlantK17_Device.cu //! \author Anna Wellmann, Martin Schönherr, Henry Korb, Henrik Asmuth //! \date 05/12/2022 //! \brief Kernel for CumulantK17 including different turbulence models and options for local body forces and writing diff --git a/src/lbm/collision/TurbulentViscosity.h b/src/lbm/collision/TurbulentViscosity.h index 13962b37f3b795ec9abee220af5e38c2e5106b2b..ad878e0645e822f2a9c2e5908b59bb624afb8bab 100644 --- a/src/lbm/collision/TurbulentViscosity.h +++ b/src/lbm/collision/TurbulentViscosity.h @@ -1,33 +1,31 @@ //======================================================================================= -// ____ ____ __ ______ __________ __ __ __ __ -// \ \ | | | | | _ \ |___ ___| | | | | / \ | | -// \ \ | | | | | |_) | | | | | | | / \ | | -// \ \ | | | | | _ / | | | | | | / /\ \ | | -// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ -// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| -// \ \ | | ________________________________________________________________ -// \ \ | | | ______________________________________________________________| -// \ \| | | | __ __ __ __ ______ _______ -// \ | | |_____ | | | | | | | | | _ \ / _____) -// \ | | _____| | | | | | | | | | | \ \ \_______ +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ // \ | | | | |_____ | \_/ | | | | |_/ / _____ | -// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ // -// This file is part of VirtualFluids. VirtualFluids is free software: you can +// This file is part of VirtualFluids. VirtualFluids is free software: you can // redistribute it and/or modify it under the terms of the GNU General Public -// License as published by the Free Software Foundation, either version 3 of +// License as published by the Free Software Foundation, either version 3 of // the License, or (at your option) any later version. -// -// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT -// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License // for more details. -// +// // You should have received a copy of the GNU General Public License along // with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. // -//! \file TurbulentViscosity.h -//! \ingroup GPU //! \author Henry Korb, Henrik Asmuth //====================================================================================== diff --git a/src/lbm/constants/D3Q27.h b/src/lbm/constants/D3Q27.h index cd40c42786ab760e1b7c77dc229a5e40d7aebc84..a06a3da88d3342ee45bf33f05d98630a597580be 100644 --- a/src/lbm/constants/D3Q27.h +++ b/src/lbm/constants/D3Q27.h @@ -1,3 +1,32 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//======================================================================================= #ifndef LBM_D3Q27_H #define LBM_D3Q27_H diff --git a/src/lbm/dummy.cpp b/src/lbm/dummy.cpp index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..91ea7702e8fffd2fe6b0fb021bb0bb7fcac6f6e5 100644 --- a/src/lbm/dummy.cpp +++ b/src/lbm/dummy.cpp @@ -0,0 +1,30 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Soeren Peters +//======================================================================================= \ No newline at end of file diff --git a/src/lbm/refinement/InterpolationCF.h b/src/lbm/refinement/InterpolationCF.h index 49f91fdc6a7b5c8760b99a651b8affbf39d85172..2177bdd361efc4323592d5323f864190714be5af 100644 --- a/src/lbm/refinement/InterpolationCF.h +++ b/src/lbm/refinement/InterpolationCF.h @@ -1,28 +1,28 @@ //======================================================================================= -// ____ ____ __ ______ __________ __ __ __ __ -// \ \ | | | | | _ \ |___ ___| | | | | / \ | | -// \ \ | | | | | |_) | | | | | | | / \ | | -// \ \ | | | | | _ / | | | | | | / /\ \ | | -// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ -// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| -// \ \ | | ________________________________________________________________ -// \ \ | | | ______________________________________________________________| -// \ \| | | | __ __ __ __ ______ _______ -// \ | | |_____ | | | | | | | | | _ \ / _____) -// \ | | _____| | | | | | | | | | | \ \ \_______ +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ // \ | | | | |_____ | \_/ | | | | |_/ / _____ | -// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ // -// This file is part of VirtualFluids. VirtualFluids is free software: you can +// This file is part of VirtualFluids. VirtualFluids is free software: you can // redistribute it and/or modify it under the terms of the GNU General Public -// License as published by the Free Software Foundation, either version 3 of +// License as published by the Free Software Foundation, either version 3 of // the License, or (at your option) any later version. -// -// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT -// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License // for more details. -// +// // You should have received a copy of the GNU General Public License along // with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. // diff --git a/src/lbm/refinement/InterpolationFC.h b/src/lbm/refinement/InterpolationFC.h index 4f27978df257b641514c8486f39769eaef71fa3d..7c1140fe154ade412ae9ccd755a4305c74398e0b 100644 --- a/src/lbm/refinement/InterpolationFC.h +++ b/src/lbm/refinement/InterpolationFC.h @@ -1,28 +1,28 @@ //======================================================================================= -// ____ ____ __ ______ __________ __ __ __ __ -// \ \ | | | | | _ \ |___ ___| | | | | / \ | | -// \ \ | | | | | |_) | | | | | | | / \ | | -// \ \ | | | | | _ / | | | | | | / /\ \ | | -// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ -// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| -// \ \ | | ________________________________________________________________ -// \ \ | | | ______________________________________________________________| -// \ \| | | | __ __ __ __ ______ _______ -// \ | | |_____ | | | | | | | | | _ \ / _____) -// \ | | _____| | | | | | | | | | | \ \ \_______ +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ // \ | | | | |_____ | \_/ | | | | |_/ / _____ | -// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ // -// This file is part of VirtualFluids. VirtualFluids is free software: you can +// This file is part of VirtualFluids. VirtualFluids is free software: you can // redistribute it and/or modify it under the terms of the GNU General Public -// License as published by the Free Software Foundation, either version 3 of +// License as published by the Free Software Foundation, either version 3 of // the License, or (at your option) any later version. -// -// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT -// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License // for more details. -// +// // You should have received a copy of the GNU General Public License along // with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. // diff --git a/src/logger/CMakeLists.txt b/src/logger/CMakeLists.txt index 7d12f1a14fc06eb18b831310ffd85ac58fcff537..73f87b7937b6a2d7ae7581b2b8dc06596332e31a 100644 --- a/src/logger/CMakeLists.txt +++ b/src/logger/CMakeLists.txt @@ -1,4 +1,33 @@ - +#======================================================================================= +# ____ ____ __ ______ __________ __ __ __ __ +# \ \ | | | | | _ \ |___ ___| | | | | / \ | | +# \ \ | | | | | |_) | | | | | | | / \ | | +# \ \ | | | | | _ / | | | | | | / /\ \ | | +# \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +# \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +# \ \ | | ________________________________________________________________ +# \ \ | | | ______________________________________________________________| +# \ \| | | | __ __ __ __ ______ _______ +# \ | | |_____ | | | | | | | | | _ \ / _____) +# \ | | _____| | | | | | | | | | | \ \ \_______ +# \ | | | | |_____ | \_/ | | | | |_/ / _____ | +# \ _____| |__| |________| \_______/ |__| |______/ (_______/ +# +# This file is part of VirtualFluids. VirtualFluids is free software: you can +# redistribute it and/or modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation, either version 3 of +# the License, or (at your option) any later version. +# +# VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License along +# with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +# +#! \author Soeren Peters +#======================================================================================= vf_add_library(NAME logger PUBLIC_LINK spdlog PRIVATE_LINK project_warnings) if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") diff --git a/src/logger/Logger.cpp b/src/logger/Logger.cpp index d6b79e110c0827a8e91640ad77d4cb6675f23ce4..4f10c75eb4e6e6a2b7999e99180c1f2fa3c553a6 100644 --- a/src/logger/Logger.cpp +++ b/src/logger/Logger.cpp @@ -1,54 +1,83 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Soeren Peters +//======================================================================================= #include "Logger.h" -#include <spdlog/spdlog.h> -#include <spdlog/sinks/stdout_color_sinks.h> -#include <spdlog/sinks/daily_file_sink.h> #include <spdlog/sinks/basic_file_sink.h> +#include <spdlog/sinks/daily_file_sink.h> +#include <spdlog/sinks/stdout_color_sinks.h> +#include <spdlog/spdlog.h> namespace vf::logging { - std::string Logger::logPath = {"logs/"}; - - void Logger::initializeLogger() - { - updateDefaultLogger(); - - // setting default log level to trace - // levels: trace < debug < info < warn < error < critical - spdlog::set_level(spdlog::level::trace); +std::string Logger::logPath = { "logs/" }; - // setting the log pattern - // formatting is documented here: https://github.com/gabime/spdlog/wiki/3.-Custom-formatting - spdlog::set_pattern("[%Y-%m-%d %H:%M:%S.%e] [%^%l%$] %v"); - - // according to the flush policy https://github.com/gabime/spdlog/wiki/7.-Flush-policy - spdlog::flush_on(spdlog::level::info); - } +void Logger::initializeLogger() +{ + updateDefaultLogger(); + // setting default log level to trace + // levels: trace < debug < info < warn < error < critical + spdlog::set_level(spdlog::level::trace); - void Logger::changeLogPath(const std::string& path) - { - logPath = path; + // setting the log pattern + // formatting is documented here: https://github.com/gabime/spdlog/wiki/3.-Custom-formatting + spdlog::set_pattern("[%Y-%m-%d %H:%M:%S.%e] [%^%l%$] %v"); - updateDefaultLogger(); - } + // according to the flush policy https://github.com/gabime/spdlog/wiki/7.-Flush-policy + spdlog::flush_on(spdlog::level::info); +} +void Logger::changeLogPath(const std::string& path) +{ + logPath = path; - void Logger::updateDefaultLogger() - { - // initialize stdout sink with colored output - auto console_sink = std::make_shared<spdlog::sinks::stdout_color_sink_mt>(); + updateDefaultLogger(); +} - // initialize daily file sink - // files will be written into "logs" folder relative to pwd. A new files is created at 0:00 o'clock. - auto daily_file_sink = std::make_shared<spdlog::sinks::daily_file_sink_mt>(logPath + "daily.txt", 0, 0); +void Logger::updateDefaultLogger() +{ + // initialize stdout sink with colored output + auto console_sink = std::make_shared<spdlog::sinks::stdout_color_sink_mt>(); - // initialize last run file sink - auto last_run_file_sink = std::make_shared<spdlog::sinks::basic_file_sink_mt>(logPath + "last_run.txt", true); + // initialize daily file sink + // files will be written into "logs" folder relative to pwd. A new files is created at 0:00 o'clock. + auto daily_file_sink = std::make_shared<spdlog::sinks::daily_file_sink_mt>(logPath + "daily.txt", 0, 0); - // creating default logger with console and file sink - spdlog::set_default_logger(std::make_shared<spdlog::logger>("default", spdlog::sinks_init_list({console_sink, daily_file_sink, last_run_file_sink}))); - } + // initialize last run file sink + auto last_run_file_sink = std::make_shared<spdlog::sinks::basic_file_sink_mt>(logPath + "last_run.txt", true); + // creating default logger with console and file sink + spdlog::set_default_logger(std::make_shared<spdlog::logger>( + "default", spdlog::sinks_init_list({ console_sink, daily_file_sink, last_run_file_sink }))); } + +} // namespace vf::logging diff --git a/src/logger/Logger.h b/src/logger/Logger.h index 01c84b4315c668d318d0d71432731f378d602e91..be245fc3745ccebb1fe67ef215d53950ee95856b 100644 --- a/src/logger/Logger.h +++ b/src/logger/Logger.h @@ -51,23 +51,23 @@ #define VF_LOG_WARNING(...) spdlog::warn(__VA_ARGS__) #define VF_LOG_CRITICAL(...) spdlog::critical(__VA_ARGS__) - namespace vf::logging { - class Logger - { - public: - // initializing the above named logger - static void initializeLogger(); +class Logger +{ +public: + // initializing the above named logger + static void initializeLogger(); + + // changing the path of the log files + static void changeLogPath(const std::string& path); - // changing the path of the log files - static void changeLogPath(const std::string& path); +private: + static void updateDefaultLogger(); - private: - static void updateDefaultLogger(); + static std::string logPath; +}; - static std::string logPath; - }; -} +} // namespace vf::logging #endif diff --git a/src/parallel/CMakeLists.txt b/src/parallel/CMakeLists.txt index 659e2987d0717e2de892f0eea43772a8cb775fce..23fb31ee5966b413c19763b6bb10a4742cda1ad5 100644 --- a/src/parallel/CMakeLists.txt +++ b/src/parallel/CMakeLists.txt @@ -1,3 +1,33 @@ +#======================================================================================= +# ____ ____ __ ______ __________ __ __ __ __ +# \ \ | | | | | _ \ |___ ___| | | | | / \ | | +# \ \ | | | | | |_) | | | | | | | / \ | | +# \ \ | | | | | _ / | | | | | | / /\ \ | | +# \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +# \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +# \ \ | | ________________________________________________________________ +# \ \ | | | ______________________________________________________________| +# \ \| | | | __ __ __ __ ______ _______ +# \ | | |_____ | | | | | | | | | _ \ / _____) +# \ | | _____| | | | | | | | | | | \ \ \_______ +# \ | | | | |_____ | \_/ | | | | |_/ / _____ | +# \ _____| |__| |________| \_______/ |__| |______/ (_______/ +# +# This file is part of VirtualFluids. VirtualFluids is free software: you can +# redistribute it and/or modify it under the terms of the GNU General Public +# License as published by the Free Software Foundation, either version 3 of +# the License, or (at your option) any later version. +# +# VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License along +# with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +# +#! \author Soeren Peters +#======================================================================================= vf_add_library(PUBLIC_LINK logger basics PRIVATE_LINK project_warnings project_options) diff --git a/src/parallel/Communicator.cpp b/src/parallel/Communicator.cpp index b7708cb5ab79ce4acee9c76b6ba26e001b655c17..4c026dabd1d4003172ebc8f2833e131b165188fe 100644 --- a/src/parallel/Communicator.cpp +++ b/src/parallel/Communicator.cpp @@ -26,8 +26,6 @@ // You should have received a copy of the GNU General Public License along // with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. // -//! \file Communicator.cpp -//! \ingroup Parallel //! \author Konstantin Kutscher //======================================================================================= diff --git a/src/parallel/Communicator.h b/src/parallel/Communicator.h index 815f5540039d8ed905b0d928d663f6dfba60b95a..ac844672bb21897e3c9e372ed318d006805c4ce8 100644 --- a/src/parallel/Communicator.h +++ b/src/parallel/Communicator.h @@ -26,8 +26,6 @@ // You should have received a copy of the GNU General Public License along // with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. // -//! \file Communicator.h -//! \ingroup Parallel //! \author Konstantin Kutscher //======================================================================================= diff --git a/src/parallel/MPICommunicator.cpp b/src/parallel/MPICommunicator.cpp index 4aff91ea2b746ff241ad54583d4e6c0d13ec2066..a06ed64221f35ba50fd523e4940181afcb089ed5 100644 --- a/src/parallel/MPICommunicator.cpp +++ b/src/parallel/MPICommunicator.cpp @@ -1,3 +1,33 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Konstantin Kutscher +//======================================================================================= #if defined VF_MPI #if defined (_WIN32) || defined (_WIN64) #include <Winsock2.h> diff --git a/src/parallel/MPICommunicator.h b/src/parallel/MPICommunicator.h index 66e00893473b4861f2af21e39d1e44c64348d7e8..032871a8971572432fbe8978b2e873d364a5e75e 100644 --- a/src/parallel/MPICommunicator.h +++ b/src/parallel/MPICommunicator.h @@ -1,3 +1,33 @@ +//======================================================================================= +// ____ ____ __ ______ __________ __ __ __ __ +// \ \ | | | | | _ \ |___ ___| | | | | / \ | | +// \ \ | | | | | |_) | | | | | | | / \ | | +// \ \ | | | | | _ / | | | | | | / /\ \ | | +// \ \ | | | | | | \ \ | | | \__/ | / ____ \ | |____ +// \ \ | | |__| |__| \__\ |__| \________/ /__/ \__\ |_______| +// \ \ | | ________________________________________________________________ +// \ \ | | | ______________________________________________________________| +// \ \| | | | __ __ __ __ ______ _______ +// \ | | |_____ | | | | | | | | | _ \ / _____) +// \ | | _____| | | | | | | | | | | \ \ \_______ +// \ | | | | |_____ | \_/ | | | | |_/ / _____ | +// \ _____| |__| |________| \_______/ |__| |______/ (_______/ +// +// This file is part of VirtualFluids. VirtualFluids is free software: you can +// redistribute it and/or modify it under the terms of the GNU General Public +// License as published by the Free Software Foundation, either version 3 of +// the License, or (at your option) any later version. +// +// VirtualFluids is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +// for more details. +// +// You should have received a copy of the GNU General Public License along +// with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. +// +//! \author Konstantin Kutscher +//======================================================================================= #if defined VF_MPI #ifndef MPI_MPICOMMUNICATOR_H diff --git a/src/parallel/NullCommunicator.cpp b/src/parallel/NullCommunicator.cpp index 3bac9fe2c80d63871476e9741ae5599f4a977d07..d086389e1776a6f05a84b8cccb1e97273cb1e1d9 100644 --- a/src/parallel/NullCommunicator.cpp +++ b/src/parallel/NullCommunicator.cpp @@ -26,8 +26,6 @@ // You should have received a copy of the GNU General Public License along // with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. // -//! \file NullCommunicator.cpp -//! \ingroup Parallel //! \author Konstantin Kutscher //======================================================================================= diff --git a/src/parallel/NullCommunicator.h b/src/parallel/NullCommunicator.h index dc49fb3b7fae0b277e960d8f04c54abfc0731a13..f5b45ec604642a07bb42375f13b001209096326c 100644 --- a/src/parallel/NullCommunicator.h +++ b/src/parallel/NullCommunicator.h @@ -26,8 +26,6 @@ // You should have received a copy of the GNU General Public License along // with VirtualFluids (see COPYING.txt). If not, see <http://www.gnu.org/licenses/>. // -//! \file NullCommunicator.h -//! \ingroup Parallel //! \author Konstantin Kutscher //=======================================================================================