X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FParaMEDMEM%2FParaFIELD.hxx;h=7ca217363c55f4919cf60527057ac290dc6b7853;hb=b219559763498c4bd10c730cd3d2c62b1eed45db;hp=5b8944ddae3486d39206004fca61761f942d5819;hpb=48782c06022ca2caa36f849cb5a29ea4fe2aaa83;p=tools%2Fmedcoupling.git

diff --git a/src/ParaMEDMEM/ParaFIELD.hxx b/src/ParaMEDMEM/ParaFIELD.hxx
index 5b8944dda..7ca217363 100644
--- a/src/ParaMEDMEM/ParaFIELD.hxx
+++ b/src/ParaMEDMEM/ParaFIELD.hxx
@@ -1,61 +1,63 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D
+// Copyright (C) 2007-2019  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
 //
+
 #ifndef __PARAFIELD_HXX__
 #define __PARAFIELD_HXX__
 
+#include "MEDCouplingRefCountObject.hxx"
 #include "ComponentTopology.hxx"
-#include "ParaMESH.hxx"
-#include "MEDCouplingFieldDouble.hxx"
-#include "MEDCouplingUMesh.hxx"
+#include "MCType.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
-
-  class ParaSUPPORT;
+  class DataArrayInt;
+  class ParaMESH;
   class ProcessorGroup;
+  class MEDCouplingFieldDouble;
+  class ComponentTopology;
+  class Topology;
 
   class ParaFIELD
   {
   public:
-
-    ParaFIELD(TypeOfField type, ParaMESH* mesh, const ComponentTopology& component_topology); 
-
-
-    ParaFIELD(MEDCouplingFieldDouble* field, const ProcessorGroup& group);
-  
+    ParaFIELD(TypeOfField type, TypeOfTimeDiscretization td, ParaMESH* mesh, const ComponentTopology& component_topology); 
+    ParaFIELD(MEDCouplingFieldDouble* field, ParaMESH *sup, const ProcessorGroup& group);
     virtual ~ParaFIELD();
-    void synchronizeTarget( ParaMEDMEM::ParaFIELD* source_field);
-    void synchronizeSource( ParaMEDMEM::ParaFIELD* target_field);
+
+    void synchronizeTarget( MEDCoupling::ParaFIELD* source_field);
+    void synchronizeSource( MEDCoupling::ParaFIELD* target_field);
     MEDCouplingFieldDouble* getField() const { return _field; }
+    void setOwnSupport(bool v) const { _own_support=v; }
+    DataArrayIdType* returnCumulativeGlobalNumbering() const;
+    DataArrayIdType* returnGlobalNumbering() const;
     Topology* getTopology() const { return _topology; }
     ParaMESH* getSupport() const  { return _support; }
-    int nbComponents() const { return _component_topology.nbComponents(); }
-    double getVolumeIntegral(int icomp) const;
+    int nbComponents() const;
+    double getVolumeIntegral(int icomp, bool isWAbs) const;
     double getL2Norm()const { return -1; }
+
   private:
     MEDCouplingFieldDouble* _field;
-    const  ParaMEDMEM::ComponentTopology& _component_topology;
+    MEDCoupling::ComponentTopology _component_topology;
     Topology* _topology; 
-
+    mutable bool _own_support;
     ParaMESH* _support;
-    bool _has_field_ownership;
-    bool _has_support_ownership;
   };
 
 }