Changeset 1846 for branches/newmole/source

Timestamp:

03/15/08 05:40:05 (8 months ago)

Author:

rjrw

Message:

Fix most VS warnings

Fix bug in ordering of reactants (made obvious by VS warning on
unreachable code).

Switch off extended grain network, to get better A/B comparison with
trunk code -- previously Si freeze-out on to grains stopped CO forming
deep in pdr_leiden_f1.

Location:

branches/newmole/source

Files:

• cddrive.cpp (modified) (1 diff)
• cont_ipoint.cpp (modified) (1 diff)
• grains_mie.cpp (modified) (1 diff)
• heat_sum.cpp (modified) (1 diff)
• hydro_bauman.cpp (modified) (3 diffs)
• mole_drive.cpp (modified) (1 diff)
• mole_eval_balance.cpp (modified) (1 diff)
• mole_h2.cpp (modified) (1 diff)
• mole_reactions.cpp (modified) (5 diffs)
• mole_species.cpp (modified) (5 diffs)
• nemala2.cpp (modified) (1 diff)
• thirdparty.cpp (modified) (1 diff)

branches/newmole/source/cddrive.cpp

@@ -523 +523 @@
                 fprintf( ioQQQ, "Sorry.\n" );
                 cdEXIT(EXIT_FAILURE);
-                return 0.0;
         }
 }

branches/newmole/source/cont_ipoint.cpp

@@ -52 +52 @@
           energy_ryd );
         cdEXIT(EXIT_FAILURE);
-        return ipoint_v;
 }
 

branches/newmole/source/grains_mie.cpp

@@ -3427 +3427 @@
         ShowMe();
         cdEXIT(EXIT_FAILURE);
-        return x0;
 }
 

branches/newmole/source/heat_sum.cpp

@@ -106 +106 @@
                 /* add in if real molecule and not counted above */
                 if(mole.list[i]->location == NULL && mole.list[i]->charge == 0)
-                        xNeutralParticleDensity += mole.list[i]->den;
+                        xNeutralParticleDensity += (realnum)mole.list[i]->den;
         }
 

branches/newmole/source/hydro_bauman.cpp

@@ -1096 +1096 @@
                 cdEXIT(EXIT_FAILURE);
         }
-        return 0.0;
 }
 
@@ -1282 +1281 @@
         printf( "This code should be inaccessible\n\n" );
         cdEXIT(EXIT_FAILURE);
-        return null_mx;
 }
 
@@ -3454 +3452 @@
         printf(" This code should be inaccessible\n\n");
         cdEXIT(EXIT_FAILURE);
-        return 0.0;
 }
 

branches/newmole/source/mole_drive.cpp

@@ -786 +786 @@
 
                 }
-                return;
         }
 

branches/newmole/source/mole_eval_balance.cpp

@@ -114 +114 @@
                                         if (sp->nElem[nelem] != 0)
                                         {
-                                                mole.xMoleChTrRate[nelem][sp->charge][rate->rvector[i]->charge] += rate_deriv[i];
+                                                mole.xMoleChTrRate[nelem][sp->charge][rate->rvector[i]->charge] += (realnum) rate_deriv[i];
                                                 break;
                                         }

branches/newmole/source/mole_h2.cpp

@@ -114 +114 @@
         collider_density[4] = dense.xIonDense[ipHYDROGEN][1];
         /* H3+ - assume that H3+ has same rates as proton */
-        collider_density[4] += findspecies("H3+")->den;
+        collider_density[4] += (realnum)findspecies("H3+")->den;
 
         ASSERT( fp_equal(hmi.H2_total ,collider_density[2]+collider_density[3]) );

branches/newmole/source/mole_reactions.cpp

@@ -1693 +1693 @@
                 if (a.reactants[i]<b.reactants[i])
                         return true;
-                else
+                else if (a.reactants[i]>b.reactants[i])
                         return false;
         }
@@ -1700 +1700 @@
                 if (a.products[i]<b.products[i])
                         return true;
-                else
+                else if (a.products[i]>b.products[i])
                         return false;
         }
@@ -1708 +1708 @@
 struct udfa_reaction_s {
   int index;
-        struct formula_species l;
+  formula_species l;
   char source;            /* Calculated, Estimated, Literature compilation, Measured */
   double a, b, c, trange[2]; /* Overall scale and valid temperature range */
 };
-static map <struct formula_species,struct udfa_reaction_s *> udfatab;
+static map <formula_species,struct udfa_reaction_s *> udfatab;
 
 STATIC void read_data(const char file[], void (*parse)(char *s))
@@ -1738 +1738 @@
   char *f;
         struct udfa_reaction_s *r;
-        map <struct formula_species, struct udfa_reaction_s *>::iterator p;
+        map <formula_species, struct udfa_reaction_s *>::iterator p;
         unsigned int havespecies = 1, i, n;
         /* lgCRPHOT is true for CRPHOT reactions as we change the data
@@ -1845 +1845 @@
 STATIC void compare_udfa(struct mole_reaction_s *rate)
 {
-        struct formula_species s;
+        formula_species s;
         unsigned int n;
-        map<struct formula_species,     struct udfa_reaction_s *>::iterator p;
+        map<formula_species,    struct udfa_reaction_s *>::iterator p;
         struct udfa_reaction_s *u;
 

branches/newmole/source/mole_species.cpp

@@ -230 +230 @@
                 sp = newspecies("H2Ogrn",MOLECULE,MOLE_ACTIVE,NULL,1.00e-15, -238.9f);
                 sp = newspecies("OHgrn ",MOLECULE,MOLE_ACTIVE,NULL,1.00e-15, 38.4f);
-                if (1)
+                if (0)
                 {
                         sp = newspecies("Cgrn  ",MOLECULE,MOLE_ACTIVE,NULL,1.00e-15, 711.2f);
@@ -650 +650 @@
                 }
 
-                mole.grain_area = den_times_area;
-                mole.grain_density = den_grains;
+                mole.grain_area = (realnum) den_times_area;
+                mole.grain_density = (realnum) den_grains;
 
                 double mole_cs = 1e-15;
@@ -657 +657 @@
                         mole.grain_saturation = 1.0;
                 else
-                        mole.grain_saturation = 4*den_times_area/(mole_cs*adsorbed_density);
+                        mole.grain_saturation = (realnum) 4*den_times_area/(mole_cs*adsorbed_density);
         }
         else
@@ -690 +690 @@
                 if(mole.list[i]->location && mole.list[i]->state == MOLE_ACTIVE) 
                 {
-                        *(mole.list[i]->location) = mole.list[i]->den;
+                        *(mole.list[i]->location) = (realnum) mole.list[i]->den;
                 }
         }
@@ -765 +765 @@
                         for( nelem=ipHYDROGEN; nelem<LIMELM; ++nelem )
                         {
-                                total[nelem] += mole.list[i]->den*mole.list[i]->nElem[nelem];
+                                total[nelem] += (realnum) mole.list[i]->den*mole.list[i]->nElem[nelem];
                         }
                 }

branches/newmole/source/nemala2.cpp

@@ -51 +51 @@
                                 fprintf(ioQQQ," PROBLEM atmol_popsolve did not find molecular species %li\n",i);
                         }
-                        abund = SpeciesCurrent->den;
+                        abund = (realnum) SpeciesCurrent->den;
                 }
                 else

branches/newmole/source/thirdparty.cpp

@@ -1 @@
-/* This file contains routines (perhaps in modified form) written by third parties.
+/* This file contains routines (perhaps in moified form) written by third parties.
  * Use and distribution of these works are determined by their respective copyrights. */
 #include "cddefines.h"