Changeset 2155 for branches/c08_branch/source/radius_increment.cpp

Timestamp:

07/04/08 02:43:20 (5 months ago)

Author:

gary

Message:

bugfix for the bugfix - safe_div does not guard against div by 0 - back to using explicit test on magnitude of var

Files:

• branches/c08_branch/source/radius_increment.cpp (modified) (2 diffs)

branches/c08_branch/source/radius_increment.cpp

@@ -582 +582 @@
         cmshft();
 
+        relec *= EN1RYD;
+
+#       if 0
+        /* this is all evaluated in pressure_total */
+        /* radiative acceleration; xMassDensity is gm per cc, evaluated when PTOT called */
+        t = 1./SPEEDLIGHT/dense.xMassDensity;
+        /* >>chng 03 feb 01, lgLineRadPresOn was missing */
+        wind.AccelLine = (realnum)(RT_line_driving()*t)*pressure.lgLineRadPresOn;
+        /* >>chng 01 aug 03, add lgConPress to kill AccelCont here */
+        wind.AccelCont = (realnum)(rforce*EN1RYD*t)*pressure.lgContRadPresOn;
+        /* this is numerically unstable */
+        wind.AccelPres = 0.;
+        /* total acceleration */
+        wind.AccelTot = wind.AccelCont + wind.AccelLine + wind.AccelPres;
+#       endif
         /* remember the largest value */
         wind.AccelMax = (realnum)MAX2(wind.AccelMax,wind.AccelTot);
@@ -587 +602 @@
         /* force multiplier; relec can be zero for very low densities - so use double
          * form of safe_div - fmul is of order unity - wind.AccelLine and wind.AccelCont 
-         * are both floats to will underflow long before relec will - fmul is only use
+         * are both floats to will underflow long before relec will - fmul is only used
          * in output, not in any physics */
         relec *= (EN1RYD/SPEEDLIGHT/dense.xMassDensity);
-        wind.fmul = (realnum)safe_div( (double)(wind.AccelLine + wind.AccelCont) , 
-                relec );
+        if( relec > SMALLFLOAT )
+                wind.fmul = (realnum)( (wind.AccelLine + wind.AccelCont) / relec);
+        else
+                wind.fmul = 0.;
 
         /* keep track of average acceleration */