Preparation of MEDMEM for SALOME 6x

   remove code commented out

diff --git a/doc/MEDMEM/FIELDcreate.cxx b/doc/MEDMEM/FIELDcreate.cxx
index c5b2ce2cd50f01e2fd0dcdb2ee37bb679e12ad37..30451bab76f76d2f0ed2c5ca0746adb791ea710b 100644 (file)
--- 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 109e8bc66794b71285cd522993ec07bf92099a81..f171e248c0235f6530bcb46a4d80906a96373c89 100644 (file)
--- 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 bd8e87c26d771204149fabd0411a15afee1a1bbd..8fe5c483e49fb596c165fee714afd133cfbe3730 100644 (file)
--- 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 1fa1ba07e25709e7a373c3545a955e14635d1efc..714c93803ef3b6467d9c8a43707ce1b87b4ee3dd 100644 (file)
--- 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 8a21f099336473735ea7d8b5b84196cdd45d9e8f..8fb7cf3dca6a1af7d6a08c7253b080cf7cae25e8 100644 (file)
--- 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 e74ba51b6ad507c2798473ea69cd2c74d207a9a7..e5558d0bcf2460a609dfb4525ebae5b9b952370c 100644 (file)
--- 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 adacff5874639f3400414daa1f8bdcb79bb2466d..d5ef000c780bae9971cfadb1c44b316fcaac926a 100644 (file)
--- a/src/RENUMBER/renumbering.cxx
+++ b/src/RENUMBER/renumbering.cxx
@@ -81,72 +81,6 @@ void computeNeighbour(const MESH* mesh,const medGeometryElement& Type, vector<li
 
 void changeConnectivity(MESH& mesh, const medGeometryElement& Type, const int& nb_cell, const vector<int>& 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<nb_cell;++i_cell)
-//         {
-//           i2=iperm[i_cell]-1;
-//           for(i_face=conn_index_init[i2]-1;i_face<conn_index_init[i2+1]-1;++i_face)
-//             {
-//               for(i_conn=conn_face_index_init[i_face]-1;i_conn<conn_face_index_init[i_face+1]-1;++i_conn)
-//                 {
-//                   conn_renum[iter_conn]=conn_init[i_conn];
-//                   ++iter_conn;
-//                 }
-//               conn_face_index_renum[iter_face+1]=iter_conn+1;
-//               ++iter_face;
-//             }
-//           conn_index_renum[i_cell+1]=iter_face+1;
-//         }
-//       memcpy(conn_face_index_init,conn_face_index_renum,sizeof(int)*conn_index_init[nb_cell]);
-//       memcpy(conn_index_init,conn_index_renum,sizeof(int)*(nb_cell+1));
-//       memcpy(conn_init,conn_renum, sizeof(int)*(conn_face_index_init[conn_index_init[nb_cell]-1]-1));
-
-//       delete[] conn_index_renum;
-//       delete[] conn_face_index_renum;
-//       delete[] conn_renum;
-//     }
-//   else if (Type==MED_POLYGON)
-//     {
-//       int *conn_init=(int*)mesh.getPolygonsConnectivity(MED_FULL_INTERLACE,MED_CELL);
-//       int *conn_index_init=(int*)mesh.getPolygonsConnectivityIndex(MED_FULL_INTERLACE,MED_CELL);
-//       int *conn_index_renum=new int[nb_cell+1];
-//       int *conn_renum=new int[conn_index_init[nb_cell]-1];
-
-//       int iter=0;
-//       int i2;
-//       conn_index_renum[0]=1;
-//       for(int i=0;i<nb_cell;++i)
-//         {
-//           i2=iperm[i]-1;
-//           for(int k=conn_index_init[i2];k<conn_index_init[i2+1];++k)
-//             {
-//               conn_renum[iter]=conn_init[k-1];
-//               ++iter;
-//             }
-//           conn_index_renum[i+1]=iter+1;
-//         }
-//       memcpy(conn_index_init,conn_index_renum,sizeof(int)*(nb_cell+1));
-//       memcpy(conn_init,conn_renum, sizeof(int)*(conn_index_init[nb_cell]-1));
-
-//       delete[] conn_renum;
-//       delete[] conn_index_renum;
-//     }
-//   else
     {
       const int *conn_init=mesh.getConnectivity(MED_NODAL,MED_CELL,Type);
       const int *conn_index_init=mesh.getConnectivityIndex(MED_NODAL,MED_CELL);