Merge pull request #468 from LIHPC-Computational-Geometry/cgns_generacity

Cgns generacity

Author: SimonCald

modules/aero/CMakeLists.txt

@@ -75,7 +75,7 @@ set(GMDS_INC
         inc/gmds/aero/Utils.h
 		)
 if(WITH_CGNS)
-	set(GMDS_INC ${GMDS_INC} inc/gmds/aero/CGNSWriter3D.h
+	set(GMDS_INC ${GMDS_INC} inc/gmds/aero/CGNSWriterND.h
 	)
 endif()
 
@@ -148,7 +148,7 @@ set(GMDS_SRC
         src/main.cpp
 )
 if(WITH_CGNS)
-	set(GMDS_SRC ${GMDS_SRC} src/CGNSWriter3D.cpp
+	set(GMDS_SRC ${GMDS_SRC} src/CGNSWriterND.cpp
 	)
 endif()
 #==============================================================================
@@ -186,6 +186,7 @@ if(WITH_CGNS)
 		)
 endif ()
 
+
 target_compile_features(${GMDS_LIB} PUBLIC cxx_std_14)
 
 # INCLUDE TO INSTALL
@@ -210,11 +211,13 @@ endif(WITH_TEST)
 #==============================================================================
 # EXECUTABLE
 #==============================================================================
-add_executable(Aero src/main.cpp)
-target_link_libraries(Aero PRIVATE ${GMDS_LIB})
-target_compile_features(Aero PUBLIC cxx_std_14)
-install(TARGETS Aero)
+if(WITH_CGNS)
+	add_executable(Aero src/main.cpp)
+	target_link_libraries(Aero PRIVATE ${GMDS_LIB})
+	target_compile_features(Aero PUBLIC cxx_std_14)
+	install(TARGETS Aero)
 
-add_executable(aero_dev src/main_dev.cpp)
-target_link_libraries(aero_dev PRIVATE ${GMDS_LIB})
-target_compile_features(aero_dev PUBLIC cxx_std_14)
+	add_executable(aero_dev src/main_dev.cpp)
+	target_link_libraries(aero_dev PRIVATE ${GMDS_LIB})
+	target_compile_features(aero_dev PUBLIC cxx_std_14)
+endif ()

modules/aero/inc/gmds/aero/CGNSWriter3D.h renamed to modules/aero/inc/gmds/aero/CGNSWriterND.h

@@ -2,8 +2,8 @@
 // Created by calderans on 29/06/23.
 //
 
-#ifndef GMDS_CGNSWRITER3D_H
-#define GMDS_CGNSWRITER3D_H
+#ifndef GMDS_CGNSWRITERND_H
+#define GMDS_CGNSWRITERND_H
 /*----------------------------------------------------------------------------*/
 #include <sstream>
 /*----------------------------------------------------------------------------*/
@@ -17,29 +17,26 @@ namespace gmds {
 
 namespace aero {
 
-class GMDSAero_API CGNSWriter3D
+class GMDSAero_API CGNSWriterND
 {
  public:
 	/** @brief Constructor
 		 *
 		 * @param AMeshService an implementation of an io service to write data
 		 * 						  into a mesh
 	 */
-	CGNSWriter3D(Blocking3D *ABlocking);
+	CGNSWriterND(Blocking3D *ABlocking, int ADim);
 
-	CGNSWriter3D(Mesh *AMesh);
+	CGNSWriterND(Mesh *AMesh, int ADim);
 
-	CGNSWriter3D();
+	CGNSWriterND();
 
 	/*------------------------------------------------------------------------*/
 	/** \brief Destructor. */
-	virtual ~CGNSWriter3D();
+	virtual ~CGNSWriterND();
 
 	void write(const std::string &AInFileName, const std::string &AOutFileName, const std::string &AWorkingDir);
 
-	void writeBoundaryCondition(int &id_bc, cgsize_t *pts, int id_zone, char ABCtype[32], int AEdgeID) const;
-
-
  protected:
 	void initialize(const std::string &AOutFileName, const std::string &dir);
 
@@ -51,7 +48,11 @@ class GMDSAero_API CGNSWriter3D
 
 	void _getIndicesIdAndVal(const int *ipnts1, const int *ipnts2, bool *filtre, int &ind, int &val);
 
+	void writeConnections3D(const Region& Ablock, int iFace, int& index_tf, const std::vector<Variable<int>*>& zone_vars);
+	void writeConnections2D(const Face& Ablock, int iEdge, int& index_tf, const std::vector<Variable<int>*>& zone_vars);
 
+	void writeBoundaryCondition3D(int &num_bc, const Region& Ablock, int iFace, const std::vector<Variable<int>*>& bc_vars) const;
+	void writeBoundaryCondition2D(int &num_bc, const Face& Ablock, int iEdge, const std::vector<Variable<int>*>& bc_vars) const;
 
  protected:
 	Mesh *m_blocks;
@@ -62,8 +63,6 @@ class GMDSAero_API CGNSWriter3D
 	Variable<int>* VarDiscrJ;
 	Variable<int>* VarDiscrK;
 
-	Variable<int>* axis;
-
 	int m_cellDim;
 	int m_physdim;
 
@@ -78,4 +77,4 @@ class GMDSAero_API CGNSWriter3D
 /*----------------------------------------------------------------------------*/
 }// namespace gmds
 /*----------------------------------------------------------------------------*/
-#endif     // GMDS_CGNSWRITER3D_H
+#endif     // GMDS_CGNSWRITERND_H