X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDCoupling%2FMEDCouplingNormalizedUnstructuredMesh.txx;h=9c5aab27c3f28208b3aefce0f652577defcedbdf;hb=b607ffc713080a567fb90595118069ac18181e99;hp=95d74e589ad0f580ce83a3f18b3e5e69f4a4854b;hpb=e215e6f76f706ca097b9fdca5665ec3f06237e69;p=tools%2Fmedcoupling.git

diff --git a/src/MEDCoupling/MEDCouplingNormalizedUnstructuredMesh.txx b/src/MEDCoupling/MEDCouplingNormalizedUnstructuredMesh.txx
index 95d74e589..9c5aab27c 100644
--- a/src/MEDCoupling/MEDCouplingNormalizedUnstructuredMesh.txx
+++ b/src/MEDCoupling/MEDCouplingNormalizedUnstructuredMesh.txx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2020  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,18 +17,21 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 // Author : Anthony Geay (CEA/DEN)
+
 #ifndef __MEDCOUPLINGNORMALIZEDUNSTRUCTUREDMESH_TXX__
 #define __MEDCOUPLINGNORMALIZEDUNSTRUCTUREDMESH_TXX__
 
 #include "MEDCouplingNormalizedUnstructuredMesh.hxx"
+#include "InterpKernelAssert.hxx"
 
 #include "MEDCouplingUMesh.hxx"
+#include "MEDCoupling1GTUMesh.hxx"
 #include "MEDCouplingMemArray.hxx"
 
 #include <limits>
 
 template<int SPACEDIM,int MESHDIM>
