Changeset 2307

Timestamp:

2008-08-03T15:42:43Z (15 years ago)

Author:

peter

Message:

Merge r2292, r2306 from mainline - fix for PR76.

File:

• branches/c08_branch/source/cont_setintensity.cpp (modified) (1 diff)

branches/c08_branch/source/cont_setintensity.cpp

@@ -217 +217 @@
                                 i , rfield.anu[i] , (amean2/amean) , amean2 , amean );*/
                         rfield.anu[i] = (realnum)(amean2/amean);
-                        /* define array of LOG10( nu(ryd)) */
+                        rfield.anu2[i] = (realnum)(amean3/amean);
+                        /* mesh must be strictly monotonically increasing - make it so */
+                        if( i > 0 && rfield.anu[i] <= rfield.anu[i-1] )
+                        {
+                                /* prevent roundoff from allowing i cell to lie below i-1
+                                 * cell when continuum mesh is very fine. */
+                                /* use 2*epsilon to protect against unusual rounding modes */
+                                rfield.anu[i] = rfield.anu[i-1]*(1.f+2.f*FLT_EPSILON);
+                                rfield.anu2[i] = pow2(rfield.anu[i]);
+                        }
+                        ASSERT( rfield.anu[i] > rfield.anu[i-1] );
+                        /* define array of LOG10( nu(ryd) ) */
                         rfield.anulog[i] = (realnum)log10(rfield.anu[i]);
-                        if( i )
-                        {
-                                /* prevent roundoff from allowing i cell to lie below i-1
-                                 * cell when continuum mesh is very fine */
-                                rfield.anu[i] = MAX2( rfield.anu[i] , rfield.anu[i-1]*(1.f+FLT_EPSILON) );
-                                ASSERT( rfield.anu[i] > rfield.anu[i-1] );
-                                rfield.anulog[i] = MAX2( rfield.anulog[i] , rfield.anulog[i-1]*(1.f+FLT_EPSILON) );
-                                ASSERT( rfield.anulog[i] > rfield.anulog[i-1] );
-                        }
-                        rfield.anu2[i] = (realnum)(amean3/amean);
                 }