Salome HOME
projects
/
tools
/
medcoupling.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Intersec bug fix: when intersecting nodes are merged, they were not properly
[tools/medcoupling.git]
/
src
/
ParaMEDMEM
/
ParaFIELD.hxx
diff --git
a/src/ParaMEDMEM/ParaFIELD.hxx
b/src/ParaMEDMEM/ParaFIELD.hxx
index 81a726581ccf1fd32cd2c7c718fe5c408188868d..fa5f8bca8d9e21529c8ad0f3f404fcc6051c83eb 100644
(file)
--- a/
src/ParaMEDMEM/ParaFIELD.hxx
+++ b/
src/ParaMEDMEM/ParaFIELD.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
CEA/DEN, EDF R&D
+// Copyright (C) 2007-201
6
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
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-23,7
+23,7
@@
#include "MEDCouplingRefCountObject.hxx"
#include "ComponentTopology.hxx"
#include "MEDCouplingRefCountObject.hxx"
#include "ComponentTopology.hxx"
-namespace
ParaMEDMEM
+namespace
MEDCoupling
{
class DataArrayInt;
class ParaMESH;
{
class DataArrayInt;
class ParaMESH;
@@
-35,15
+35,12
@@
namespace ParaMEDMEM
class ParaFIELD
{
public:
class ParaFIELD
{
public:
-
ParaFIELD(TypeOfField type, TypeOfTimeDiscretization td, ParaMESH* mesh, const ComponentTopology& component_topology);
ParaFIELD(TypeOfField type, TypeOfTimeDiscretization td, ParaMESH* mesh, const ComponentTopology& component_topology);
-
-
ParaFIELD(MEDCouplingFieldDouble* field, ParaMESH *sup, const ProcessorGroup& group);
ParaFIELD(MEDCouplingFieldDouble* field, ParaMESH *sup, const ProcessorGroup& group);
-
virtual ~ParaFIELD();
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;
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; }
int nbComponents() const;
double getVolumeIntegral(int icomp, bool isWAbs) const;
double getL2Norm()const { return -1; }
+
private:
MEDCouplingFieldDouble* _field;
private:
MEDCouplingFieldDouble* _field;
-
ParaMEDMEM
::ComponentTopology _component_topology;
+
MEDCoupling
::ComponentTopology _component_topology;
Topology* _topology;
mutable bool _own_support;
ParaMESH* _support;
Topology* _topology;
mutable bool _own_support;
ParaMESH* _support;