From fb3fcf5945b611d2aa623b86b6cfc11ace9b554f Mon Sep 17 00:00:00 2001 From: hamidrezanorouzi Date: Mon, 5 Sep 2022 10:31:53 +0430 Subject: [PATCH] sphereGranFlow added --- CMakeLists.txt | 2 +- solvers/CMakeLists.txt | 7 ++ solvers/sphereGranFlow/CMakeLists.txt | 7 ++ solvers/sphereGranFlow/createDEMComponents.H | 48 +++++++++ solvers/sphereGranFlow/sphereGranFlow.C | 105 +++++++++++++++++++ 5 files changed, 168 insertions(+), 1 deletion(-) create mode 100644 solvers/CMakeLists.txt create mode 100644 solvers/sphereGranFlow/CMakeLists.txt create mode 100755 solvers/sphereGranFlow/createDEMComponents.H create mode 100755 solvers/sphereGranFlow/sphereGranFlow.C diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f9af446..e34b2463 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,7 +70,7 @@ add_subdirectory(${Kokkos_Source_DIR} ${phasicFlow_BINARY_DIR}/kokkos) add_subdirectory(src) -#add_subdirectory(solvers) +add_subdirectory(solvers) #add_subdirectory(utilities) diff --git a/solvers/CMakeLists.txt b/solvers/CMakeLists.txt new file mode 100644 index 00000000..62746b83 --- /dev/null +++ b/solvers/CMakeLists.txt @@ -0,0 +1,7 @@ + + +#add_subdirectory(iterateSphereParticles) + +#add_subdirectory(iterateGeometry) + +add_subdirectory(sphereGranFlow) diff --git a/solvers/sphereGranFlow/CMakeLists.txt b/solvers/sphereGranFlow/CMakeLists.txt new file mode 100644 index 00000000..c008c4e2 --- /dev/null +++ b/solvers/sphereGranFlow/CMakeLists.txt @@ -0,0 +1,7 @@ + +set(source_files +sphereGranFlow.C +) +set(link_lib Kokkos::kokkos phasicFlow Particles Geometry Property Interaction Interaction) + +pFlow_make_executable_install(sphereGranFlow source_files link_lib) diff --git a/solvers/sphereGranFlow/createDEMComponents.H b/solvers/sphereGranFlow/createDEMComponents.H new file mode 100755 index 00000000..eabbd732 --- /dev/null +++ b/solvers/sphereGranFlow/createDEMComponents.H @@ -0,0 +1,48 @@ +/*------------------------------- phasicFlow --------------------------------- + O C enter of + O O E ngineering and + O O M ultiscale modeling of + OOOOOOO F luid flow +------------------------------------------------------------------------------ + Copyright (C): www.cemf.ir + email: hamid.r.norouzi AT gmail.com +------------------------------------------------------------------------------ +Licence: + This file is part of phasicFlow code. It is a free software for simulating + granular and multiphase flows. You can redistribute it and/or modify it under + the terms of GNU General Public License v3 or any other later versions. + + phasicFlow is distributed to help others in their research in the field of + granular and multiphase flows, but WITHOUT ANY WARRANTY; without even the + implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +-----------------------------------------------------------------------------*/ + +// +Report(0)<<"\nReading sphere particles . . ."<( + objectFile( + insertionFile__, + "", + objectFile::READ_ALWAYS, + objectFile::WRITE_ALWAYS + ), + sphParticles, + sphParticles.shapes() + ); + + + +Report(0)<<"\nCreating interation model for sphere-sphere contact and sphere-wall contact . . ."<