Changeset 2042 for branches/newmole/source/mole_reactions.cpp

Timestamp:

05/11/08 12:53:42 (8 months ago)

Author:

rjrw

Message:

Change molecule structure to class

Make molecular column table easier to navigate (after Nick Abel's
suggestion).

Files:

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

branches/newmole/source/mole_reactions.cpp

@@ -450 +450 @@
 {
         struct mole_reaction_s *rate;
-        struct molecule    *sp;
+        molecule    *sp;
         ratefunc func;
         mole_reaction_i p;
@@ -558 +558 @@
                  required (look for references to "reactants[0]" for examples) */
         qsort((void *)rate->reactants,(size_t)rate->nreactants,
-                                sizeof(struct molecule *),mole_cmp);
+                                sizeof(molecule *),mole_cmp);
         qsort((void *)rate->products,(size_t)rate->nproducts,
-                                sizeof(struct molecule *),mole_cmp);
+                                sizeof(molecule *),mole_cmp);
 
         ASSERT(lgReactBalance(rate)); /* Verify rate conserves particles and charge */
@@ -1683 +1683 @@
 class formula_species {
 public:
-        struct molecule *reactants[MAXREACTANTS], *products[MAXPRODUCTS];
+        molecule *reactants[MAXREACTANTS], *products[MAXPRODUCTS];
 };
 
@@ -1767 +1767 @@
     }
   }
-        qsort((void *)r->l.reactants,(size_t)i,sizeof(struct molecule *),
+        qsort((void *)r->l.reactants,(size_t)i,sizeof(molecule *),
                                 mole_cmp);
 
@@ -1787 +1787 @@
     }
   }
-        qsort((void *)r->l.products,(size_t)i,sizeof(struct molecule *),
+        qsort((void *)r->l.products,(size_t)i,sizeof(molecule *),
                                 mole_cmp);
 
@@ -2933 +2933 @@
         double ratev, ratevi;
         struct mole_reaction_s *rate;
-        struct molecule *sp;
+        molecule *sp;
 
         DEBUG_ENTRY("mole_sink_rate()");
@@ -2990 +2990 @@
         double ratev, ratevi;
         struct mole_reaction_s *rate;
-        struct molecule *sp, *ph;
+        molecule *sp, *ph;
 
         DEBUG_ENTRY("mole_dissoc_rate()");
@@ -3044 +3044 @@
         double ratev, ratevi;
         struct mole_reaction_s *rate;
-        struct molecule *sp;
+        molecule *sp;
 
         DEBUG_ENTRY("mole_source_rate()");
@@ -3140 +3140 @@
         double ratevi;
         struct mole_reaction_s *rate;
-        struct molecule *sp;
+        molecule *sp;
 
         DEBUG_ENTRY("mole_punch()");