From: eap Date: Tue, 12 Oct 2010 14:00:45 +0000 (+0000) Subject: Preparation of MEDMEM for SALOME 6x X-Git-Tag: V2_MEDMEM_PreparedForV6~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a2d11b826f771ff901ea4b22f2bc189f7ab4bc00;p=tools%2Fmedcoupling.git Preparation of MEDMEM for SALOME 6x remove code commented out --- diff --git a/doc/MEDMEM/FIELDcreate.cxx b/doc/MEDMEM/FIELDcreate.cxx index c5b2ce2cd..30451bab7 100644 --- a/doc/MEDMEM/FIELDcreate.cxx +++ b/doc/MEDMEM/FIELDcreate.cxx @@ -82,7 +82,7 @@ int main (int argc, char ** argv) { } // save this new field - //myField.write(MED_DRIVER,filename) ; + myField.write(MED_DRIVER,filename) ; return 0 ; } diff --git a/doc/MEDMEM/MEDMEM_Content.tex.in b/doc/MEDMEM/MEDMEM_Content.tex.in index 109e8bc66..f171e248c 100644 --- a/doc/MEDMEM/MEDMEM_Content.tex.in +++ b/doc/MEDMEM/MEDMEM_Content.tex.in @@ -434,30 +434,6 @@ int myNumber = myMesh.getElementNumber(MED_NODAL,MED_CELL, myElementConnectivity); \end{verbatim} -%%%%%%%%%%% WITH POLY METHODS %%%%%%%%%%%% - -\item The listed above methods do not take into account information about - \verb+polygonal+ and \verb+polyhedral+ cells contained in a MESH object. To get - full information about cell types, use the same methods with - \verb+WithPoly+ postfix: -\begin{itemize} -\item use \method{getNumberOfTypesWithPoly} to get the number of - geometric types for a mesh entity; -\item use \method{getTypesWithPoly} to get all geometric types for a mesh entity; -\item use \method{getNumberOfElementsWithPoly} to get the number of cells; -\item use \method{getElementTypeWithPoly} to get the geometric type of - one element. -\end{itemize} -There are separate methods to get number of polygons and polyhedrons: -\method{getNumberOfPolygons} and \method{getNumberOfPolyhedron} - -To get connectivity of polygonal elements, use \method{getPolygonsConnectivity} along with -\method{getPolygonsConnectivityIndex} (see example \myref{MESHconnectivities.cxx}). - -To get nodal connectivity of polyhedral elements, it is necessary use together -3 methods: \method{getPolyhedronConnectivity}, \method{getPolyhedronFacesIndex} -and \method{getPolyhedronIndex} (see example \myref{MESHconnectivities.cxx}). - \end{enumerate} Here is a small C++ example program which the Python version may be found in @@ -700,8 +676,7 @@ in increasing order of number of nodes for this type ; \item \method{setNumberOfElements} to set the number of elements for each geometric type. This method allocates connectivities array ; \item \method{setConnectivity} to set the connectivity in MED\_FULL\_INTERLACE -mode for each geometric type (use \method{setPolygonsConnectivity} and -\method{setPolyhedraConnectivity} for poly elements); +mode for each geometric type; \end{itemize} \textbf{C++ Example~:} diff --git a/doc/MEDMEM/MEDMEM_InvokingDriverAtObjectCreationTime.cxx b/doc/MEDMEM/MEDMEM_InvokingDriverAtObjectCreationTime.cxx index bd8e87c26..8fe5c483e 100644 --- a/doc/MEDMEM/MEDMEM_InvokingDriverAtObjectCreationTime.cxx +++ b/doc/MEDMEM/MEDMEM_InvokingDriverAtObjectCreationTime.cxx @@ -25,7 +25,6 @@ #include "MEDMEM_Field.hxx" #include "MEDMEM_Mesh.hxx" -#include "MEDMEM_Med.hxx" using namespace MEDMEM ; using namespace MED_EN ; @@ -44,9 +43,8 @@ main () { MESH myMesh (MED_DRIVER,fileName,meshName); // Test removal of drivers - //myField.rmDriver(); + myField.rmDriver(); myMesh.rmDriver (); - myMed.rmDriver (); } catch (MEDEXCEPTION& ex){ MESSAGE_MED(ex.what()) ; diff --git a/doc/MEDMEM/MEDMEM_InvokingDriverByAttachingItToAnObject.py b/doc/MEDMEM/MEDMEM_InvokingDriverByAttachingItToAnObject.py index 1fa1ba07e..714c93803 100644 --- a/doc/MEDMEM/MEDMEM_InvokingDriverByAttachingItToAnObject.py +++ b/doc/MEDMEM/MEDMEM_InvokingDriverByAttachingItToAnObject.py @@ -71,15 +71,3 @@ except : print "there is a problem in invoking mesh drivers !!" print "Please consult the error standart output of the python execution !!" -# try: -# myMed = MED() -# myRdOnlyDriver = MED_MED_RDONLY_DRIVER(medFile,myMed) -# myRdOnlyDriver.open() -# myRdOnlyDriver.readFileStruct() -# myRdOnlyDriver.close() -# myMed.updateSupport() - -# print "Invoking Med drivers OK" -# except : -# print "There is a problem in invoking MED drivers !!" -# print "Please consult the error standart output of the python execution !!" diff --git a/doc/MEDMEM/MEDMEM_InvokingDriverFromStandardObjectMethod.cxx b/doc/MEDMEM/MEDMEM_InvokingDriverFromStandardObjectMethod.cxx index 8a21f0993..8fb7cf3dc 100644 --- a/doc/MEDMEM/MEDMEM_InvokingDriverFromStandardObjectMethod.cxx +++ b/doc/MEDMEM/MEDMEM_InvokingDriverFromStandardObjectMethod.cxx @@ -25,7 +25,6 @@ #include "MEDMEM_Field.hxx" #include "MEDMEM_Mesh.hxx" -#include "MEDMEM_Med.hxx" using namespace MEDMEM ; using namespace MED_EN ; diff --git a/doc/MEDMEM/MEDMEM_MedAddingAnExistingObject.cxx b/doc/MEDMEM/MEDMEM_MedAddingAnExistingObject.cxx index e74ba51b6..e5558d0bc 100644 --- a/doc/MEDMEM/MEDMEM_MedAddingAnExistingObject.cxx +++ b/doc/MEDMEM/MEDMEM_MedAddingAnExistingObject.cxx @@ -25,7 +25,6 @@ #include "MEDMEM_Field.hxx" #include "MEDMEM_Mesh.hxx" -#include "MEDMEM_Med.hxx" main () { diff --git a/src/RENUMBER/renumbering.cxx b/src/RENUMBER/renumbering.cxx index adacff587..d5ef000c7 100644 --- a/src/RENUMBER/renumbering.cxx +++ b/src/RENUMBER/renumbering.cxx @@ -81,72 +81,6 @@ void computeNeighbour(const MESH* mesh,const medGeometryElement& Type, vector
  • & iperm) { -// if(Type==MED_POLYHEDRA) -// { -// int *conn_face_index_init=(int*)mesh.getPolyhedronFacesIndex(); -// int *conn_index_init=(int*)mesh.getPolyhedronIndex(MED_FULL_INTERLACE); -// int *conn_init=(int*)mesh.getPolyhedronConnectivity(MED_FULL_INTERLACE); - -// int *conn_index_renum=new int[nb_cell+1]; -// int *conn_face_index_renum=new int[conn_index_init[nb_cell]]; -// int *conn_renum=new int[conn_face_index_init[conn_index_init[nb_cell]-1]-1]; - -// int i_cell,i_face,i_conn; -// int iter_face=0; -// int iter_conn=0; -// int i2; -// conn_index_renum[0]=1; -// conn_face_index_renum[0]=1; -// for(i_cell=0;i_cell