Various fixes for test runs - introducing MEDCOUPLING_RESOURCE_DIR env variable

[tools/medcoupling.git] / src / ParaMEDMEM / ParaMESH.hxx

diff --git a/src/ParaMEDMEM/ParaMESH.hxx b/src/ParaMEDMEM/ParaMESH.hxx
index 06c6d754af132d0be97dc838593fe7e15ec9341a..7955bd42e453ec4a99747ca6e121f501fb734622 100644 (file)
--- a/src/ParaMEDMEM/ParaMESH.hxx
+++ b/src/ParaMEDMEM/ParaMESH.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  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
@@ -17,8 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#ifndef __PARAMESH_HXX__
-#define __PARAMESH_HXX__
+#pragma once
 
 #include "MEDCouplingPointSet.hxx"
 #include "ProcessorGroup.hxx"
@@ -27,7 +26,7 @@
 #include <string>
 #include <vector>
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class Topology;
   class BlockTopology;
@@ -51,43 +50,41 @@ namespace ParaMEDMEM
               const ProcessorGroup& proc_group, const std::string& name);
     ParaMESH( MEDCouplingPointSet *subdomain_mesh,
               MEDCouplingPointSet *subdomain_face,
-              DataArrayInt *CorrespElt_local2global,
-              DataArrayInt *CorrespFace_local2global,
-              DataArrayInt *CorrespNod_local2global,
+              DataArrayIdType *CorrespElt_local2global,
+              DataArrayIdType *CorrespFace_local2global,
+              DataArrayIdType *CorrespNod_local2global,
               const ProcessorGroup& proc_group ) ;
 
     virtual ~ParaMESH();
-    void setNodeGlobal(DataArrayInt *nodeGlobal);
-    void setCellGlobal(DataArrayInt *cellGlobal);
+    void setNodeGlobal(DataArrayIdType *nodeGlobal);
+    void setCellGlobal(DataArrayIdType *cellGlobal);
     Topology* getTopology() const { return _explicit_topology; }
     bool isStructured() const { return _cell_mesh->isStructured(); }
-    MEDCouplingPointSet *getCellMesh() const { return _cell_mesh; }
-    MEDCouplingPointSet *getFaceMesh() const { return _face_mesh; }
+    MEDCouplingPointSet *getCellMesh() const { return _cell_mesh.iAmATrollConstCast(); }
+    MEDCouplingPointSet *getFaceMesh() const { return _face_mesh.iAmATrollConstCast(); }
     BlockTopology* getBlockTopology() const { return _block_topology; }
 
-    DataArrayInt* getGlobalNumberingNodeDA() const { if(_node_global) _node_global->incrRef(); return _node_global; }
-    DataArrayInt* getGlobalNumberingFaceDA() const { if(_face_global) _face_global->incrRef(); return _face_global; }
-    DataArrayInt* getGlobalNumberingCellDA() const { if(_cell_global) _cell_global->incrRef(); return _cell_global; }
-    const int* getGlobalNumberingNode() const { if(_node_global) return _node_global->getConstPointer(); return 0; }
-    const int* getGlobalNumberingFace() const { if(_face_global) return _face_global->getConstPointer(); return 0; }
-    const int* getGlobalNumberingCell() const { if(_cell_global) return _cell_global->getConstPointer(); return 0; }
+    DataArrayIdType* getGlobalNumberingNodeDA() const { return _node_global.retnConstCast(); }
+    DataArrayIdType* getGlobalNumberingFaceDA() const { return _face_global.retnConstCast(); }
+    DataArrayIdType* getGlobalNumberingCellDA() const { return _cell_global.retnConstCast(); }
+    const mcIdType* getGlobalNumberingNode() const { if(_node_global) return _node_global->getConstPointer(); return nullptr; }
+    const mcIdType* getGlobalNumberingFace() const { if(_face_global) return _face_global->getConstPointer(); return nullptr; }
+    const mcIdType* getGlobalNumberingCell() const { if(_cell_global) return _cell_global->getConstPointer(); return nullptr; }
 
   private:
     //mesh object underlying the ParaMESH object
-    MEDCouplingPointSet *_cell_mesh ;
-    MEDCouplingPointSet *_face_mesh ;
+    MCAuto<MEDCouplingPointSet> _cell_mesh ;
+    MCAuto<MEDCouplingPointSet> _face_mesh ;
 
     //id of the local grid
     int _my_domain_id;
 
     //global topology of the cells
-    ParaMEDMEM::BlockTopology* _block_topology;
+    MEDCoupling::BlockTopology* _block_topology;
     Topology*  _explicit_topology;
     // pointers to global numberings
-    DataArrayInt* _node_global;
-    DataArrayInt* _face_global;
-    DataArrayInt* _cell_global;
+    MCAuto<DataArrayIdType> _node_global;
+    MCAuto<DataArrayIdType> _face_global;
+    MCAuto<DataArrayIdType> _cell_global;
   };
 }
-
-#endif