Changeset 2441 for branches/newmole

Timestamp:

11/04/08 14:35:50 (2 months ago)

Author:

rjrw

Message:

Remove get_const_address -- switch throughout mole_solve.cpp to the
more general get_ptr shim.

Location:

branches/newmole/source

Files:

• cddefines.h (modified) (2 diffs)
• mole.h (modified) (1 diff)
• mole_solve.cpp (modified) (5 diffs)

branches/newmole/source/cddefines.h

@@ -1561 +1561 @@
 /**get_ptr attribute shim to get raw pointer to contained data with
  * correct type */
+template<class T> inline T* get_ptr(T *v)
+{
+        return v;
+}
 template<class T> inline T* get_ptr(valarray<T> &v)
 {
@@ -1577 +1581 @@
   return const_cast<const T*>(&const_cast<vector<T>&>(v)[0]);
 }
-
 
 /**************************************************************************

branches/newmole/source/mole.h

@@ -192 +192 @@
 extern struct chem_element_s *element_list[LIMELM];
 
-template<class T> inline const T* get_const_address(const valarray<T> &v)
-{
-        return const_cast<const T*>(&const_cast<valarray<T>&>(v)[0]);
-}
-template<class T> inline const T* get_const_address(const vector<T> &v)
-{
-        return const_cast<const T*>(&const_cast<vector<T>&>(v)[0]);
-}
-
 #endif /* _MOLE_H_ */

branches/newmole/source/mole_solve.cpp

@@ -105 +105 @@
                 nPrevBad = nBad;
 
-                MoleMap.setup(&oldmols[0]);
-
-                grouped_elems(&oldmols[0],molElems);
+                MoleMap.setup(get_ptr(oldmols));
+
+                grouped_elems(get_ptr(oldmols),molElems);
                 
                 long j;
@@ -117 +117 @@
                         if (0)
                         {
-                                grouped_elems(&newmols[0],molElemsNew);
+                                grouped_elems(get_ptr(newmols),molElemsNew);
                                 for (long nelem=0; nelem <LIMELM; nelem++)
                                 {
@@ -358 +358 @@
                  (c[][], first iteration) from reaction list */
         
-        mole_eval_dynamic_balance(mole.num_total,&b[0],lgJac,c);        
+        mole_eval_dynamic_balance(mole.num_total,get_ptr(b),lgJac,c);   
         
         /*------------------------------------------------------------------ */
@@ -518 +518 @@
                         double molnow[LIMELM];
 
-                        grouped_elems(get_const_address(b2vec), molnow);
+                        grouped_elems(get_ptr(b2vec), molnow);
 
                         iamax = 0;
@@ -742 +742 @@
         if (0) 
         {
-                grouped_elems(&ervals[0],molElemsNew);
+                grouped_elems(get_ptr(ervals),molElemsNew);
                 for ( long nelem=0; nelem<LIMELM; nelem++)
                 {