Geometry folder is finalized

src/Geometry/geometryMotion/geometryMotion.hpp

@@ -37,6 +37,8 @@ class	geometryMotion
 	public geometry
 {
 public:
+	
+	using MotionModel 	 = MotionModelType;
 
 	using ModelComponent = typename MotionModelType::ModelComponent;
 
@@ -60,6 +62,9 @@ private:
 	/// determine the motion index of each triangle 
 	bool findMotionIndex();
 	
+	/// Move geometry 
+	bool moveGeometry();
+
 public:
 
 	/// Type info
@@ -77,31 +82,13 @@ public:
 			const wordVector& materialName,
 			const dictionary& motionDict);
 
-					
-		/*geometryMotion(
-			systemControl& control,
-			const property& prop,
-			const multiTriSurface& triSurface,
-			const wordVector& motionCompName,
-			const wordVector& propName,
-			const MotionModel& motionModel);*/
-
-		/// Construct from components and dictionary that contains 
-		/// motionModel
-		/*geometryMotion(systemControl& control,
-				 const property& prop,
-				 const dictionary& dict,
-				 const multiTriSurface& triSurface,
-				 const wordVector& motionCompName,
-				 const wordVector& propName);*/
-
 		/// Add virtual constructor 
-		/*add_vCtor
+		add_vCtor
 		(
 			geometry,
 			geometryMotion,
 			systemControl
-		);*/
+		);
 
 		/// Add virtual constructor 
 		add_vCtor
@@ -114,40 +101,33 @@ public:
 	// - Methods
 
 		/// Obtain motion model at time t 
-		/*auto getModel(real t)const
+		auto getModel(uint32 iter, real t, real dt)const
 		{
-			return motionModel_.getModel(t);
-		}*/
+			return motionModel_.getModelInterface(iter, t, dt);
+		}
 
 		/// TypeName / TypeInfo of motion model 
-		/*word motionModelTypeName()const override
+		word motionModelTypeName()const override
 		{
 			return motionModel_.typeName();
-		}*/
+		}
 
 		/// Access to motion model index of triangles 
-		/*const auto& triMotionIndex()const override
+		const uint32Field_D& triMotionIndex()const override
 		{
 			return triMotionIndex_;
 		}
 
 		/// Access to motion model index of points 
-		const int8Vector_HD& pointMotionIndex()const override
+		const uint32Field_D& pointMotionIndex()const override
 		{
 			return pointMotionIndex_;
-		}*/
-
-		/// Operations before each iteration 
-		/*bool beforeIteration() override;
+		}
 
 		/// Iterate geometry one time step  
 		bool iterate() override ;
 
-		/// Operations after each iteration 
-		bool afterIteration() override;*/
-
-		/// Move geometry 
-		//bool moveGeometry();
+		
 
 };
 
@@ -155,9 +135,6 @@ public:
 
 #include "geometryMotion.cpp"
 
-#ifndef BUILD_SHARED_LIBS
-	#include "geometryMotionsInstantiate.cpp"
-#endif
 
 
 #endif  //__geometryMotion_hpp__