From c0cf200fa897d1b526fd3e43765f71918d9d65f8 Mon Sep 17 00:00:00 2001
From: Hamidreza Norouzi <hamid.r.norouzi@gmail.com>
Date: Mon, 5 Feb 2024 21:28:30 -0800
Subject: [PATCH] iterateGeometry and geometryPhasicFlow refactor

---
 solvers/CMakeLists.txt                        |  2 +-
 solvers/iterateGeometry/iterateGeometry.cpp   | 23 ++++----
 utilities/geometryPhasicFlow/CMakeLists.txt   |  2 +-
 .../geometryPhasicFlow/geometryPhasicFlow.cpp | 53 +++++++++++--------
 4 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/solvers/CMakeLists.txt b/solvers/CMakeLists.txt
index 4cd77431..aa711841 100644
--- a/solvers/CMakeLists.txt
+++ b/solvers/CMakeLists.txt
@@ -2,6 +2,6 @@
 
 add_subdirectory(iterateSphereParticles)
 
-#add_subdirectory(iterateGeometry)
+add_subdirectory(iterateGeometry)
 
 #add_subdirectory(sphereGranFlow)
diff --git a/solvers/iterateGeometry/iterateGeometry.cpp b/solvers/iterateGeometry/iterateGeometry.cpp
index a43212c1..4bf81abd 100755
--- a/solvers/iterateGeometry/iterateGeometry.cpp
+++ b/solvers/iterateGeometry/iterateGeometry.cpp
@@ -28,13 +28,15 @@ Licence:
  * (https://github.com/PhasicFlow/phasicFlow/tree/main/tutorials/iterateGeometry)
  * folder.
  */
- 
-#include "systemControl.hpp"
-#include "geometryMotion.hpp"
-#include "commandLine.hpp"
-#include "readControlDict.hpp"
 
-using pFlow::commandLine;
+#include "vocabs.hpp"
+#include "systemControl.hpp"
+#include "geometry.hpp"
+//#include "geometryMotion.hpp"
+#include "commandLine.hpp"
+//#include "readControlDict.hpp"
+
+using namespace pFlow;
 
 int main( int argc, char* argv[] )
 {
@@ -57,14 +59,15 @@ commandLine cmds(
 #include "initialize_Control.hpp"
 	
 	#include "setProperty.hpp"
-	#include "setSurfaceGeometry.hpp"
+	//#include "setSurfaceGeometry.hpp"
 
-	
-	do
+	WARNING<<"Code should be changed "<<END_WARNING;
+  auto geom = geometry(Control, proprties);
+	/*do
 	{
 		surfGeometry.iterate();
 
-	}while( Control++);
+	}while( Control++);*/
 
 // this should be palced in each main 
 #include "finalize.hpp"
diff --git a/utilities/geometryPhasicFlow/CMakeLists.txt b/utilities/geometryPhasicFlow/CMakeLists.txt
index 11040b23..0700a50b 100644
--- a/utilities/geometryPhasicFlow/CMakeLists.txt
+++ b/utilities/geometryPhasicFlow/CMakeLists.txt
@@ -2,6 +2,6 @@
 set(source_files 
 geometryPhasicFlow.cpp
 )
-set(link_lib phasicFlow Kokkos::kokkos Utilities)
+set(link_lib phasicFlow Kokkos::kokkos Geometry Utilities)
 
 pFlow_make_executable_install(geometryPhasicFlow source_files link_lib)
diff --git a/utilities/geometryPhasicFlow/geometryPhasicFlow.cpp b/utilities/geometryPhasicFlow/geometryPhasicFlow.cpp
index 282de86a..84d10f97 100755
--- a/utilities/geometryPhasicFlow/geometryPhasicFlow.cpp
+++ b/utilities/geometryPhasicFlow/geometryPhasicFlow.cpp
@@ -20,12 +20,10 @@ Licence:
 
 #include "vocabs.hpp"
 #include "systemControl.hpp"
-#include "fileDictionary.hpp"
 #include "Wall.hpp"
+#include "Lists.hpp"
 #include "Vectors.hpp"
-#include "VectorSingles.hpp"
-#include "multiTriSurface.hpp"
-//#include "geometryMotion.hpp"
+#include "geometry.hpp"
 #include "commandLine.hpp"
 //#include "readControlDict.hpp"
 
@@ -52,7 +50,7 @@ int main( int argc, char* argv[] )
 // this should be palced in each main 
 #include "initialize_Control.hpp"
 
-	//#include "setProperty.hpp"
+	#include "setProperty.hpp"
 
 	REPORT(0)<<"\nReading "<<"geometryDict"<<" . . ."<<END_REPORT;
 	auto geometryDict = fileDictionary(
@@ -71,22 +69,25 @@ int main( int argc, char* argv[] )
 	auto wallsDictName = surfacesDict.dictionaryKeywords();
 
 	
-
+	word mSurfaceName = word("geometryPhasicFlow_")+word(triSurfaceFile__);
 	multiTriSurface surface
 	(
 		objectFile
 		(
-			triSurfaceFile__,
+			mSurfaceName,
 			"",
 			objectFile::READ_NEVER,
 			objectFile::WRITE_ALWAYS
 		),
-		&Control.geometry()
+		nullptr
 	);
 	
-	//wordVector materials;
-	//wordVector motion;
-	
+	wordVector materials;
+	wordList materialsList;
+
+	wordVector motion;
+	wordList motionList;
+
 	for(auto& name:wallsDictName)
 	{
 		REPORT(1)<<"Creating wall "<<Green_Text(name)<<" from dictionary "<<surfacesDict.globalName() <<END_REPORT;
@@ -97,19 +98,29 @@ int main( int argc, char* argv[] )
 		realx3x3Vector trinalges(wall.name(), wall.triangles());
 		
 		surface.appendTriSurface(wall.name(), trinalges);
-		/*materials.push_back(wall.materialName());
-		motion.push_back(wall.motionName());*/
+		materials.push_back(wall.materialName());
+		materialsList.push_back(wall.materialName());
+
+		motion.push_back(wall.motionName());
+		motionList.push_back(wall.motionName());
 	}
 
-	output<<surface<<endl;
-	//REPORT(1)<<"Selected wall materials are "<<cyanText(materials)<<'\n'<<endREPORT;
-		
-	/*REPORT(0)<< "\nCreating geometry . . ."<<endREPORT;
-	auto geomPtr = geometry::create(Control, proprties, geometryDict, surface, motion, materials);
-	REPORT(1)<< "geometry type is "<< greenText(geomPtr().typeName())<<endREPORT;
 	
-	REPORT(1)<< "Writing geometry to folder "<< geomPtr().path()<<endREPORT;
-	geomPtr().write();*/
+	REPORT(1)<<"Selected wall materials are "<<Cyan_Text(materialsList)<<'\n'<<END_REPORT;
+	REPORT(1)<<"Selected wall motion components are "<<Cyan_Text(motionList)<<'\n'<<END_REPORT;
+		
+	REPORT(0)<< "\nCreating geometry . . ."<<END_REPORT;
+	auto geomPtr = geometry::create(
+		Control, 
+		proprties, 
+		surface, 
+		motion, 
+		materials, 
+		geometryDict);
+	
+	REPORT(1)<< "geometry type is "<< Green_Text(geomPtr().typeName())<<END_REPORT;
+
+	Control.time().write(true);
 
 	REPORT(0)<< Green_Text("\nFinished successfully.\n")<<END_REPORT;