Changeset 2055 for branches/newmole/source/mole_drive.cpp

Timestamp:

05/13/08 17:01:00 (8 months ago)

Author:

rjrw

Message:

Move further towards Householder projection method for of conservation
constraints

Some other tidyings (move from explicit pointers to multi_arr)

Files:

• branches/newmole/source/mole_drive.cpp (modified) (2 diffs)

branches/newmole/source/mole_drive.cpp

@@ -77 +77 @@
 
         valarray<double> b(mole.num_total); 
-        double **c;
-        long int i;
+        multi_arr<double,2> c(mole.num_total,mole.num_total);
 
         DEBUG_ENTRY( "mole_effects()" );
 
-        c = (double **)MALLOC((size_t)mole.num_total*sizeof(double *));
-        c[0] = (double *)MALLOC((size_t)mole.num_total*
-                                                                                                        mole.num_total*sizeof(double));
-        for(i=1;i<mole.num_total;i++)
-        {
-                c[i] = c[i-1]+mole.num_total;
-        }
-
-        mole_eval_balance(mole.num_total,&b[0],c);      
+        mole_eval_balance(mole.num_total,&b[0],true,c); 
 
         for (long int nelem=ipHYDROGEN;nelem<LIMELM;nelem++)
@@ -545 +536 @@
         }
 
-        free(c[0]);
-        free(c);
-
         mole_h_rate_diagnostics();