X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FParaMEDMEM%2FParaFIELD.hxx;h=fa5f8bca8d9e21529c8ad0f3f404fcc6051c83eb;hb=9a3f48daeedcc6e06bcc731f1c885d07cb15a1be;hp=2ef1c513223eeeca464b86b488b12b38bc2ad23b;hpb=10f37bf6f33a762626d7f1093b2f5450c1688667;p=tools%2Fmedcoupling.git diff --git a/src/ParaMEDMEM/ParaFIELD.hxx b/src/ParaMEDMEM/ParaFIELD.hxx index 2ef1c5132..fa5f8bca8 100644 --- a/src/ParaMEDMEM/ParaFIELD.hxx +++ b/src/ParaMEDMEM/ParaFIELD.hxx @@ -1,9 +1,9 @@ -// Copyright (C) 2007-2012 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. +// 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 @@ -23,7 +23,7 @@ #include "MEDCouplingRefCountObject.hxx" #include "ComponentTopology.hxx" -namespace ParaMEDMEM +namespace MEDCoupling { class DataArrayInt; class ParaMESH; @@ -35,15 +35,12 @@ namespace ParaMEDMEM class ParaFIELD { public: - 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; } DataArrayInt* returnCumulativeGlobalNumbering() const; @@ -53,9 +50,10 @@ namespace ParaMEDMEM int nbComponents() const; double getVolumeIntegral(int icomp, bool isWAbs) const; double getL2Norm()const { return -1; } + private: MEDCouplingFieldDouble* _field; - ParaMEDMEM::ComponentTopology _component_topology; + MEDCoupling::ComponentTopology _component_topology; Topology* _topology; mutable bool _own_support; ParaMESH* _support;