update from the MedMemory V1.0.1

[modules/med.git] / src / MEDMEM / test_MEDMEM_Array.cxx

diff --git a/src/MEDMEM/test_MEDMEM_Array.cxx b/src/MEDMEM/test_MEDMEM_Array.cxx
index af1de890646ead12170b0dadd2ed6138c40bd841..be5040b3e8686c523d3165227374df676494d89e 100644 (file)
--- a/src/MEDMEM/test_MEDMEM_Array.cxx
+++ b/src/MEDMEM/test_MEDMEM_Array.cxx
@@ -1,3 +1,4 @@
+using namespace std;
 #include "utilities.h"
 #include "MEDMEM_Array.hxx"
 
@@ -7,48 +8,53 @@ int main (int argc, char ** argv) {
   int NumberOfNodes = 4 ; 
   MEDARRAY<int> * myArray = new MEDARRAY<int>(SpaceDimension,NumberOfNodes,MED_FULL_INTERLACE) ;
 
-  int * value = myArray->get(MED_FULL_INTERLACE) ;
-  for (int i=0; i<SpaceDimension*NumberOfNodes; i++)
-    value[i]=i ; 
+  //const int * value = myArray->get(MED_FULL_INTERLACE) ;
+  for (int i=1; i<=NumberOfNodes; i++)
+    for (int j=1; j<=SpaceDimension; j++)
+      myArray->setIJ(i,j,i) ;
   
   int numberof ;
   MESSAGE("Show all 1 :");
   numberof = myArray->getLeadingValue() ;
   for (int i=1; i<=myArray->getLengthValue() ; i++) {
-    int * node = myArray->getI(MED_FULL_INTERLACE,i) ;
-    MESSAGE( " - " );
+    //int * node = myArray->getI(MED_FULL_INTERLACE,i) ;
+    const int * node = myArray->getRow(i) ;
+    cout << " - " ;
     for (int j=0;j<numberof;j++)
-      MESSAGE( node[j] << " " );
-    MESSAGE("");
+      cout << node[j] << " " ;
+    cout << endl ;
   }
   MESSAGE("Show all 2 :");
   numberof = myArray->getLengthValue() ;
   for (int i=1; i<=myArray->getLeadingValue() ; i++) {
-    int * node = myArray->getI(MED_NO_INTERLACE,i) ;
-    MESSAGE( " - " );
+    //int * node = myArray->getJ(MED_NO_INTERLACE,i) ;
+    const int * node = myArray->getColumn(i) ;
+    cout << " - " ;
     for (int j=0;j<numberof;j++)
-      MESSAGE( node[j] << " " );
-    MESSAGE("");
+      cout << node[j] << " " ;
+    cout << endl ;
   }
   MESSAGE("Show all 3 :");
   numberof = myArray->getLeadingValue() ;
   for (int i=1; i<=myArray->getLengthValue() ; i++) {
-    MESSAGE( " - " );
+    cout << " - " ;
     for (int j=1;j<numberof+1;j++)
-      MESSAGE( myArray->getIJ(i,j) << " " );
-    MESSAGE("");
+      cout << myArray->getIJ(i,j) << " " ;
+    cout << endl ;
   }
 
   MESSAGE("Show all 0 :");
   numberof = myArray->getLeadingValue() ;
   int length = myArray->getLengthValue() ;
-  int * NoInterlaceArray = myArray->get(MED_NO_INTERLACE) ;
+  const int * NoInterlaceArray = myArray->get(MED_NO_INTERLACE) ;
   for (int i=0; i<length ; i++) {
-    MESSAGE( " - " );
+    cout << " - " ;
     for (int j=0;j<numberof;j++)
-      MESSAGE( NoInterlaceArray[j*length+i] << " " );
-    MESSAGE("");
+      cout << NoInterlaceArray[j*length+i] << " " ;
+    cout << endl ;
   }
+
+  delete myArray ;
+
   return 0 ;
 }
-