Changeset 711 for trunk/source/ion_solver.cpp

Timestamp:

12/12/06 18:11:31 (2 years ago)

Author:

rjrw

Message:

Eliminated BadMalloc? now MALLOC dies rather than returning on failure.

Files:

• trunk/source/ion_solver.cpp (modified) (1 diff)

trunk/source/ion_solver.cpp

@@ -214 +214 @@
 
                 /* this will be "new" matrix, with non-adjacent coupling included */
-                if( (xmat=(double*)MALLOC( (sizeof(double)*(unsigned)(ncell*ncell) ))) == NULL )
-                        BadMalloc();
-                if( (xmatsave=(double*)MALLOC( (sizeof(double)*(unsigned)(ncell*ncell) ))) == NULL )
-                        BadMalloc();
-                if( (sink=(double*)MALLOC( (sizeof(double)*(unsigned)ncell ))) == NULL )
-                        BadMalloc();
-                if( (source=(double*)MALLOC( (sizeof(double)*(unsigned)ncell ))) == NULL )
-                        BadMalloc();
-                if( (sourcesave=(double*)MALLOC( (sizeof(double)*(unsigned)ncell ))) == NULL )
-                        BadMalloc();
-                if( (ipiv=(int32*)MALLOC( (sizeof(int32)*(unsigned)ncell ))) == NULL )
-                        BadMalloc();
+                xmat=(double*)MALLOC( (sizeof(double)*(unsigned)(ncell*ncell) ));
+                xmatsave=(double*)MALLOC( (sizeof(double)*(unsigned)(ncell*ncell) ));
+                sink=(double*)MALLOC( (sizeof(double)*(unsigned)ncell ));
+                source=(double*)MALLOC( (sizeof(double)*(unsigned)ncell ));
+                sourcesave=(double*)MALLOC( (sizeof(double)*(unsigned)ncell ));
+                ipiv=(int32*)MALLOC( (sizeof(int32)*(unsigned)ncell ));
                 /* auger is used only for debug printout - it is special because with multi-electron
                  * Auger ejection, very high stages of ionization can be produced, well beyond
                  * the highest stage considered here.  so we malloc to the limit */
-                if( (auger=(double*)MALLOC( (sizeof(double)*(unsigned)(LIMELM+1) ))) == NULL )
-                        BadMalloc();
+                auger=(double*)MALLOC( (sizeof(double)*(unsigned)(LIMELM+1) ));
         }