-MEDCouplingNormalizedUnstructuredMesh<SPACEDIM,MESHDIM>::MEDCouplingNormalizedUnstructuredMesh(const ParaMEDMEM::MEDCouplingUMesh *mesh):_mesh(mesh)
+MEDCouplingNormalizedUnstructuredMesh<SPACEDIM,MESHDIM>::MEDCouplingNormalizedUnstructuredMesh(const MEDCoupling::MEDCouplingPointSet *mesh):_mesh(mesh)
 {
   if(_mesh)
     _mesh->incrRef();
@@ -43,13 +46,13 @@ void MEDCouplingNormalizedUnstructuredMesh<SPACEDIM,MESHDIM>::getBoundingBox(dou
       boundingBox[i]=std::numeric_limits<double>::max();
       boundingBox[SPACEDIM+i]=-std::numeric_limits<double>::max();
     }
-  const ParaMEDMEM::DataArrayDouble *array=_mesh->getCoords();
+  const MEDCoupling::DataArrayDouble *array=_mesh->getCoords();
   const double *ptr=array->getConstPointer();
-  int nbOfPts=array->getNbOfElems()/SPACEDIM;
+  mcIdType nbOfPts=ToIdType(array->getNbOfElems())/SPACEDIM;
   for(int j=0;j<SPACEDIM;j++)
     {
       const double *work=ptr+j;
-      for(int i=0;i<nbOfPts;i++,work+=SPACEDIM)
+      for(mcIdType i=0;i<nbOfPts;i++,work+=SPACEDIM)
         {
           if(boundingBox[j]>*work)
             boundingBox[j]=*work;
@@ -60,31 +63,31 @@ void MEDCouplingNormalizedUnstructuredMesh<SPACEDIM,MESHDIM>::getBoundingBox(dou
 }
 
 template<int SPACEDIM,int MESHDIM>
-INTERP_KERNEL::NormalizedCellType MEDCouplingNormalizedUnstructuredMesh<SPACEDIM,MESHDIM>::getTypeOfElement(int eltId) const
+INTERP_KERNEL::NormalizedCellType MEDCouplingNormalizedUnstructuredMesh<SPACEDIM,MESHDIM>::getTypeOfElement(mcIdType eltId) const
 {
   return _mesh->getTypeOfCell(eltId);
 }
 
 template<int SPACEDIM,int MESHDIM>
-int MEDCouplingNormalizedUnstructuredMesh<SPACEDIM,MESHDIM>::getNumberOfNodesOfElement(int eltId) const
+mcIdType MEDCouplingNormalizedUnstructuredMesh<SPACEDIM,MESHDIM>::getNumberOfNodesOfElement(mcIdType eltId) const
 {
   return _mesh->getNumberOfNodesInCell(eltId);
 }
 
 template<int SPACEDIM,int MESHDIM>
-int MEDCouplingNormalizedUnstructuredMesh<SPACEDIM,MESHDIM>::getNumberOfElements() const
+mcIdType MEDCouplingNormalizedUnstructuredMesh<SPACEDIM,MESHDIM>::getNumberOfElements() const
 {
-  return _mesh->getNumberOfCells();
+  return ToIdType(_mesh->getNumberOfCells());
 }
 
 template<int SPACEDIM,int MESHDIM>
-int MEDCouplingNormalizedUnstructuredMesh<SPACEDIM,MESHDIM>::getNumberOfNodes() const
+mcIdType MEDCouplingNormalizedUnstructuredMesh<SPACEDIM,MESHDIM>::getNumberOfNodes() const
 {
   return _mesh->getNumberOfNodes();
 }
 
 template<int SPACEDIM,int MESHDIM>
-const int *MEDCouplingNormalizedUnstructuredMesh<SPACEDIM,MESHDIM>::getConnectivityPtr() const
+const mcIdType *MEDCouplingNormalizedUnstructuredMesh<SPACEDIM,MESHDIM>::getConnectivityPtr() const
 {
   return _conn_for_interp;
 }
@@ -92,12 +95,12 @@ const int *MEDCouplingNormalizedUnstructuredMesh<SPACEDIM,MESHDIM>::getConnectiv
 template<int SPACEDIM,int MESHDIM>
 const double *MEDCouplingNormalizedUnstructuredMesh<SPACEDIM,MESHDIM>::getCoordinatesPtr() const
 {
-  const ParaMEDMEM::DataArrayDouble *array=_mesh->getCoords();
+  const MEDCoupling::DataArrayDouble *array=_mesh->getCoords();
   return array->getConstPointer();
 }
 
 template<int SPACEDIM,int MESHDIM>
-const int *MEDCouplingNormalizedUnstructuredMesh<SPACEDIM,MESHDIM>::getConnectivityIndexPtr() const
+const mcIdType *MEDCouplingNormalizedUnstructuredMesh<SPACEDIM,MESHDIM>::getConnectivityIndexPtr() const
 {
   return _conn_index_for_interp;
 }
@@ -122,24 +125,54 @@ MEDCouplingNormalizedUnstructuredMesh<SPACEDIM,MESHDIM>::~MEDCouplingNormalizedU
 template<int SPACEDIM,int MESHDIM>
 void MEDCouplingNormalizedUnstructuredMesh<SPACEDIM,MESHDIM>::prepare()
 {
-  int nbOfCell=_mesh->getNumberOfCells();
-  int initialConnSize=_mesh->getNodalConnectivity()->getNbOfElems();
-  _conn_for_interp=new int[initialConnSize-nbOfCell];
-  _conn_index_for_interp=new int[nbOfCell+1];
-  _conn_index_for_interp[0]=0;
-  const int *work_conn=_mesh->getNodalConnectivity()->getConstPointer()+1;
-  const int *work_conn_index=_mesh->getNodalConnectivityIndex()->getConstPointer();
-  int *work_conn_for_interp=_conn_for_interp;
-  int *work_conn_index_for_interp=_conn_index_for_interp;
-  for(int i=0;i<nbOfCell;i++)
+  IKAssert(_mesh->getSpaceDimension()==SPACEDIM);
+  const MEDCoupling::MEDCouplingUMesh *m1(dynamic_cast<const MEDCoupling::MEDCouplingUMesh *>(_mesh));
+  if(m1)
+    {
+      mcIdType nbOfCell=ToIdType(m1->getNumberOfCells());
+      mcIdType initialConnSize=ToIdType(m1->getNodalConnectivity()->getNbOfElems());
+      _conn_for_interp=new mcIdType[initialConnSize-nbOfCell];
+      _conn_index_for_interp=new mcIdType[nbOfCell+1];
+      _conn_index_for_interp[0]=0;
+      const mcIdType *work_conn=m1->getNodalConnectivity()->getConstPointer()+1;
+      const mcIdType *work_conn_index=m1->getNodalConnectivityIndex()->getConstPointer();
+      mcIdType *work_conn_for_interp=_conn_for_interp;
+      mcIdType *work_conn_index_for_interp=_conn_index_for_interp;
+      for(mcIdType i=0;i<nbOfCell;i++)
+        {
+          mcIdType nbOfValsToCopy=work_conn_index[1]-work_conn_index[0]-1;
+          work_conn_for_interp=std::copy(work_conn,work_conn+nbOfValsToCopy,work_conn_for_interp);
+          work_conn_index_for_interp[1]=work_conn_index_for_interp[0]+nbOfValsToCopy;
+          work_conn_index++;
+          work_conn+=nbOfValsToCopy+1;
+          work_conn_index_for_interp++;
+        }
+      return ;
+    }
+  const MEDCoupling::MEDCoupling1DGTUMesh *m2(dynamic_cast<const MEDCoupling::MEDCoupling1DGTUMesh *>(_mesh));
+  if(m2)
+    {
+      mcIdType nbOfCell=ToIdType(m2->getNumberOfCells());
+      _conn_index_for_interp=new mcIdType[nbOfCell+1];
+      const mcIdType *conni(m2->getNodalConnectivityIndex()->begin());
+      std::copy(conni,conni+nbOfCell+1,_conn_index_for_interp);
+      _conn_for_interp=new mcIdType[m2->getNodalConnectivity()->getNumberOfTuples()];
+      std::copy(m2->getNodalConnectivity()->begin(),m2->getNodalConnectivity()->end(),_conn_for_interp);
+      return ;
+    }
+  const MEDCoupling::MEDCoupling1SGTUMesh *m3(dynamic_cast<const MEDCoupling::MEDCoupling1SGTUMesh *>(_mesh));
+  if(m3)
     {
-      int nbOfValsToCopy=work_conn_index[1]-work_conn_index[0]-1;
-      work_conn_for_interp=std::copy(work_conn,work_conn+nbOfValsToCopy,work_conn_for_interp);
-      work_conn_index_for_interp[1]=work_conn_index_for_interp[0]+nbOfValsToCopy;
-      work_conn_index++;
-      work_conn+=nbOfValsToCopy+1;
-      work_conn_index_for_interp++;
+      mcIdType nbOfCell=ToIdType(m3->getNumberOfCells()),nbNodesPerCell(m3->getNumberOfNodesPerCell());
+      _conn_index_for_interp=new mcIdType[nbOfCell+1]; _conn_index_for_interp[0]=0;
+      mcIdType *work(_conn_index_for_interp);
+      for(mcIdType i=0;i<nbOfCell;i++,work++)
+        work[1]=work[0]+nbNodesPerCell;
+      _conn_for_interp=new mcIdType[m3->getNodalConnectivity()->getNumberOfTuples()];
+      std::copy(m3->getNodalConnectivity()->begin(),m3->getNodalConnectivity()->end(),_conn_for_interp);
+      return ;
     }
+  throw INTERP_KERNEL::Exception("MEDCouplingNormalizedUnstructuredMesh::prepare : Unrecognized unstructured mesh ! Type must be in MEDCouplingUMesh, MEDCoupling1DGTUMesh, MEDCoupling1SGTUMesh !");
 }
 
 #endif