move a host func out of a device func

GEOS-DEV · Aug 23, 2024 · d2b1e2a · d2b1e2a
1 parent 89cf92e
commit d2b1e2a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/src/coreComponents/constitutive/solid/PorousSolid.hpp b/src/coreComponents/constitutive/solid/PorousSolid.hpp
@@ -56,7 +56,8 @@ class PorousSolidUpdates : public CoupledSolidUpdates< SOLID_TYPE, BiotPorosity,
                       BiotPorosity const & porosityModel,
                       ConstantPermeability const & permModel
                       ):
-    CoupledSolidUpdates< SOLID_TYPE, BiotPorosity, ConstantPermeability >( solidModel, porosityModel, permModel )
+    CoupledSolidUpdates< SOLID_TYPE, BiotPorosity, ConstantPermeability >( solidModel, porosityModel, permModel ),
+    m_drainedLinearTECTable( FunctionManager::getInstance().getGroup< TableFunction >( m_solidUpdate.getDrainedTECTableName() ))
   {}
 
   GEOS_HOST_DEVICE
@@ -320,7 +321,8 @@ class PorousSolidUpdates : public CoupledSolidUpdates< SOLID_TYPE, BiotPorosity,
     }
     else
     {
-      TableFunction::KernelWrapper TECWrapper = m_solidUpdate.getTECTableWrapper();
+      m_drainedLinearTECTable.setInterpolationMethod( TableFunction::InterpolationType::Linear );
+      TableFunction::KernelWrapper const & TECWrapper = m_drainedLinearTECTable.createKernelWrapper();
 
       real64 const tmpTemperatureArray[1] = {temperature};
       real64 dTEC_dT[1] = {0};
@@ -361,6 +363,8 @@ class PorousSolidUpdates : public CoupledSolidUpdates< SOLID_TYPE, BiotPorosity,
 
   }
 
+private:
+  TableFunction & m_drainedLinearTECTable;
 };
 
 /**

diff --git a/src/coreComponents/constitutive/solid/SolidBase.hpp b/src/coreComponents/constitutive/solid/SolidBase.hpp
@@ -173,20 +173,6 @@ class SolidBaseUpdates
     return m_drainedTECTableName;
   }
 
-  /**
-   * @brief Get get TEC Table Wrapper
-   * @return the TECTableWrapper
-   */
-  GEOS_HOST_DEVICE
-  TableFunction::KernelWrapper getTECTableWrapper() const
-  {
-    FunctionManager & functionManager = FunctionManager::getInstance();
-    TableFunction & drainedLinearTECTable = functionManager.getGroup< TableFunction >( m_drainedTECTableName );
-    drainedLinearTECTable.setInterpolationMethod( TableFunction::InterpolationType::Linear );
-    return drainedLinearTECTable.createKernelWrapper();
-  }
-
-
   /**
    * @brief Get shear modulus
    * @param[in] k Element index.