From: ageay Date: Mon, 13 Sep 2010 09:56:32 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: V5_1_main_FINAL~46 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b9a72c8bd6f497d286ac3fe49fb99a17dc5c8b4d;p=tools%2Fmedcoupling.git *** empty log message *** --- diff --git a/src/ParaMEDMEM/DEC.cxx b/src/ParaMEDMEM/DEC.cxx index 73a5577b7..d8256bdc0 100644 --- a/src/ParaMEDMEM/DEC.cxx +++ b/src/ParaMEDMEM/DEC.cxx @@ -24,9 +24,9 @@ #include "ParaFIELD.hxx" #include "ParaMESH.hxx" #include "DEC.hxx" -#include "ICoCoField.h" +#include "ICoCoField.hxx" #include "ICoCoMEDField.hxx" -#include "ICoCoTrioField.h" +#include "ICoCoTrioField.hxx" #include "MPIProcessorGroup.hxx" #include diff --git a/src/ParaMEDMEM/ICoCoField.cxx b/src/ParaMEDMEM/ICoCoField.cxx index 92c732a63..1251ee1d6 100644 --- a/src/ParaMEDMEM/ICoCoField.cxx +++ b/src/ParaMEDMEM/ICoCoField.cxx @@ -20,7 +20,7 @@ // ICoCoField.cpp // version 1.2 10/05/2010 -#include +#include #include using namespace ICoCo; diff --git a/src/ParaMEDMEM/ICoCoField.h b/src/ParaMEDMEM/ICoCoField.h deleted file mode 100644 index b38eb0034..000000000 --- a/src/ParaMEDMEM/ICoCoField.h +++ /dev/null @@ -1,24 +0,0 @@ -// ICoCo file common to several codes -// ICoCoField.h -// version 1.2 10/05/2010 - -#ifndef _ICoCoField_included_ -#define _ICoCoField_included_ -#include - - -namespace ICoCo { - - class Field { - public: - Field(); - virtual ~Field(); - void setName(const std::string& name); - const std::string& getName() const; - const char* getCharName() const; - - private: - std::string* _name; - }; -} -#endif diff --git a/src/ParaMEDMEM/ICoCoField.hxx b/src/ParaMEDMEM/ICoCoField.hxx new file mode 100644 index 000000000..b38eb0034 --- /dev/null +++ b/src/ParaMEDMEM/ICoCoField.hxx @@ -0,0 +1,24 @@ +// ICoCo file common to several codes +// ICoCoField.h +// version 1.2 10/05/2010 + +#ifndef _ICoCoField_included_ +#define _ICoCoField_included_ +#include + + +namespace ICoCo { + + class Field { + public: + Field(); + virtual ~Field(); + void setName(const std::string& name); + const std::string& getName() const; + const char* getCharName() const; + + private: + std::string* _name; + }; +} +#endif diff --git a/src/ParaMEDMEM/ICoCoMEDField.cxx b/src/ParaMEDMEM/ICoCoMEDField.cxx index 40a4a290b..cc3b61dd5 100644 --- a/src/ParaMEDMEM/ICoCoMEDField.cxx +++ b/src/ParaMEDMEM/ICoCoMEDField.cxx @@ -18,7 +18,7 @@ // #include "ICoCoMEDField.hxx" -#include "ICoCoTrioField.h" +#include "ICoCoTrioField.hxx" #include "ProcessorGroup.hxx" #include "MEDCouplingUMesh.hxx" #include "MEDCouplingFieldDouble.hxx" diff --git a/src/ParaMEDMEM/ICoCoMEDField.hxx b/src/ParaMEDMEM/ICoCoMEDField.hxx index 63dbbeb4a..e43512ad3 100644 --- a/src/ParaMEDMEM/ICoCoMEDField.hxx +++ b/src/ParaMEDMEM/ICoCoMEDField.hxx @@ -20,7 +20,7 @@ #ifndef __ICOCOMEDFIELD_HXX__ #define __ICOCOMEDFIELD_HXX__ -#include "ICoCoField.h" +#include "ICoCoField.hxx" #include "MEDCouplingUMesh.hxx" #include "MEDCouplingFieldDouble.hxx" diff --git a/src/ParaMEDMEM/ICoCoTrioField.cxx b/src/ParaMEDMEM/ICoCoTrioField.cxx index 173cd3323..0b18196c2 100644 --- a/src/ParaMEDMEM/ICoCoTrioField.cxx +++ b/src/ParaMEDMEM/ICoCoTrioField.cxx @@ -20,7 +20,7 @@ // ICoCoTrioField.cpp // version 1.2 10/05/2010 -#include +#include #include #include #include diff --git a/src/ParaMEDMEM/ICoCoTrioField.h b/src/ParaMEDMEM/ICoCoTrioField.h deleted file mode 100644 index 8d9f4703d..000000000 --- a/src/ParaMEDMEM/ICoCoTrioField.h +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright (C) 2007-2010 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 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 -// -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// -// ICoCo file common to several codes -// ICoCoTrioField.h -// version 1.2 10/05/2010 - -#ifndef _ICoCoTrioField_included_ -#define _ICoCoTrioField_included_ - -#include -namespace ICoCo { - - ////////////////////////////////////////////////////////////////////////////// - // - // .DESCRIPTION - // class TrioField, used for coupling Trio codes via the ICoCo interface - // This structure contains all the necessary information - // for constructing a ParaMEDMEM::ParaFIELD (with the addition of the MPI - // communicator). - // This structure can either own or not _field values (_has_field_ownership) - // For _coords, _connectivity and _field, a null pointer means no data allocated. - // _coords and _connectivity tables, when allocated, are always owned by the TrioField. - // - ////////////////////////////////////////////////////////////////////////////// - class TrioField:public Field { - public: - - TrioField(); - TrioField(const TrioField& OtherField); - ~TrioField(); - void clear(); - void set_standalone(); - void dummy_geom(); - TrioField& operator=(const TrioField& NewField); - void save(std::ostream& os) const; - void restore(std::istream& in); - int nb_values() const ; - - public: - int _type ; // 0 elem 1 nodes - int _mesh_dim; - int _space_dim; - int _nbnodes; - int _nodes_per_elem; - int _nb_elems; - int _itnumber; - int* _connectivity; - double* _coords; - - double _time1,_time2; - int _nb_field_components; - double* _field; - bool _has_field_ownership; - }; -} - -#endif diff --git a/src/ParaMEDMEM/ICoCoTrioField.hxx b/src/ParaMEDMEM/ICoCoTrioField.hxx new file mode 100644 index 000000000..738e312ea --- /dev/null +++ b/src/ParaMEDMEM/ICoCoTrioField.hxx @@ -0,0 +1,73 @@ +// Copyright (C) 2007-2010 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 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 +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// ICoCo file common to several codes +// ICoCoTrioField.h +// version 1.2 10/05/2010 + +#ifndef _ICoCoTrioField_included_ +#define _ICoCoTrioField_included_ + +#include +namespace ICoCo { + + ////////////////////////////////////////////////////////////////////////////// + // + // .DESCRIPTION + // class TrioField, used for coupling Trio codes via the ICoCo interface + // This structure contains all the necessary information + // for constructing a ParaMEDMEM::ParaFIELD (with the addition of the MPI + // communicator). + // This structure can either own or not _field values (_has_field_ownership) + // For _coords, _connectivity and _field, a null pointer means no data allocated. + // _coords and _connectivity tables, when allocated, are always owned by the TrioField. + // + ////////////////////////////////////////////////////////////////////////////// + class TrioField:public Field { + public: + + TrioField(); + TrioField(const TrioField& OtherField); + ~TrioField(); + void clear(); + void set_standalone(); + void dummy_geom(); + TrioField& operator=(const TrioField& NewField); + void save(std::ostream& os) const; + void restore(std::istream& in); + int nb_values() const ; + + public: + int _type ; // 0 elem 1 nodes + int _mesh_dim; + int _space_dim; + int _nbnodes; + int _nodes_per_elem; + int _nb_elems; + int _itnumber; + int* _connectivity; + double* _coords; + + double _time1,_time2; + int _nb_field_components; + double* _field; + bool _has_field_ownership; + }; +} + +#endif diff --git a/src/ParaMEDMEM/Makefile.am b/src/ParaMEDMEM/Makefile.am index 8d68675a1..5bc571a2b 100644 --- a/src/ParaMEDMEM/Makefile.am +++ b/src/ParaMEDMEM/Makefile.am @@ -41,9 +41,9 @@ InterpKernelDEC.hxx\ ExplicitCoincidentDEC.hxx\ ElementLocator.hxx\ ExplicitMapping.hxx\ -ICoCoField.h \ +ICoCoField.hxx \ ICoCoMEDField.hxx \ -ICoCoTrioField.h \ +ICoCoTrioField.hxx \ MPIAccess.hxx \ MPIAccessDEC.hxx \ TimeInterpolator.hxx \ diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest_Gauthier1.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_Gauthier1.cxx index 31421641f..11c582843 100644 --- a/src/ParaMEDMEMTest/ParaMEDMEMTest_Gauthier1.cxx +++ b/src/ParaMEDMEMTest/ParaMEDMEMTest_Gauthier1.cxx @@ -28,7 +28,7 @@ #include "InterpKernelDEC.hxx" #include #include -#include "ICoCoTrioField.h" +#include "ICoCoTrioField.hxx" #include #include #include diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest_ICocoTrio.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_ICocoTrio.cxx index e4137c0e7..386491362 100644 --- a/src/ParaMEDMEMTest/ParaMEDMEMTest_ICocoTrio.cxx +++ b/src/ParaMEDMEMTest/ParaMEDMEMTest_ICocoTrio.cxx @@ -26,7 +26,7 @@ #include "InterpKernelDEC.hxx" #include #include -#include "ICoCoTrioField.h" +#include "ICoCoTrioField.hxx" #include #include