From 5b9b865b088cc44041f28fa9df607dd8d7e54832 Mon Sep 17 00:00:00 2001
From: Hamidreza Norouzi <hamid.r.norouzi@gmail.com>
Date: Mon, 29 Jan 2024 07:58:19 -0800
Subject: [PATCH] solver iterateSphereParticles is added for testing (without
 particle insertion)

---
 CMakeLists.txt                                |  2 +-
 solvers/CMakeLists.txt                        |  6 +-
 solvers/iterateSphereParticles/CMakeLists.txt |  7 ++
 .../createDEMComponents.hpp                   | 25 ++++++
 .../iterateSphereParticles.cpp                | 89 +++++++++++++++++++
 5 files changed, 125 insertions(+), 4 deletions(-)
 create mode 100644 solvers/iterateSphereParticles/CMakeLists.txt
 create mode 100755 solvers/iterateSphereParticles/createDEMComponents.hpp
 create mode 100755 solvers/iterateSphereParticles/iterateSphereParticles.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8cd85bfa..927c1ec2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,7 +71,7 @@ include_directories(src/setHelpers src/demComponent "${PROJECT_BINARY_DIR}")
 
 add_subdirectory(src)
 
-#add_subdirectory(solvers)
+add_subdirectory(solvers)
 
 add_subdirectory(utilities)
 
diff --git a/solvers/CMakeLists.txt b/solvers/CMakeLists.txt
index 45bc40aa..4cd77431 100644
--- a/solvers/CMakeLists.txt
+++ b/solvers/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 
-#add_subdirectory(iterateSphereParticles)
+add_subdirectory(iterateSphereParticles)
 
-add_subdirectory(iterateGeometry)
+#add_subdirectory(iterateGeometry)
 
-add_subdirectory(sphereGranFlow)
+#add_subdirectory(sphereGranFlow)
diff --git a/solvers/iterateSphereParticles/CMakeLists.txt b/solvers/iterateSphereParticles/CMakeLists.txt
new file mode 100644
index 00000000..59700110
--- /dev/null
+++ b/solvers/iterateSphereParticles/CMakeLists.txt
@@ -0,0 +1,7 @@
+
+set(source_files
+iterateSphereParticles.cpp
+)
+set(link_lib  Particles)
+
+pFlow_make_executable_install(iterateSphereParticles source_files link_lib)
diff --git a/solvers/iterateSphereParticles/createDEMComponents.hpp b/solvers/iterateSphereParticles/createDEMComponents.hpp
new file mode 100755
index 00000000..85cb798a
--- /dev/null
+++ b/solvers/iterateSphereParticles/createDEMComponents.hpp
@@ -0,0 +1,25 @@
+/*------------------------------- 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 . . ."<<END_REPORT;
+sphereParticles sphParticles(Control, proprties);
+
+WARNING<<"Particle insertion has not been set yet!"<<END_WARNING;
diff --git a/solvers/iterateSphereParticles/iterateSphereParticles.cpp b/solvers/iterateSphereParticles/iterateSphereParticles.cpp
new file mode 100755
index 00000000..fee9c6a5
--- /dev/null
+++ b/solvers/iterateSphereParticles/iterateSphereParticles.cpp
@@ -0,0 +1,89 @@
+
+/*------------------------------- 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.
+
+-----------------------------------------------------------------------------*/
+/** 
+ * \file sphereGranFlow.cpp
+ * \brief sphereGranFlow solver 
+ *
+ * This solver simulate granular flow of cohesion-less, spherical particles. 
+ * Particle insertion can be activated in the solver to gradually insert 
+ * particles into the simulation. Geometry can be defined generally with 
+ * built-in features of the code or through ASCII stl files or a combination
+ * of both. For more information refer to [tutorials/sphereGranFlow/]
+ * (https://github.com/PhasicFlow/phasicFlow/tree/main/tutorials/sphereGranFlow) folder.
+ */
+
+#include "vocabs.hpp"
+#include "property.hpp"
+#include "sphereParticles.hpp"
+#include "systemControl.hpp"
+#include "commandLine.hpp"
+
+using namespace pFlow;
+
+/**
+ * DEM solver for simulating granular flow of cohesion-less particles.
+ *
+ * In the root case directory just simply enter the following command to 
+ * run the simulation. For command line options use flag -h. 
+ */
+int main( int argc, char* argv[])
+{
+
+commandLine cmds(
+		"sphereGranFlow",
+		"DEM solver for non-cohesive spherical particles with particle insertion "
+		"mechanism and moving geometry");
+
+bool isCoupling = false;
+
+if(!cmds.parse(argc, argv)) return 0;
+
+// this should be palced in each main 
+processors::initProcessors(argc, argv);
+initialize_pFlowProcessors();
+#include "initialize_Control.hpp"
+	
+	#include "setProperty.hpp"
+
+	#include "createDEMComponents.hpp"
+	
+	REPORT(0)<<"\nStart of time loop . . .\n"<<END_REPORT;
+
+	do 
+	{
+		
+		sphParticles.beforeIteration();
+	
+		sphParticles.iterate();
+
+		sphParticles.afterIteration();		
+
+	}while(Control++);
+
+	REPORT(0)<<"\nEnd of time loop.\n"<<END_REPORT;
+
+// this should be palced in each main 
+#include "finalize.hpp"
+processors::finalizeProcessors();
+
+
+}	
+