-// Copyright (C) 2007-2008 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2016 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.
+// 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, 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
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// 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 "MEDCouplingUMesh.hxx"
-#include "MemArray.hxx"
+#include "MEDCoupling1GTUMesh.hxx"
+#include "MEDCouplingMemArray.hxx"
+
+#include <limits>
template<int SPACEDIM,int MESHDIM>
-MEDCouplingNormalizedUnstructuredMesh<SPACEDIM,MESHDIM>::MEDCouplingNormalizedUnstructuredMesh(ParaMEDMEM::MEDCouplingUMesh *mesh):_mesh(mesh)
+MEDCouplingNormalizedUnstructuredMesh<SPACEDIM,MESHDIM>::MEDCouplingNormalizedUnstructuredMesh(const MEDCoupling::MEDCouplingPointSet *mesh):_mesh(mesh)
{
if(_mesh)
_mesh->incrRef();
boundingBox[i]=std::numeric_limits<double>::max();
boundingBox[SPACEDIM+i]=-std::numeric_limits<double>::max();
}
- ParaMEDMEM::DataArrayDouble *array=_mesh->getCoords();
- const double *ptr=array->getPointer();
+ const MEDCoupling::DataArrayDouble *array=_mesh->getCoords();
+ const double *ptr=array->getConstPointer();
int nbOfPts=array->getNbOfElems()/SPACEDIM;
for(int j=0;j<SPACEDIM;j++)
{
}
template<int SPACEDIM,int MESHDIM>
-unsigned char MEDCouplingNormalizedUnstructuredMesh<SPACEDIM,MESHDIM>::getNumberOfNodesOfElement(int eltId) const
+int MEDCouplingNormalizedUnstructuredMesh<SPACEDIM,MESHDIM>::getNumberOfNodesOfElement(int eltId) const
{
return _mesh->getNumberOfNodesInCell(eltId);
}
template<int SPACEDIM,int MESHDIM>
-unsigned long MEDCouplingNormalizedUnstructuredMesh<SPACEDIM,MESHDIM>::getNumberOfElements() const
+int MEDCouplingNormalizedUnstructuredMesh<SPACEDIM,MESHDIM>::getNumberOfElements() const
{
return _mesh->getNumberOfCells();
}
template<int SPACEDIM,int MESHDIM>
-unsigned long MEDCouplingNormalizedUnstructuredMesh<SPACEDIM,MESHDIM>::getNumberOfNodes() const
+int MEDCouplingNormalizedUnstructuredMesh<SPACEDIM,MESHDIM>::getNumberOfNodes() const
{
return _mesh->getNumberOfNodes();
}
template<int SPACEDIM,int MESHDIM>
const double *MEDCouplingNormalizedUnstructuredMesh<SPACEDIM,MESHDIM>::getCoordinatesPtr() const
{
- ParaMEDMEM::DataArrayDouble *array=_mesh->getCoords();
- return array->getPointer();
+ const MEDCoupling::DataArrayDouble *array=_mesh->getCoords();
+ return array->getConstPointer();
}
template<int SPACEDIM,int MESHDIM>
}
template<int SPACEDIM,int MESHDIM>
-void MEDCouplingNormalizedUnstructuredMesh<SPACEDIM,MESHDIM>::ReleaseTempArrays()
+void MEDCouplingNormalizedUnstructuredMesh<SPACEDIM,MESHDIM>::releaseTempArrays()
{
delete [] _conn_for_interp;
delete [] _conn_index_for_interp;
{
if(_mesh)
_mesh->decrRef();
- ReleaseTempArrays();
+ releaseTempArrays();
}
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()->getPointer()+1;
- const int *work_conn_index=_mesh->getNodalConnectivityIndex()->getPointer();
- 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++)
+ const MEDCoupling::MEDCouplingUMesh *m1(dynamic_cast<const MEDCoupling::MEDCouplingUMesh *>(_mesh));
+ if(m1)
+ {
+ int nbOfCell=m1->getNumberOfCells();
+ int initialConnSize=m1->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=m1->getNodalConnectivity()->getConstPointer()+1;
+ const int *work_conn_index=m1->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++)
+ {
+ 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++;
+ }
+ return ;
+ }
+ const MEDCoupling::MEDCoupling1DGTUMesh *m2(dynamic_cast<const MEDCoupling::MEDCoupling1DGTUMesh *>(_mesh));
+ if(m2)
+ {
+ int nbOfCell(m2->getNumberOfCells());
+ _conn_index_for_interp=new int[nbOfCell+1];
+ const int *conni(m2->getNodalConnectivityIndex()->begin());
+ std::copy(conni,conni+nbOfCell+1,_conn_index_for_interp);
+ _conn_for_interp=new int[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++;
+ int nbOfCell(m3->getNumberOfCells()),nbNodesPerCell(m3->getNumberOfNodesPerCell());
+ _conn_index_for_interp=new int[nbOfCell+1]; _conn_index_for_interp[0]=0;
+ int *work(_conn_index_for_interp);
+ for(int i=0;i<nbOfCell;i++,work++)
+ work[1]=work[0]+nbNodesPerCell;
+ _conn_for_interp=new int[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