X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FParaMEDMEM%2FParaFIELD.hxx;h=7ca217363c55f4919cf60527057ac290dc6b7853;hb=b219559763498c4bd10c730cd3d2c62b1eed45db;hp=594eb93332a0e9b4abb5477088f31ecad267e385;hpb=f1a947b32a36d8dc8e3079b25305bb50e8cb59a0;p=tools%2Fmedcoupling.git diff --git a/src/ParaMEDMEM/ParaFIELD.hxx b/src/ParaMEDMEM/ParaFIELD.hxx index 594eb9333..7ca217363 100644 --- a/src/ParaMEDMEM/ParaFIELD.hxx +++ b/src/ParaMEDMEM/ParaFIELD.hxx @@ -1,9 +1,9 @@ -// Copyright (C) 2007-2013 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. +// 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 @@ -22,8 +22,9 @@ #include "MEDCouplingRefCountObject.hxx" #include "ComponentTopology.hxx" +#include "MCType.hxx" -namespace ParaMEDMEM +namespace MEDCoupling { class DataArrayInt; class ParaMESH; @@ -35,27 +36,25 @@ 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; - DataArrayInt* returnGlobalNumbering() const; + DataArrayIdType* returnCumulativeGlobalNumbering() const; + DataArrayIdType* returnGlobalNumbering() const; Topology* getTopology() const { return _topology; } ParaMESH* getSupport() const { return _support; } 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;