temporarily change the typename and turned off the ultramafic to pass the compile

Author: frankfeifan

src/reactions/bulkGeneric/EquilibriumReactions.hpp

@@ -132,12 +132,13 @@ class EquilibriumReactions
   template< typename PARAMS_DATA,
             typename ARRAY_1D,
             typename ARRAY_1D_TO_CONST,
+            typename ARRAY_1D_TO_CONST2,
             typename ARRAY_2D >
   static HPCREACT_HOST_DEVICE void
   computeResidualAndJacobianAggregatePrimaryConcentrations( RealType const & temperature,
                                                             PARAMS_DATA const & params,
                                                             ARRAY_1D_TO_CONST const & targetAggregatePrimaryConcentrations,
-                                                            ARRAY_1D_TO_CONST const & logPrimarySpeciesConcentration,
+                                                            ARRAY_1D_TO_CONST2 const & logPrimarySpeciesConcentration,
                                                             ARRAY_1D & residual,
                                                             ARRAY_2D & jacobian );
 };

src/reactions/bulkGeneric/EquilibriumReactionsAggregatePrimaryConcentration_impl.hpp

@@ -16,6 +16,7 @@ template< typename REAL_TYPE,
 template< typename PARAMS_DATA,
           typename ARRAY_1D,
           typename ARRAY_1D_TO_CONST,
+          typename ARRAY_1D_TO_CONST2,
           typename ARRAY_2D >
 HPCREACT_HOST_DEVICE
 inline
@@ -25,7 +26,7 @@ EquilibriumReactions< REAL_TYPE,
                       INDEX_TYPE >::computeResidualAndJacobianAggregatePrimaryConcentrations( RealType const & temperature,
                                                                                               PARAMS_DATA const & params,
                                                                                               ARRAY_1D_TO_CONST const & targetAggregatePrimaryConcentrations,
-                                                                                              ARRAY_1D_TO_CONST const & logPrimarySpeciesConcentration,
+                                                                                              ARRAY_1D_TO_CONST2 const & logPrimarySpeciesConcentration,
                                                                                               ARRAY_1D & residual,
                                                                                               ARRAY_2D & jacobian )
 {

src/reactions/bulkGeneric/MixedEquilibriumKineticReactions.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "common/macros.hpp"
+#include "KineticReactions.hpp"
 
 /** @file MixedEquilibriumKineticReactions.hpp
  *  @brief Header file for the MixedEquilibriumKineticReactions class.
@@ -71,39 +72,47 @@ class MixedEquilibriumKineticReactions
 
   template< typename PARAMS_DATA,
             typename ARRAY_1D_TO_CONST,
+            typename ARRAY_1D_TO_CONST2,
             typename ARRAY_1D,
             typename ARRAY_2D >
   static HPCREACT_HOST_DEVICE inline void
   computeReactionRates( RealType const & temperature,
                         PARAMS_DATA const & params,
                         ARRAY_1D_TO_CONST const & logPrimarySpeciesConcentrations,
-                        ARRAY_1D_TO_CONST const & logSecondarySpeciesConcentrations,
+                        ARRAY_1D_TO_CONST2 const & logSecondarySpeciesConcentrations,
                         ARRAY_1D & reactionRates,
-                        ARRAY_2D & dReactionRates_dPrimarySpeciesConcentrations )
+                        ARRAY_2D & dReactionRates_dLogPrimarySpeciesConcentrations )
 
   {
     computeReactionRates_impl( temperature,
                                params,
                                logPrimarySpeciesConcentrations,
                                logSecondarySpeciesConcentrations,
                                reactionRates,
-                               dReactionRates_dPrimarySpeciesConcentrations );
+                               dReactionRates_dLogPrimarySpeciesConcentrations );
   }                                        
 
   template< typename PARAMS_DATA,
             typename ARRAY_1D_TO_CONST,
+            typename ARRAY_1D_TO_CONST2,
             typename ARRAY_2D_TO_CONST,
             typename ARRAY_1D,
             typename ARRAY_2D >
   static HPCREACT_HOST_DEVICE inline void
   computeAggregateSpeciesRates( PARAMS_DATA const & params,
                                 ARRAY_1D_TO_CONST const & speciesConcentration,
-                                ARRAY_1D_TO_CONST const & reactionRates,
+                                ARRAY_1D_TO_CONST2 const & reactionRates,
                                 ARRAY_2D_TO_CONST const & reactionRatesDerivatives, 
                                 ARRAY_1D & aggregatesRates,
                                 ARRAY_2D & aggregatesRatesDerivatives )
   {
-    computeAggregateSpeciesRates_impl< true >( params,
+    computeAggregateSpeciesRates_impl<  PARAMS_DATA, 
+                                        ARRAY_1D_TO_CONST,
+                                        ARRAY_1D_TO_CONST2,
+                                        ARRAY_2D_TO_CONST,
+                                        ARRAY_1D,
+                                        ARRAY_2D,
+                                        true >( params,
                                                speciesConcentration,
                                                reactionRates,
                                                reactionRatesDerivatives,
@@ -131,28 +140,30 @@ class MixedEquilibriumKineticReactions
 
   template< typename PARAMS_DATA,
             typename ARRAY_1D_TO_CONST,
+            typename ARRAY_1D_TO_CONST2,
             typename ARRAY_1D,
             typename ARRAY_2D >
   static HPCREACT_HOST_DEVICE void
   computeReactionRates_impl( RealType const & temperature,
                         PARAMS_DATA const & params,
                         ARRAY_1D_TO_CONST const & logPrimarySpeciesConcentrations,
-                        ARRAY_1D_TO_CONST const & logSecondarySpeciesConcentrations,
+                        ARRAY_1D_TO_CONST2 const & logSecondarySpeciesConcentrations,
                         ARRAY_1D & reactionRates,
-                        ARRAY_2D & dReactionRates_dPrimarySpeciesConcentrations );
+                        ARRAY_2D & dReactionRates_dLogPrimarySpeciesConcentrations );
 
 
 
   template< typename PARAMS_DATA,
             typename ARRAY_1D_TO_CONST,
+            typename ARRAY_1D_TO_CONST2,
             typename ARRAY_2D_TO_CONST,
             typename ARRAY_1D,
             typename ARRAY_2D,
             bool CALCULATE_DERIVATIVES >
   static HPCREACT_HOST_DEVICE void
   computeAggregateSpeciesRates_impl( PARAMS_DATA const & params,
                                      ARRAY_1D_TO_CONST const & speciesConcentration,
-                                     ARRAY_1D_TO_CONST const & reactionRates,
+                                     ARRAY_1D_TO_CONST2 const & reactionRates,
                                      ARRAY_2D_TO_CONST const & reactionRatesDerivatives, 
                                      ARRAY_1D & aggregatesRates,
                                      ARRAY_2D & aggregatesRatesDerivatives );