Changeset 1838 for branches/newmole/source/mole_eval_balance.cpp

Timestamp:

03/09/08 16:59:05 (10 months ago)

Author:

rjrw

Message:

Minor changes to resulting from trying to chase down differences on
pdf_leiden_f1 --

ion_solver: allow molecule effects in first iteration,
iso_level: defensive programming for z[][]
mole_eval_balance: move some definitions for sp
mole_co_atom: add SDIV (aka fixit...) to prevent FPE in some circumstances

Files:

• branches/newmole/source/mole_eval_balance.cpp (modified) (3 diffs)

branches/newmole/source/mole_eval_balance.cpp

@@ -94 +94 @@
                 
                 for(i=0;i<rate->nreactants;i++)
-                {
+                {       
+                        sp = rate->reactants[i];
                         if (rate->rvector[i] == NULL)
                         {
-                                sp = rate->reactants[i];
                                 mole.zone[sp->index].snk += rate_deriv[i];
                                 if (sp == debug_species) 
@@ -112 +112 @@
                                 for( nelem=0; nelem< LIMELM; ++nelem )
                                 {
-                                        if (rate->reactants[i]->nElem[nelem] != 0)
+                                        if (sp->nElem[nelem] != 0)
                                         {
-                                                mole.xMoleChTrRate[nelem][rate->reactants[i]->charge][rate->rvector[i]->charge] += rate_deriv[i];
+                                                mole.xMoleChTrRate[nelem][sp->charge][rate->rvector[i]->charge] += rate_deriv[i];
                                                 break;
                                         }
@@ -123 +123 @@
                 for(i=0;i<rate->nproducts;i++)
                 {
+                        sp = rate->products[i];
                         if (rate->pvector[i] == NULL)
                         {
-                                sp = rate->products[i];
                                 mole.zone[sp->index].src += rate_tot;
                                 if (sp == debug_species)