Changeset 1684 for branches/newmole/source

Timestamp:

12/16/07 11:53:30 (11 months ago)

Author:

rjrw

Message:

Remove some unused variables and redundant indexing.

Location:

branches/newmole/source

Files:

• mole.h (modified) (1 diff)
• mole_newton_step.cpp (modified) (8 diffs)
• mole_priv.h (modified) (1 diff)
• mole_reactions.cpp (modified) (1 diff)

branches/newmole/source/mole.h

@@ -239 +239 @@
 extern struct molecule **COmole;
 
-
 extern struct molecule *findspecies(const char buf[]);
 

branches/newmole/source/mole_newton_step.cpp

@@ -204 +204 @@
                                         for(i=0;i<mole.num_calc;i++) 
                                         {
+                                                ASSERT(COmole[i]->index == i);
                                                 sum = 0.;
                                                 for (ion=0;ion<N_MOLE_ION;ion++) 
@@ -209 +210 @@
                                                         if (element_list[nelem]->ipMl[ion] != -1)
                                                         {
-                                                                sum += fion[nelem][ion]*c[element_list[nelem]->ipMl[ion]][COmole[i]->index];
-                                                                c[element_list[nelem]->ipMl[ion]][COmole[i]->index] = 0.;
+                                                                sum += fion[nelem][ion]*c[element_list[nelem]->ipMl[ion]][i];
+                                                                c[element_list[nelem]->ipMl[ion]][i] = 0.;
                                                         }
                                                 }
-                                                c[element_list[nelem]->ipMl[0]][COmole[i]->index] = sum;
+                                                c[element_list[nelem]->ipMl[0]][i] = sum;
                                         }
                                 }
@@ -223 +224 @@
                                         for(i=0;i<mole.num_calc;i++) 
                                         {
+                                                ASSERT(COmole[i]->index == i);
                                                 sum = 0.0;
                                                 for (ion=0;ion<N_MOLE_ION;ion++)
@@ -228 +230 @@
                                                         if (element_list[nelem]->ipMl[ion] != -1)
                                                         {
-                                                                sum += c[COmole[i]->index][element_list[nelem]->ipMl[ion]];
-                                                                c[COmole[i]->index][element_list[nelem]->ipMl[ion]] = 0.;
+                                                                sum += c[i][element_list[nelem]->ipMl[ion]];
+                                                                c[i][element_list[nelem]->ipMl[ion]] = 0.;
                                                         }
                                                 }
-                                                c[COmole[i]->index][element_list[nelem]->ipMl[0]] = sum; 
+                                                c[i][element_list[nelem]->ipMl[0]] = sum; 
                                         }                                       
                                 }
@@ -275 +277 @@
                                                 for(i=0;i<mole.num_calc;i++)
                                                 {
-                                                        c[COmole[i]->index][element_list[nelem]->ipMl[0]] =
-                                                                COmole[i]->nElem[nelem]*scale;
+                                                        c[i][element_list[nelem]->ipMl[0]] = COmole[i]->nElem[nelem]*scale;
                                                 }
                                         }
@@ -326 +327 @@
                                 for( j=0; j < mole.num_calc; j++ )
                                 {
-                                        fprintf( ioQQQ, "%10.2e", c[COmole[j]->index][COmole[i]->index] );
-                                }
-                                fprintf( ioQQQ, "%10.2e", b[COmole[i]->index] );
+                                        fprintf( ioQQQ, "%10.2e", c[j][i] );
+                                }
+                                fprintf( ioQQQ, "%10.2e", b[i] );
                                 fprintf( ioQQQ, "\n" );
                         }
@@ -723 +724 @@
                 {
                         if (c)
-                                c[COmole[i]->index][COmole[i]->index] -= dynamics.Rate;
-
-                        b[COmole[i]->index] -= COmole[i]->hevmol*dynamics.Rate;
+                                c[i][i] -= dynamics.Rate;
+
+                        b[i] -= COmole[i]->hevmol*dynamics.Rate;
 
                         if (COmole[i]->n_nuclei != 1 || COmole[i]->nElec < 0)
                         {
-                                b[COmole[i]->index] += dynamics.molecules[i]*dynamics.Rate;
+                                b[i] += dynamics.molecules[i]*dynamics.Rate;
                         }
                         else if (COmole[i]->nElec == 0)
@@ -743 +744 @@
                                                 source -= dense.xIonDense[nelem][ion]*dynamics.Rate;
                                 }
-                                b[COmole[i]->index] += source;
+                                b[i] += source;
                         }
                 }

branches/newmole/source/mole_priv.h

@@ -36 +36 @@
         int udfastate;
         int source;
-        bool lgIndep;
 };
 

branches/newmole/source/mole_reactions.cpp

@@ -460 +460 @@
         rate->rk = 0.0;
         rate->source = source;
-        rate->lgIndep = true;
         for (i=0;i<MAXREACTANTS;i++)
         {