From 079b86c551d654a555c6fb6e78c31526827b0df2 Mon Sep 17 00:00:00 2001 From: inv Date: Mon, 21 Mar 2011 09:40:25 +0000 Subject: [PATCH] Porting to MED 3.0 --- src/SMESH_I/SMESH_MEDMesh_i.cxx | 23 +++-------------------- src/SMESH_I/SMESH_MEDMesh_i.hxx | 7 ------- src/SMESH_I/SMESH_subMesh_i.cxx | 2 +- 3 files changed, 4 insertions(+), 28 deletions(-) diff --git a/src/SMESH_I/SMESH_MEDMesh_i.cxx b/src/SMESH_I/SMESH_MEDMesh_i.cxx index 470476695..ac16b4186 100644 --- a/src/SMESH_I/SMESH_MEDMesh_i.cxx +++ b/src/SMESH_I/SMESH_MEDMesh_i.cxx @@ -510,8 +510,7 @@ CORBA::Long SMESH_MEDMesh_i::getNumberOfElements(SALOME_MED:: */ //============================================================================= SALOME_TYPES::ListOfLong * -SMESH_MEDMesh_i::getConnectivity(SALOME_MED::medModeSwitch typeSwitch, - SALOME_MED::medConnectivity mode, +SMESH_MEDMesh_i::getConnectivity(SALOME_MED::medConnectivity mode, SALOME_MED::medEntityMesh entity, SALOME_MED::medGeometryElement geomElement) throw(SALOME::SALOME_Exception) @@ -521,8 +520,8 @@ SMESH_MEDMesh_i::getConnectivity(SALOME_MED::medModeSwitch typeSwitch, SALOME::INTERNAL_ERROR); if (mode != SALOME_MED::MED_NODAL) THROW_SALOME_CORBA_EXCEPTION("Not Implemented", SALOME::BAD_PARAM); - if (typeSwitch == SALOME_MED::MED_NO_INTERLACE) - THROW_SALOME_CORBA_EXCEPTION("Not Yet Implemented", SALOME::BAD_PARAM); + /*if (typeSwitch == SALOME_MED::MED_NO_INTERLACE) + THROW_SALOME_CORBA_EXCEPTION("Not Yet Implemented", SALOME::BAD_PARAM);*/ if (!_compte) calculeNbElts(); @@ -536,22 +535,6 @@ SMESH_MEDMesh_i::getConnectivity(SALOME_MED::medModeSwitch typeSwitch, return _seq_elemId[index]._retn(); } -//============================================================================= -/*! - * CORBA: Accessor for connectivities - */ -//============================================================================= -SALOME_TYPES::ListOfLong * -SMESH_MEDMesh_i::getConnectivity(SALOME_MED::medConnectivity mode, - SALOME_MED::medEntityMesh entity, - SALOME_MED::medGeometryElement geomElement) - throw(SALOME::SALOME_Exception) -{ - MESSAGE("Pas Implemente dans SMESH"); - THROW_SALOME_CORBA_EXCEPTION("Unimplemented Method", SALOME::BAD_PARAM); - return 0; -} - //============================================================================= /*! * CORBA: Accessor for connectivities diff --git a/src/SMESH_I/SMESH_MEDMesh_i.hxx b/src/SMESH_I/SMESH_MEDMesh_i.hxx index 1811fe18b..610438cef 100644 --- a/src/SMESH_I/SMESH_MEDMesh_i.hxx +++ b/src/SMESH_I/SMESH_MEDMesh_i.hxx @@ -144,13 +144,6 @@ public: SALOME_MED::medGeometryElement geomElement) throw(SALOME::SALOME_Exception); - SALOME_TYPES::ListOfLong * - getConnectivity(SALOME_MED::medModeSwitch typeSwitch, - SALOME_MED::medConnectivity mode, - SALOME_MED::medEntityMesh entity, - SALOME_MED::medGeometryElement geomElement) - throw(SALOME::SALOME_Exception); - SALOME_TYPES::ListOfLong * getConnectivity(SALOME_MED::medConnectivity mode, SALOME_MED::medEntityMesh entity, diff --git a/src/SMESH_I/SMESH_subMesh_i.cxx b/src/SMESH_I/SMESH_subMesh_i.cxx index 7614f296a..45d486733 100644 --- a/src/SMESH_I/SMESH_subMesh_i.cxx +++ b/src/SMESH_I/SMESH_subMesh_i.cxx @@ -482,7 +482,7 @@ SALOME_MED::FAMILY_ptr SMESH_subMesh_i::GetFamily() throw (SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); - SALOME_MED::GMESH_var MEDMesh = GetFather()->GetMEDMesh(); + SALOME_MED::MESH_var MEDMesh = GetFather()->GetMEDMesh(); SALOME_MED::Family_array_var families = MEDMesh->getFamilies(SALOME_MED::MED_NODE); -- 2.39.2