Changeset 2096

Timestamp:

05/30/08 07:04:12 (3 months ago)

Author:

gary

Message:

add explicit casts to (realnum) to silence warnings in vs

Location:

branches/newmole/source

Files:

• conv_base.cpp (modified) (1 diff)
• molcol.cpp (modified) (1 diff)
• mole_drive.cpp (modified) (1 diff)
• mole_reactions.cpp (modified) (1 diff)
• mole_solve.cpp (modified) (1 diff)
• mole_species.cpp (modified) (1 diff)
• radius_increment.cpp (modified) (2 diffs)

branches/newmole/source/conv_base.cpp

@@ -618 +618 @@
                                                         iso.xIonSimple[ipISO][nelem]<1e-10) )
                                 {
-                                        const realnum err_tol = 1e-2;
+                                        const realnum err_tol = 1e-2f;
                                         realnum abund = 0.;
                                         for (long n=0; n<iso.numLevels_local[ipISO][nelem]; ++n)
                                         {
-                                                abund += StatesElem[ipISO][nelem][n].Pop;
+                                                abund += (realnum)StatesElem[ipISO][nelem][n].Pop;
                                         }
                                         if( conv.lgConvIoniz && iso.pop_ion_ov_neut[ipISO][nelem] > 1e-15 &&

branches/newmole/source/molcol.cpp

@@ -39 +39 @@
                 for( i=0; i < mole.num_calc; i++ )
                 {
-                        mole.list[i]->column += (realnum) mole.list[i]->den*radius.drad_x_fillfac;
+                        mole.list[i]->column += (realnum)(mole.list[i]->den*radius.drad_x_fillfac);
                 }
         }

branches/newmole/source/mole_drive.cpp

@@ -133 +133 @@
 
         /* total H2 - all forms */
-        hmi.H2_total = (realnum) findspecies("H2*")->den + findspecies("H2")->den;
+        hmi.H2_total = (realnum)(findspecies("H2*")->den + findspecies("H2")->den);
         /* first guess at ortho and para densities */
         h2.ortho_density = 0.75*hmi.H2_total;

branches/newmole/source/mole_reactions.cpp

@@ -1950 +1950 @@
         {
                 rate = p->second;
-                realnum oldrk = rate->rk;
+                realnum oldrk = (realnum)rate->rk;
                 ASSERT(rate->fun != NULL);
                 rate->rk = rate->a*rate->fun(rate);

branches/newmole/source/mole_solve.cpp

@@ -279 +279 @@
                 findspecies("H2*")->den = 0.;
 
-                hmi.H2_total = findspecies("H2")->den + findspecies("H2*")->den;
+                hmi.H2_total = (realnum)(findspecies("H2")->den + findspecies("H2*")->den);
                 /* first guess at ortho and para densities */
                 h2.ortho_density = 0.75*hmi.H2_total;

branches/newmole/source/mole_species.cpp

@@ -673 +673 @@
                         mole.grain_saturation = 1.0;
                 else
-                        mole.grain_saturation = (realnum) 4*den_times_area/(mole_cs*adsorbed_density);
+                        mole.grain_saturation = (realnum)(4.*den_times_area/(mole_cs*adsorbed_density));
         }
         else

branches/newmole/source/radius_increment.cpp

@@ -105 +105 @@
                                          * change is to only do this branch if abundance is large enough to be detected by
                                          * the ionization convergence solvers */
-                                        const realnum err_tol = 1e-2;
+                                        const realnum err_tol = 1e-2f;
                                         /* >>chng 05 sep 02, when low-T solver used solution is approximate,
                                          * and it must not matter (lot-T solver should not be used if it
@@ -114 +114 @@
                                         for (long n=0; n<iso.numLevels_local[ipISO][nelem]; ++n)
                                         {
-                                                abund += StatesElem[ipISO][nelem][n].Pop;
+                                                abund += (realnum)StatesElem[ipISO][nelem][n].Pop;
                                         }
                                         //fprintf(ioQQQ,"%.2f %ld %ld %11.4g %11.4g\n",fnzone,ipISO,nelem,