From e91d6a1ed264fb24252b00c48dc6149e8fec1524 Mon Sep 17 00:00:00 2001 From: ageay Date: Wed, 7 Aug 2013 10:30:03 +0000 Subject: [PATCH] Addition of the 2 new unstructured mesh types. --- idl/MEDCouplingCorbaServant.idl | 12 +++++ src/MEDCouplingCorba/CMakeLists.txt | 3 ++ src/MEDCouplingCorba/Client/CMakeLists.txt | 2 + .../Client/MEDCoupling1DGTUMeshClient.cxx | 34 ++++++++++++++ .../Client/MEDCoupling1DGTUMeshClient.hxx | 42 +++++++++++++++++ .../Client/MEDCoupling1SGTUMeshClient.cxx | 34 ++++++++++++++ .../Client/MEDCoupling1SGTUMeshClient.hxx | 42 +++++++++++++++++ .../MEDCoupling1DGTUMeshServant.cxx | 28 +++++++++++ .../MEDCoupling1DGTUMeshServant.hxx | 46 +++++++++++++++++++ .../MEDCoupling1GTUMeshServant.cxx | 28 +++++++++++ .../MEDCoupling1GTUMeshServant.hxx | 46 +++++++++++++++++++ .../MEDCoupling1SGTUMeshServant.cxx | 28 +++++++++++ .../MEDCoupling1SGTUMeshServant.hxx | 46 +++++++++++++++++++ 13 files changed, 391 insertions(+) create mode 100644 src/MEDCouplingCorba/Client/MEDCoupling1DGTUMeshClient.cxx create mode 100644 src/MEDCouplingCorba/Client/MEDCoupling1DGTUMeshClient.hxx create mode 100644 src/MEDCouplingCorba/Client/MEDCoupling1SGTUMeshClient.cxx create mode 100644 src/MEDCouplingCorba/Client/MEDCoupling1SGTUMeshClient.hxx create mode 100644 src/MEDCouplingCorba/MEDCoupling1DGTUMeshServant.cxx create mode 100644 src/MEDCouplingCorba/MEDCoupling1DGTUMeshServant.hxx create mode 100644 src/MEDCouplingCorba/MEDCoupling1GTUMeshServant.cxx create mode 100644 src/MEDCouplingCorba/MEDCoupling1GTUMeshServant.hxx create mode 100644 src/MEDCouplingCorba/MEDCoupling1SGTUMeshServant.cxx create mode 100644 src/MEDCouplingCorba/MEDCoupling1SGTUMeshServant.hxx diff --git a/idl/MEDCouplingCorbaServant.idl b/idl/MEDCouplingCorbaServant.idl index 85d2ac4f4..0a4d4355a 100644 --- a/idl/MEDCouplingCorbaServant.idl +++ b/idl/MEDCouplingCorbaServant.idl @@ -72,6 +72,18 @@ module SALOME_MED { }; + interface MEDCoupling1GTUMeshCorbaInterface : MEDCouplingPointSetCorbaInterface + { + }; + + interface MEDCoupling1SGTUMeshCorbaInterface : MEDCoupling1GTUMeshCorbaInterface + { + }; + + interface MEDCoupling1DGTUMeshCorbaInterface : MEDCoupling1GTUMeshCorbaInterface + { + }; + interface MEDCouplingExtrudedMeshCorbaInterface : MEDCouplingMeshCorbaInterface { }; diff --git a/src/MEDCouplingCorba/CMakeLists.txt b/src/MEDCouplingCorba/CMakeLists.txt index d71e3e223..f63798470 100644 --- a/src/MEDCouplingCorba/CMakeLists.txt +++ b/src/MEDCouplingCorba/CMakeLists.txt @@ -42,6 +42,9 @@ SET(medcouplingcorba_SOURCES MEDCouplingExtrudedMeshServant.cxx MEDCouplingStructuredMeshServant.cxx MEDCouplingCurveLinearMeshServant.cxx + MEDCoupling1DGTUMeshServant.cxx + MEDCoupling1SGTUMeshServant.cxx + MEDCoupling1GTUMeshServant.cxx MEDCouplingCMeshServant.cxx MEDCouplingUMeshServant.cxx MEDCouplingFieldServant.cxx diff --git a/src/MEDCouplingCorba/Client/CMakeLists.txt b/src/MEDCouplingCorba/Client/CMakeLists.txt index f087e1b37..90fb58210 100644 --- a/src/MEDCouplingCorba/Client/CMakeLists.txt +++ b/src/MEDCouplingCorba/Client/CMakeLists.txt @@ -31,6 +31,8 @@ SET(medcouplingclient_SOURCES DataArrayDoubleClient.cxx DataArrayIntClient.cxx MEDCouplingCMeshClient.cxx + MEDCoupling1SGTUMeshClient.cxx + MEDCoupling1DGTUMeshClient.cxx MEDCouplingCurveLinearMeshClient.cxx MEDCouplingExtrudedMeshClient.cxx MEDCouplingFieldDoubleClient.cxx diff --git a/src/MEDCouplingCorba/Client/MEDCoupling1DGTUMeshClient.cxx b/src/MEDCouplingCorba/Client/MEDCoupling1DGTUMeshClient.cxx new file mode 100644 index 000000000..e45a2c462 --- /dev/null +++ b/src/MEDCouplingCorba/Client/MEDCoupling1DGTUMeshClient.cxx @@ -0,0 +1,34 @@ +// Copyright (C) 2007-2013 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 +// +// Author : Anthony Geay (CEA/DEN) + +#include "MEDCoupling1DGTUMeshClient.hxx" +#include "MEDCouplingMeshClient.hxx" +#include "MEDCoupling1GTUMesh.hxx" + +#include + +using namespace ParaMEDMEM; + +MEDCoupling1DGTUMesh *MEDCoupling1DGTUMeshClient::New(SALOME_MED::MEDCoupling1DGTUMeshCorbaInterface_ptr meshPtr) +{ + MEDCoupling1DGTUMesh *ret=MEDCoupling1DGTUMesh::New(); + MEDCouplingMeshClient::fillMeshFromCorbaData(ret,meshPtr); + return ret; +} diff --git a/src/MEDCouplingCorba/Client/MEDCoupling1DGTUMeshClient.hxx b/src/MEDCouplingCorba/Client/MEDCoupling1DGTUMeshClient.hxx new file mode 100644 index 000000000..8173c9f1c --- /dev/null +++ b/src/MEDCouplingCorba/Client/MEDCoupling1DGTUMeshClient.hxx @@ -0,0 +1,42 @@ +// Copyright (C) 2007-2013 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 +// +// Author : Anthony Geay (CEA/DEN) + +#ifndef __MEDCOUPLING1DGTUMESHCLIENT_HXX__ +#define __MEDCOUPLING1DGTUMESHCLIENT_HXX__ + +#include "SALOMEconfig.h" +#ifdef WIN32 +#define NOMINMAX +#endif +#include CORBA_SERVER_HEADER(MEDCouplingCorbaServant) +#include "MEDCouplingClient.hxx" + +namespace ParaMEDMEM +{ + class MEDCoupling1DGTUMesh; + + class MEDCOUPLINGCLIENT_EXPORT MEDCoupling1DGTUMeshClient + { + public: + static MEDCoupling1DGTUMesh *New(SALOME_MED::MEDCoupling1DGTUMeshCorbaInterface_ptr mesh); + }; +} + +#endif diff --git a/src/MEDCouplingCorba/Client/MEDCoupling1SGTUMeshClient.cxx b/src/MEDCouplingCorba/Client/MEDCoupling1SGTUMeshClient.cxx new file mode 100644 index 000000000..6b32ceb5c --- /dev/null +++ b/src/MEDCouplingCorba/Client/MEDCoupling1SGTUMeshClient.cxx @@ -0,0 +1,34 @@ +// Copyright (C) 2007-2013 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 +// +// Author : Anthony Geay (CEA/DEN) + +#include "MEDCoupling1SGTUMeshClient.hxx" +#include "MEDCouplingMeshClient.hxx" +#include "MEDCoupling1GTUMesh.hxx" + +#include + +using namespace ParaMEDMEM; + +MEDCoupling1SGTUMesh *MEDCoupling1SGTUMeshClient::New(SALOME_MED::MEDCoupling1SGTUMeshCorbaInterface_ptr meshPtr) +{ + MEDCoupling1SGTUMesh *ret=MEDCoupling1SGTUMesh::New(); + MEDCouplingMeshClient::fillMeshFromCorbaData(ret,meshPtr); + return ret; +} diff --git a/src/MEDCouplingCorba/Client/MEDCoupling1SGTUMeshClient.hxx b/src/MEDCouplingCorba/Client/MEDCoupling1SGTUMeshClient.hxx new file mode 100644 index 000000000..19cb0afd9 --- /dev/null +++ b/src/MEDCouplingCorba/Client/MEDCoupling1SGTUMeshClient.hxx @@ -0,0 +1,42 @@ +// Copyright (C) 2007-2013 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 +// +// Author : Anthony Geay (CEA/DEN) + +#ifndef __MEDCOUPLING1SGTUMESHCLIENT_HXX__ +#define __MEDCOUPLING1SGTUMESHCLIENT_HXX__ + +#include "SALOMEconfig.h" +#ifdef WIN32 +#define NOMINMAX +#endif +#include CORBA_SERVER_HEADER(MEDCouplingCorbaServant) +#include "MEDCouplingClient.hxx" + +namespace ParaMEDMEM +{ + class MEDCoupling1SGTUMesh; + + class MEDCOUPLINGCLIENT_EXPORT MEDCoupling1SGTUMeshClient + { + public: + static MEDCoupling1SGTUMesh *New(SALOME_MED::MEDCoupling1SGTUMeshCorbaInterface_ptr mesh); + }; +} + +#endif diff --git a/src/MEDCouplingCorba/MEDCoupling1DGTUMeshServant.cxx b/src/MEDCouplingCorba/MEDCoupling1DGTUMeshServant.cxx new file mode 100644 index 000000000..ec0044839 --- /dev/null +++ b/src/MEDCouplingCorba/MEDCoupling1DGTUMeshServant.cxx @@ -0,0 +1,28 @@ +// Copyright (C) 2007-2013 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 +// +// Author : Anthony Geay (CEA/DEN) + +#include "MEDCoupling1DGTUMeshServant.hxx" +#include "MEDCoupling1GTUMesh.hxx" + +using namespace ParaMEDMEM; + +MEDCoupling1DGTUMeshServant::MEDCoupling1DGTUMeshServant(const MEDCoupling1DGTUMesh *cppPointerOfMesh):MEDCoupling1GTUMeshServant(cppPointerOfMesh) +{ +} diff --git a/src/MEDCouplingCorba/MEDCoupling1DGTUMeshServant.hxx b/src/MEDCouplingCorba/MEDCoupling1DGTUMeshServant.hxx new file mode 100644 index 000000000..987733c05 --- /dev/null +++ b/src/MEDCouplingCorba/MEDCoupling1DGTUMeshServant.hxx @@ -0,0 +1,46 @@ +// Copyright (C) 2007-2013 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 +// +// Author : Anthony Geay (CEA/DEN) + +#ifndef __MEDCOUPLING1DGTUMESHSERVANT_HXX__ +#define __MEDCOUPLING1DGTUMESHSERVANT_HXX__ + +#include "SALOMEconfig.h" +#ifdef WIN32 +#define NOMINMAX +#endif +#include CORBA_SERVER_HEADER(MEDCouplingCorbaServant) +#include "MEDCoupling1GTUMeshServant.hxx" +#include "MEDCouplingCorba.hxx" + +namespace ParaMEDMEM +{ + class MEDCoupling1DGTUMesh; + + class MEDCOUPLINGCORBA_EXPORT MEDCoupling1DGTUMeshServant : public MEDCoupling1GTUMeshServant, public virtual POA_SALOME_MED::MEDCoupling1DGTUMeshCorbaInterface + { + public: + typedef MEDCoupling1DGTUMesh CppType; + MEDCoupling1DGTUMeshServant(const MEDCoupling1DGTUMesh *cppPointerOfMesh); + protected: + const MEDCoupling1DGTUMesh *getPointer() const { return (const MEDCoupling1DGTUMesh *)_cpp_pointer; } + }; +} + +#endif diff --git a/src/MEDCouplingCorba/MEDCoupling1GTUMeshServant.cxx b/src/MEDCouplingCorba/MEDCoupling1GTUMeshServant.cxx new file mode 100644 index 000000000..81ffe23a9 --- /dev/null +++ b/src/MEDCouplingCorba/MEDCoupling1GTUMeshServant.cxx @@ -0,0 +1,28 @@ +// Copyright (C) 2007-2013 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 +// +// Author : Anthony Geay (CEA/DEN) + +#include "MEDCoupling1GTUMeshServant.hxx" +#include "MEDCoupling1GTUMesh.hxx" + +using namespace ParaMEDMEM; + +MEDCoupling1GTUMeshServant::MEDCoupling1GTUMeshServant(const MEDCoupling1GTUMesh *cppPointerOfMesh):MEDCouplingPointSetServant(cppPointerOfMesh) +{ +} diff --git a/src/MEDCouplingCorba/MEDCoupling1GTUMeshServant.hxx b/src/MEDCouplingCorba/MEDCoupling1GTUMeshServant.hxx new file mode 100644 index 000000000..6d7190406 --- /dev/null +++ b/src/MEDCouplingCorba/MEDCoupling1GTUMeshServant.hxx @@ -0,0 +1,46 @@ +// Copyright (C) 2007-2013 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 +// +// Author : Anthony Geay (CEA/DEN) + +#ifndef __MEDCOUPLING1GTUMESHSERVANT_HXX__ +#define __MEDCOUPLING1GTUMESHSERVANT_HXX__ + +#include "SALOMEconfig.h" +#ifdef WIN32 +#define NOMINMAX +#endif +#include CORBA_SERVER_HEADER(MEDCouplingCorbaServant) +#include "MEDCouplingPointSetServant.hxx" +#include "MEDCouplingCorba.hxx" + +namespace ParaMEDMEM +{ + class MEDCoupling1GTUMesh; + + class MEDCOUPLINGCORBA_EXPORT MEDCoupling1GTUMeshServant : public MEDCouplingPointSetServant, public virtual POA_SALOME_MED::MEDCoupling1GTUMeshCorbaInterface + { + public: + typedef MEDCoupling1GTUMesh CppType; + MEDCoupling1GTUMeshServant(const MEDCoupling1GTUMesh *cppPointerOfMesh); + protected: + const MEDCoupling1GTUMesh *getPointer() const { return (const MEDCoupling1GTUMesh *)_cpp_pointer; } + }; +} + +#endif diff --git a/src/MEDCouplingCorba/MEDCoupling1SGTUMeshServant.cxx b/src/MEDCouplingCorba/MEDCoupling1SGTUMeshServant.cxx new file mode 100644 index 000000000..cda0cfd44 --- /dev/null +++ b/src/MEDCouplingCorba/MEDCoupling1SGTUMeshServant.cxx @@ -0,0 +1,28 @@ +// Copyright (C) 2007-2013 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 +// +// Author : Anthony Geay (CEA/DEN) + +#include "MEDCoupling1SGTUMeshServant.hxx" +#include "MEDCoupling1GTUMesh.hxx" + +using namespace ParaMEDMEM; + +MEDCoupling1SGTUMeshServant::MEDCoupling1SGTUMeshServant(const MEDCoupling1SGTUMesh *cppPointerOfMesh):MEDCoupling1GTUMeshServant(cppPointerOfMesh) +{ +} diff --git a/src/MEDCouplingCorba/MEDCoupling1SGTUMeshServant.hxx b/src/MEDCouplingCorba/MEDCoupling1SGTUMeshServant.hxx new file mode 100644 index 000000000..810c093b6 --- /dev/null +++ b/src/MEDCouplingCorba/MEDCoupling1SGTUMeshServant.hxx @@ -0,0 +1,46 @@ +// Copyright (C) 2007-2013 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 +// +// Author : Anthony Geay (CEA/DEN) + +#ifndef __MEDCOUPLING1SGTUMESHSERVANT_HXX__ +#define __MEDCOUPLING1SGTUMESHSERVANT_HXX__ + +#include "SALOMEconfig.h" +#ifdef WIN32 +#define NOMINMAX +#endif +#include CORBA_SERVER_HEADER(MEDCouplingCorbaServant) +#include "MEDCoupling1GTUMeshServant.hxx" +#include "MEDCouplingCorba.hxx" + +namespace ParaMEDMEM +{ + class MEDCoupling1SGTUMesh; + + class MEDCOUPLINGCORBA_EXPORT MEDCoupling1SGTUMeshServant : public MEDCoupling1GTUMeshServant, public virtual POA_SALOME_MED::MEDCoupling1SGTUMeshCorbaInterface + { + public: + typedef MEDCoupling1SGTUMesh CppType; + MEDCoupling1SGTUMeshServant(const MEDCoupling1SGTUMesh *cppPointerOfMesh); + protected: + const MEDCoupling1SGTUMesh *getPointer() const { return (const MEDCoupling1SGTUMesh *)_cpp_pointer; } + }; +} + +#endif -- 2.39.2