Merge pull request #472 from LIHPC-Computational-Geometry/cgns_writer_correction

- some errors corrected in CGNSWriter

Author: SimonCald

modules/aero/inc/gmds/aero/CGNSWriterND.h

@@ -1,7 +1,3 @@
-//
-// Created by calderans on 29/06/23.
-//
-
 #ifndef GMDS_CGNSWRITERND_H
 #define GMDS_CGNSWRITERND_H
 /*----------------------------------------------------------------------------*/
@@ -11,7 +7,6 @@
 /*----------------------------------------------------------------------------*/
 #include "Blocking3D.h"
 #include "GMDSAero_export.h"
-// #include "gmds/ig/Blocking2D.h"
 /*----------------------------------------------------------------------------*/
 namespace gmds {
 
@@ -22,11 +17,16 @@ class GMDSAero_API CGNSWriterND
  public:
 	/** @brief Constructor
 		 *
-		 * @param AMeshService an implementation of an io service to write data
-		 * 						  into a mesh
+		 * @param ABlocking a block structure to export
+		 * @param ADim the dimension to export to, 2D or 3D supported
 	 */
 	CGNSWriterND(Blocking3D *ABlocking, int ADim);
 
+	/** @brief Constructor
+			 *
+			 * @param AMesh a mesh to export
+			 * @param ADim the dimension to export to, 2D or 3D supported
+		 */
 	CGNSWriterND(Mesh *AMesh, int ADim);
 
 	CGNSWriterND();
@@ -46,10 +46,10 @@ class GMDSAero_API CGNSWriterND
 
 	void finalize(const std::string &AWorkingDir) const;
 
-	void _getIndicesIdAndVal(const int *ipnts1, const int *ipnts2, bool *filtre, int &ind, int &val);
+	static 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 writeConnections3D(const Region& Ablock, int iFace, int& index_tf, const std::vector<Variable<int>*>& zone_vars) const;
+	void writeConnections2D(const Face& Ablock, int iEdge, int& index_tf, const std::vector<Variable<int>*>& zone_vars) const;
 
 	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;

modules/aero/src/CGNSWriterND.cpp

@@ -4,8 +4,8 @@
 //
 /*----------------------------------------------------------------------------*/
 #include "gmds/aero/CGNSWriterND.h"
-#include "gmds/ig/MeshDoctor.h"
-#include "gmds/io/IGMeshIOService.h"
+//#include "gmds/ig/MeshDoctor.h"
+//#include "gmds/io/IGMeshIOService.h"
 //#include "gmds/io/VTKReader.h"
 #include <fstream>
 #include <iomanip>
@@ -64,9 +64,9 @@ CGNSWriterND::initialize(const std::string &AOutFileName, const std::string &dir
 		std::cout<<"Section error : "<<cg_get_error()<<std::endl;
 	}
 
-	char basename[AOutFileName.length()];
-	strcpy(basename, AOutFileName.c_str());
+	char basename[AOutFileName.length()+1];
 
+	strcpy(basename, AOutFileName.c_str());
 
 	cg_base_write(m_indexFile,basename,m_cellDim,m_physdim,&m_indexBase);
 
@@ -167,6 +167,9 @@ CGNSWriterND::writeZones()
 			zone_size[7] = 0;
 			zone_size[8] = 0;
 		}
+		else {
+			throw GMDSException("Dimension "+std::to_string(m_cellDim)+"D not supported in CGNS writer.");
+		}
 
 		if(cg_zone_write(m_indexFile, m_indexBase, zonename, zone_size, CG_Structured, &m_indexZone) != CG_OK) {
 			std::cout << cg_get_error() << std::endl;
@@ -234,7 +237,7 @@ CGNSWriterND::writeZones()
 	}
 }
 void
-CGNSWriterND::writeConnections3D(const Region& Ablock, int iFace, int& index_tf, const std::vector<Variable<int>*>& zone_vars){
+CGNSWriterND::writeConnections3D(const Region& Ablock, int iFace, int& index_tf, const std::vector<Variable<int>*>& zone_vars) const{
 	Face face = Ablock.get<Face>()[iFace];
 
 	if(face.get<Region>().size() == 2) {
@@ -578,7 +581,8 @@ CGNSWriterND::writeConnections3D(const Region& Ablock, int iFace, int& index_tf,
 }
 /*----------------------------------------------------------------------------*/
 void
-CGNSWriterND::writeConnections2D(const Face& Ablock, int iEdge, int& index_tf, const std::vector<Variable<int>*>& zone_vars){
+CGNSWriterND::writeConnections2D(const Face& Ablock, int iEdge, int& index_tf, const std::vector<Variable<int>*>& zone_vars) const
+{
 
 	Edge edge = Ablock.get<Edge>()[iEdge];
 
@@ -844,7 +848,7 @@ CGNSWriterND::writeBoundaryCondition2D(int &num_bc, const Face& Ablock, int iEdg
 			type_bc = ivar;
 	}
 
-	if(type_bc == -1) {
+	if(type_bc != -1) {
 
 		switch (iEdge) {
 		case 0: