Merge from V6_main; debug remains

diff --git a/doc/MEDMEM/FIELDcreate.cxx b/doc/MEDMEM/FIELDcreate.cxx
index a579b80a74588dbac217bed114bca8e3ddf892d8..393923c820ad629ba788753b0b89869918f431f4 100644 (file)
--- a/doc/MEDMEM/FIELDcreate.cxx
+++ b/doc/MEDMEM/FIELDcreate.cxx
@@ -36,7 +36,7 @@ int main (int argc, char ** argv) {
   MESH * myMesh = new MESH(MED_DRIVER,MedFile,MeshName) ;
 
   // we need a support :
-  SUPPORT * mySupport = new SUPPORT(myMesh,"Support on all CELLs",MED_CELL);
+  const SUPPORT * mySupport = myMesh->getSupportOnAll(MED_CELL);
 
   /* create FIELD on mySupport, with 3 components */
   int NumberOfCompoennts = 3 ;

diff --git a/doc/MEDMEM/FIELDcreate.py b/doc/MEDMEM/FIELDcreate.py
index c2dc59c3773793c5ca2351c64745e80e76841cad..ad0cbd2b0049f92d6a14cdc29e75bf1f424cae15 100644 (file)
--- a/doc/MEDMEM/FIELDcreate.py
+++ b/doc/MEDMEM/FIELDcreate.py
@@ -34,7 +34,7 @@ meshName = "maa1"
 
 myMesh = MESH(MED_DRIVER,MedFile,meshName)
 
-mySupport = SUPPORT(myMesh,"Support on all CELLs",MED_CELL)
+mySupport = myMesh.getSupportOnAll(MED_CELL)
 
 numberOfComponents = 3
 myField = FIELDDOUBLE(mySupport,numberOfComponents)

diff --git a/doc/MEDMEM/FIELDgeneral.cxx b/doc/MEDMEM/FIELDgeneral.cxx
index 0b9178de45170abb5e594f4ae88822e4eef81f52..548baff96c829a5b04ccb107ab8d3c47e083d65c 100644 (file)
--- a/doc/MEDMEM/FIELDgeneral.cxx
+++ b/doc/MEDMEM/FIELDgeneral.cxx
@@ -39,7 +39,7 @@ int main (int argc, char ** argv) {
 
   /* read FIELD */
   // we need a support :
-  SUPPORT * mySupport = new SUPPORT(myMesh,"Support on all Cells",MED_CELL);
+  const SUPPORT * mySupport = myMesh->getSupportOnAll(MED_CELL);
   FIELD<double> myField(mySupport,MED_DRIVER,MedFile,FieldName) ;
   //  myField.read() ;
 
@@ -77,7 +77,6 @@ int main (int argc, char ** argv) {
     cout << endl ;
   }
 
-  mySupport->removeReference();
   myMesh->removeReference();
 
   return 0 ;

diff --git a/doc/MEDMEM/FIELDgeneral.py b/doc/MEDMEM/FIELDgeneral.py
index c2bd995a89628972709cdc901d001e5873edf63f..659aa10d60b8dfe2a30eb50cbe2562278f207384 100644 (file)
--- a/doc/MEDMEM/FIELDgeneral.py
+++ b/doc/MEDMEM/FIELDgeneral.py
@@ -35,7 +35,7 @@ fieldName = "fieldcelldoublescalar"
 
 myMesh = MESH(MED_DRIVER,MedFile,meshName)
 
-mySupport = SUPPORT(myMesh,"Support on CELLs",MED_CELL)
+mySupport = myMesh.getSupportOnAll(MED_CELL)
 
 myField = FIELDDOUBLE(mySupport,MED_DRIVER,MedFile,fieldName,-1,-1)
 

diff --git a/doc/MEDMEM/MEDMEM_InvokingDriverAtObjectCreationTime.cxx b/doc/MEDMEM/MEDMEM_InvokingDriverAtObjectCreationTime.cxx
index 8fe5c483e49fb596c165fee714afd133cfbe3730..df5869e90d7b731b9d0c27167f896c22f1583eed 100644 (file)
--- a/doc/MEDMEM/MEDMEM_InvokingDriverAtObjectCreationTime.cxx
+++ b/doc/MEDMEM/MEDMEM_InvokingDriverAtObjectCreationTime.cxx
@@ -50,3 +50,4 @@ main () {
     MESSAGE_MED(ex.what()) ;
   }
 }
+

diff --git a/doc/MEDMEM/MEDMEM_InvokingDriverByAttachingItToAnObject.cxx b/doc/MEDMEM/MEDMEM_InvokingDriverByAttachingItToAnObject.cxx
index 2ec038ab6f2eedaa2521dbb4da9c8a8c271cf0fd..0197b43ed1da5de6b878334f0e975db656fd25c3 100644 (file)
--- a/doc/MEDMEM/MEDMEM_InvokingDriverByAttachingItToAnObject.cxx
+++ b/doc/MEDMEM/MEDMEM_InvokingDriverByAttachingItToAnObject.cxx
@@ -35,7 +35,7 @@ main () {
   const char * fileName   = "pointe.med";
   const char * fileName2  = "Field&MeshGeneratedPointe.med";
   const char * fileName3  = "MedGeneratedPointe.med";
-  const char * fieldName  = "fieldcelldouble";
+  const char * fieldName  = "fieldcelldoublescalar";
   const char * meshName   = "maa1";
 
   try {
@@ -45,14 +45,12 @@ main () {
       MED_FIELD_RDONLY_DRIVER<double> myRdOnlyDriver(fileName,myField);
       myRdOnlyDriver.setFieldName(fieldName);
       myRdOnlyDriver.open(); 
-      //This test failed due to inadequate Support implementation   
-      // myRdOnlyDriver.read();
+      myRdOnlyDriver.read();
       // try  { myRdOnlyDriver.write(); } catch  (MEDEXCEPTION& ex) 
       //   { MESSAGE(ex.what()); }
       MED_FIELD_WRONLY_DRIVER<double> myWrOnlyDriver(fileName2,myField);
       myWrOnlyDriver.open(); 
-      //This test failed due to inadequate Support implementation   
-      // myWrOnlyDriver.write(); 
+      myWrOnlyDriver.write(); 
       // try  myWrOnlyDriver.read(); catch  (MEDEXCEPTION& ex) 
       //   { MESSAGE(ex.what()); }
       myRdOnlyDriver.close();
@@ -75,9 +73,7 @@ main () {
       myWrOnlyDriver.write(); 
       // try  myWrOnlyDriver.read(); catch  (MEDEXCEPTION& ex)
       //   { MESSAGE(ex.what()); }
-      // myRdOnlyDriver.close(); 
-      //While we use H5close() in the MESH/FIELD drivers, the next
-      //line will fail, because all files are previously closed !
+      myRdOnlyDriver.close(); 
       myWrOnlyDriver.close();
       delete myMesh;
     }

diff --git a/doc/MEDMEM/MEDMEM_InvokingDriverByAttachingItToAnObject.py b/doc/MEDMEM/MEDMEM_InvokingDriverByAttachingItToAnObject.py
index 714c93803ef3b6467d9c8a43707ce1b87b4ee3dd..27f01397df6c9ef9247540f0a71341ae73d21395 100644 (file)
--- a/doc/MEDMEM/MEDMEM_InvokingDriverByAttachingItToAnObject.py
+++ b/doc/MEDMEM/MEDMEM_InvokingDriverByAttachingItToAnObject.py
@@ -53,17 +53,17 @@ except :
 
 try:
     myMesh = MESH()
+
     myRdOnlyDriver = MED_MESH_RDONLY_DRIVER(medFile,myMesh)
     myRdOnlyDriver.setMeshName(meshName)
     myRdOnlyDriver.open()
     myRdOnlyDriver.read()
     myRdOnlyDriver.close()
 
-    myWrOnlyDriver = MED_MESH_WRONLY_DRIVER(medFile,myMesh)
+    myWrOnlyDriver = MED_MESH_WRONLY_DRIVER(medFile2,myMesh)
     myWrOnlyDriver.setMeshName(meshName)
     myWrOnlyDriver.open()
     myWrOnlyDriver.write()
-
     myWrOnlyDriver.close()
 
     print "Invoking mesh drivers OK"

diff --git a/doc/MEDMEM/MEDMEM_InvokingDriverFromStandardObjectMethod.cxx b/doc/MEDMEM/MEDMEM_InvokingDriverFromStandardObjectMethod.cxx
index 8fb7cf3dca6a1af7d6a08c7253b080cf7cae25e8..abb22db69f3faf663ffc31a6a8f3c37cf8c387f5 100644 (file)
--- a/doc/MEDMEM/MEDMEM_InvokingDriverFromStandardObjectMethod.cxx
+++ b/doc/MEDMEM/MEDMEM_InvokingDriverFromStandardObjectMethod.cxx
@@ -40,12 +40,12 @@ main () {
     // Test creation of drivers from the standard driver method of an object
     FIELD<double> * myField = new FIELD<double>();
     int myDriver1 = myField->addDriver(MED_DRIVER, fileName, fieldName);
-    //myField->read();
+    myField->read();
     //This test failed due to inadequate Support implementation
     myField->rmDriver();  // TESTER LA VALIDITE DE myDriver2 !!!!
 
     int myDriver2 = myField->addDriver(MED_DRIVER, fileName2, fieldName);
-    //myField->write(myDriver2);
+    myField->write(myDriver2);
     //This test failed due to inadequate Support implementation
     myField->rmDriver(myDriver2);
 

diff --git a/doc/MEDMEM/MEDMEM_InvokingDriverFromStandardObjectMethod.py b/doc/MEDMEM/MEDMEM_InvokingDriverFromStandardObjectMethod.py
index aafefdeee0110f9822e5fc88135bda4e2604a86c..52bcf2e9031a0aec707b0237f228312986188c5b 100644 (file)
--- a/doc/MEDMEM/MEDMEM_InvokingDriverFromStandardObjectMethod.py
+++ b/doc/MEDMEM/MEDMEM_InvokingDriverFromStandardObjectMethod.py
@@ -30,7 +30,7 @@
 from libMEDMEM_Swig import *
 
 medFile = "pointe.med"
-medFile2 = "fieldCellDoubleOfpointe.me"
+medFile2 = "fieldCellDoubleOfpointe.med"
 fieldName = "fieldcelldoublescalar"
 meshName = "maa1"
 

diff --git a/doc/MEDMEM/MESHINGexample.py b/doc/MEDMEM/MESHINGexample.py
index a05a00319c6fbd0ad0c35c873870c7f13ae785e4..21e616a8ce24710d1f345f2f7489f7869f333d68 100644 (file)
--- a/doc/MEDMEM/MESHINGexample.py
+++ b/doc/MEDMEM/MESHINGexample.py
@@ -307,10 +307,10 @@ myMeshing.write(VTK_DRIVER,vtkFileName)
 #                         2 fields on nodes (cells) :
 #                         1 scalar (vector)
 
-supportOnNodes = SUPPORT(myMeshing,"On_All_Nodes",MED_NODE)
+supportOnNodes = myMeshing.getSupportOnAll(MED_NODE)
 numberOfNodes = supportOnNodes.getNumberOfElements(MEDMEM_ALL_ELEMENTS)
 
-supportOnCells = SUPPORT(myMeshing,"On_All_Cells",MED_CELL)
+supportOnCells = myMeshing.getSupportOnAll(MED_CELL)
 numberOfCells = supportOnCells.getNumberOfElements(MEDMEM_ALL_ELEMENTS)
 
 fieldDoubleScalarOnNodes = FIELDDOUBLE(supportOnNodes,1)