Changeset 1839 for branches/newmole/source

Timestamp:

03/09/08 17:20:59 (9 months ago)

Author:

rjrw

Message:

Remove some more likely counterproductive tests on iteration.

Files:

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

branches/newmole/source/mole_reactions.cpp

@@ -870 +870 @@
 
         binding_energy = rate->b;
-        /*>>chng 06 nov 28 only include source from molecules if we have an estimated first 
-         * solution - first test is that we have called mole at least twice,
-         * second test is that we are on a later iteration */
-        if( conv.nTotalIoniz > 1 || iteration > 1 )
-        {
-                for( nd=0; nd < gv.nBin; nd++ )
-                {
-                        exponent += exp(-binding_energy/gv.bin[nd]->tedust);
-                }       
-        }
+        for( nd=0; nd < gv.nBin; nd++ )
+        {
+                exponent += exp(-binding_energy/gv.bin[nd]->tedust);
+        }       
         number_of_sites = 1.5e15;
 
@@ -1137 +1131 @@
 STATIC double hopexch(struct mole_reaction_s *rate)
 {
-        if ( iteration==1 && conv.lgSearch )
-                return 0.;
-        else
-                return atmdat.HCharExcRecTo[ipOXYGEN][0];
+        return atmdat.HCharExcRecTo[ipOXYGEN][0];
 }
 STATIC double hpoexch(struct mole_reaction_s *rate)
 {
-        if ( iteration==1 && conv.lgSearch )
-                return 0.;
-        else
-                return atmdat.HCharExcIonOf[ipOXYGEN][0];
+        return atmdat.HCharExcIonOf[ipOXYGEN][0];
 }
 STATIC double hmattach(struct mole_reaction_s *rate)