Corrected missing data in copy constructor

diff --git a/CDMATH/mesh/inc/Mesh.hxx b/CDMATH/mesh/inc/Mesh.hxx
index 23eb46e316d53a5f6d13a6948d7c9a703d527363..7d580eba3f0ab3a639b3e97e82719b43cc75fb7b 100644 (file)
--- a/CDMATH/mesh/inc/Mesh.hxx
+++ b/CDMATH/mesh/inc/Mesh.hxx
@@ -259,17 +259,29 @@ public: //----------------------------------------------------------------
         */
        std::vector<std::string> getNameOfNodeGroups( void )  const ;
 
+       /**
+        * \brief return the list of face groups ids
+        * @return _faceGroupsIds
+        */
+       std::vector< std::vector<int> > getFaceGroups( void )  const ;
+
+       /**
+        * \brief return the list of node groups Ids
+        * @return _nodeGroupsIds
+        */
+       std::vector< std::vector<int> > getNodeGroups( void )  const ;
+
        /**
         * \brief return the list of face groups
         * @return _faceGroups
         */
-       std::vector<MEDCoupling::MEDCouplingUMesh *> getFaceGroups( void )  const ;
+       std::vector<MEDCoupling::MEDCouplingUMesh *> getMEDCouplingFaceGroups( void )  const ;
 
        /**
         * \brief return the list of node groups
         * @return _nodeGroups
         */
-       std::vector<MEDCoupling::DataArrayIdType *> getNodeGroups( void )  const ;
+       std::vector<MEDCoupling::DataArrayIdType *> getMEDCouplingNodeGroups( void )  const ;
 
     /**
      * \brief Functions to extract boundary nodes and faces Ids

diff --git a/CDMATH/mesh/src/Mesh.cxx b/CDMATH/mesh/src/Mesh.cxx
index 8976721a5191a446e0c97c239b35ab0757246c66..b81302a5ba859a8e1d0426eacabe6c18fbfd7f13 100644 (file)
--- a/CDMATH/mesh/src/Mesh.cxx
+++ b/CDMATH/mesh/src/Mesh.cxx
@@ -124,9 +124,11 @@ Mesh::Mesh( const Mesh& mesh )
        _numberOfEdges = mesh.getNumberOfEdges();
 
        _faceGroupNames = mesh.getNameOfFaceGroups() ;
-       _faceGroups = mesh.getFaceGroups() ;
+       _faceGroups = mesh.getMEDCouplingFaceGroups() ;
+       _faceGroupsIds = mesh.getFaceGroups() ;
        _nodeGroupNames = mesh.getNameOfNodeGroups() ;
-       _nodeGroups = mesh.getNodeGroups() ;
+       _nodeGroups = mesh.getMEDCouplingNodeGroups() ;
+       _nodeGroupsIds = mesh.getNodeGroups() ;
 
        _nodes   = mesh.getNodes() ;
        _faces   = mesh.getFaces() ;
@@ -1107,7 +1109,7 @@ Mesh::setGroupAtPlan(double value, int direction, double eps, std::string groupN
                        _faceGroups.insert(    _faceGroups.end(), NULL);//No mesh created. Create one ?
                }
                else
-               {cout<<"_faceGroupNames.size()="<<_faceGroupNames.size()<<", _faceGroupsIds.size()="<<_faceGroupsIds.size()<<endl;
+               {
                        std::vector< int > faceGroupIds = _faceGroupsIds[it-_faceGroupNames.begin()];
                        faceGroupIds.insert( faceGroupIds.end(), faceIds.begin(), faceIds.end());
                        /* Detect and erase duplicates face ids */
@@ -1694,8 +1696,14 @@ Mesh::getNameOfFaceGroups( void )  const
        return _faceGroupNames;
 }
 
-vector<MEDCoupling::MEDCouplingUMesh *>
+vector< std::vector<int> >
 Mesh::getFaceGroups( void )  const
+{
+       return _faceGroupsIds;
+}
+
+vector<MEDCoupling::MEDCouplingUMesh *>
+Mesh::getMEDCouplingFaceGroups( void )  const
 {
        return _faceGroups;
 }
@@ -1706,8 +1714,15 @@ Mesh::getNameOfNodeGroups( void )  const
        return _nodeGroupNames;
 }
 
-vector<MEDCoupling::DataArrayIdType *>
+vector< std::vector<int> >
 Mesh::getNodeGroups( void )  const
+{
+       return _nodeGroupsIds;
+}
+
+
+vector<MEDCoupling::DataArrayIdType *>
+Mesh::getMEDCouplingNodeGroups( void )  const
 {
        return _nodeGroups;
 }
@@ -1733,9 +1748,11 @@ Mesh::operator= ( const Mesh& mesh )
         _nxyz = mesh.getCellGridStructure() ;
 
        _faceGroupNames = mesh.getNameOfFaceGroups() ;
-       _faceGroups = mesh.getFaceGroups() ;
+       _faceGroupsIds = mesh.getFaceGroups() ;
+       _faceGroups = mesh.getMEDCouplingFaceGroups() ;
        _nodeGroupNames = mesh.getNameOfNodeGroups() ;
-       _nodeGroups = mesh.getNodeGroups() ;
+       _nodeGroupsIds = mesh.getNodeGroups() ;
+       _nodeGroups = mesh.getMEDCouplingNodeGroups() ;
 
        _nodes   = mesh.getNodes() ;
        _faces   = mesh.getFaces() ;