Changeset 277 in Sophya for trunk/SophyaLib/BaseTools/ndatablock.cc

Timestamp:

Apr 28, 1999, 3:36:07 PM (26 years ago)

Author:

ansari

Message:

Amelioration (?) ObjFileIO<T> Reza 28/04/99

File:

• trunk/SophyaLib/BaseTools/ndatablock.cc (modified) (9 diffs)

trunk/SophyaLib/BaseTools/ndatablock.cc

@@ -608 +608 @@
 */
 
+// Pour pouvoir ecrire des tableaux de complex, en attendant 
+// PIn/POutPersist::Get/Put(complex<>)
+#include <piocmplx.h>
+
 template <class T>
 FIO_NDataBlock<T>::FIO_NDataBlock()
 {
 dobj=new NDataBlock<T>;
+ownobj=true;
 }
 
@@ -617 +622 @@
 FIO_NDataBlock<T>::FIO_NDataBlock(string const & filename) 
 {
-dobj=new NDataBlock<T>; 
+dobj=new NDataBlock<T>;
+ownobj=true; 
 Read(filename);
 }
@@ -624 +630 @@
 FIO_NDataBlock<T>::FIO_NDataBlock(const NDataBlock<T> & obj) 
 { 
-dobj = new NDataBlock<T>(obj); 
-}
-
-template <class T>
-FIO_NDataBlock<T>::FIO_NDataBlock(const NDataBlock<T> * obj) 
+dobj = new NDataBlock<T>(obj);
+ownobj=true; 
+}
+
+template <class T>
+FIO_NDataBlock<T>::FIO_NDataBlock(NDataBlock<T> * obj) 
 { 
-dobj = new NDataBlock<T>(*obj); 
+dobj = obj;
+ownobj=false; 
 }
 
@@ -636 +644 @@
 FIO_NDataBlock<T>::~FIO_NDataBlock()
 {
-if (dobj) delete dobj;
+if (ownobj && dobj) delete dobj;
 }
 
@@ -653 +661 @@
 is.Get(itab, 3);
 if (dobj == NULL) dobj = new NDataBlock<T>(itab[1]);
-else dobj->ReSize(itab[1]);
+else dobj->ReSize(itab[1], false);
 // On lit le tableau de nombres
 PIOSReadArray(is, dobj->Data(), dobj->Size()); 
@@ -681 +689 @@
 #pragma define_template NDataBlock<int_4>
 #pragma define_template NDataBlock<int_8>
-#pragma define_template NDataBlock<uint_2>
 #pragma define_template NDataBlock<uint_4>
 #pragma define_template NDataBlock<uint_8>
@@ -694 +701 @@
 #pragma define_template FIO_NDataBlock<int_4>
 #pragma define_template FIO_NDataBlock<int_8>
-#pragma define_template FIO_NDataBlock<uint_2>
 #pragma define_template FIO_NDataBlock<uint_4>
 #pragma define_template FIO_NDataBlock<uint_8>
@@ -710 +716 @@
 template class NDataBlock<int_4>;
 template class NDataBlock<int_8>;
-template class NDataBlock<uint_2>;
 template class NDataBlock<uint_4>;
 template class NDataBlock<uint_8>;
@@ -723 +728 @@
 template class FIO_NDataBlock<int_4>;
 template class FIO_NDataBlock<int_8>;
-template class FIO_NDataBlock<uint_2>;
 template class FIO_NDataBlock<uint_4>;
 template class FIO_NDataBlock<uint_8>;