Store ScanPathSegments outside of ScanPath

Author: masterleinad

source/CubeHeatSource.cc

@@ -9,11 +9,14 @@
 #include <instantiation.hh>
 #include <types.hh>
 
+#include <deal.II/base/memory_space.h>
+
 namespace adamantine
 {
-template <int dim>
-CubeHeatSource<dim>::CubeHeatSource(boost::property_tree::ptree const &database)
-    : HeatSource<dim>()
+template <int dim, typename MemorySpaceType>
+CubeHeatSource<dim, MemorySpaceType>::CubeHeatSource(
+    boost::property_tree::ptree const &database)
+    : HeatSource<dim, MemorySpaceType>()
 {
   _start_time = database.get<double>("start_time");
   _end_time = database.get<double>("end_time");
@@ -29,15 +32,16 @@ CubeHeatSource<dim>::CubeHeatSource(boost::property_tree::ptree const &database)
   }
 }
 
-template <int dim>
-void CubeHeatSource<dim>::update_time(double time)
+template <int dim, typename MemorySpaceType>
+void CubeHeatSource<dim, MemorySpaceType>::update_time(double time)
 {
   _source_on = ((time > _start_time) && (time < _end_time));
 }
 
-template <int dim>
-double CubeHeatSource<dim>::value(dealii::Point<dim> const &point,
-                                  double const /*height*/) const
+template <int dim, typename MemorySpaceType>
+double
+CubeHeatSource<dim, MemorySpaceType>::value(dealii::Point<dim> const &point,
+                                            double const /*height*/) const
 {
   if (_source_on)
   {
@@ -58,12 +62,14 @@ double CubeHeatSource<dim>::value(dealii::Point<dim> const &point,
   return 0.;
 }
 
-template <int dim>
-double CubeHeatSource<dim>::get_current_height(double const /*time*/) const
+template <int dim, typename MemorySpaceType>
+double CubeHeatSource<dim, MemorySpaceType>::get_current_height(
+    double const /*time*/) const
 {
   return _max_point[axis<dim>::z];
 }
 
 } // namespace adamantine
 
-INSTANTIATE_DIM(CubeHeatSource)
+INSTANTIATE_DIM_DEVICE(CubeHeatSource)
+INSTANTIATE_DIM_HOST(CubeHeatSource)

source/CubeHeatSource.hh

@@ -16,8 +16,8 @@ namespace adamantine
  * Cube heat source. This source does not represent a physical source, it is
  * used for verification purpose.
  */
-template <int dim>
-class CubeHeatSource final : public HeatSource<dim>
+template <int dim, typename MemorySpaceType>
+class CubeHeatSource final : public HeatSource<dim, MemorySpaceType>
 {
 public:
   /**

source/DataAssimilator.hh

@@ -14,7 +14,7 @@
 #include <deal.II/fe/mapping_q1_eulerian.h>
 #include <deal.II/lac/full_matrix.h>
 #include <deal.II/lac/la_parallel_block_vector.h>
-#include <deal.II/lac/la_vector.h>
+// #include <deal.II/lac/la_vector.h>
 #include <deal.II/lac/solver_gmres.h>
 #include <deal.II/lac/sparse_matrix.h>
 #include <deal.II/lac/trilinos_sparse_matrix.h>

source/ElectronBeamHeatSource.cc

@@ -9,18 +9,21 @@
 #include <instantiation.hh>
 #include <types.hh>
 
+#include <deal.II/base/memory_space.h>
+
 namespace adamantine
 {
 
-template <int dim>
-ElectronBeamHeatSource<dim>::ElectronBeamHeatSource(
-    boost::property_tree::ptree const &database)
-    : HeatSource<dim>(database)
+template <int dim, typename MemorySpaceType>
+ElectronBeamHeatSource<dim, MemorySpaceType>::ElectronBeamHeatSource(
+    BeamHeatSourceProperties const &beam,
+    ScanPath<MemorySpaceType> const &scan_path)
+    : HeatSource<dim, MemorySpaceType>(beam, scan_path)
 {
 }
 
-template <int dim>
-void ElectronBeamHeatSource<dim>::update_time(double time)
+template <int dim, typename MemorySpaceType>
+void ElectronBeamHeatSource<dim, MemorySpaceType>::update_time(double time)
 {
   static const double log_01 = std::log(0.1);
   _beam_center = this->_scan_path.value(time);
@@ -31,9 +34,9 @@ void ElectronBeamHeatSource<dim>::update_time(double time)
       (dealii::numbers::PI * this->_beam.radius_squared * this->_beam.depth);
 }
 
-template <int dim>
-double ElectronBeamHeatSource<dim>::value(dealii::Point<dim> const &point,
-                                          double const height) const
+template <int dim, typename MemorySpaceType>
+double ElectronBeamHeatSource<dim, MemorySpaceType>::value(
+    dealii::Point<dim> const &point, double const height) const
 {
   double const z = point[axis<dim>::z] - height;
   if ((z + this->_beam.depth) < 0.)
@@ -65,4 +68,5 @@ double ElectronBeamHeatSource<dim>::value(dealii::Point<dim> const &point,
 }
 } // namespace adamantine
 
-INSTANTIATE_DIM(ElectronBeamHeatSource)
+INSTANTIATE_DIM_DEVICE(ElectronBeamHeatSource)
+INSTANTIATE_DIM_HOST(ElectronBeamHeatSource)

source/ElectronBeamHeatSource.hh

@@ -17,8 +17,8 @@ namespace adamantine
  * The form of the heat source model is taken from the following reference:
  * Raghavan et al, Acta Materilia, 112, 2016, pp 303-314.
  */
-template <int dim>
-class ElectronBeamHeatSource final : public HeatSource<dim>
+template <int dim, typename MemorySpaceType>
+class ElectronBeamHeatSource final : public HeatSource<dim, MemorySpaceType>
 {
 public:
   /**
@@ -31,7 +31,8 @@ public:
    *   - <B>input_file</B>: name of the file that contains the scan path
    *     segments
    */
-  ElectronBeamHeatSource(boost::property_tree::ptree const &database);
+  ElectronBeamHeatSource(BeamHeatSourceProperties const &beam,
+                         ScanPath<MemorySpaceType> const &scan_path);
 
   /**
    * Set the time variable.

source/GoldakHeatSource.cc

@@ -9,18 +9,21 @@
 #include <instantiation.hh>
 #include <types.hh>
 
+#include <deal.II/base/memory_space.h>
+
 namespace adamantine
 {
 
-template <int dim>
-GoldakHeatSource<dim>::GoldakHeatSource(
-    boost::property_tree::ptree const &database)
-    : HeatSource<dim>(database)
+template <int dim, typename MemorySpaceType>
+GoldakHeatSource<dim, MemorySpaceType>::GoldakHeatSource(
+    BeamHeatSourceProperties const &beam,
+    ScanPath<MemorySpaceType> const &scan_path)
+    : HeatSource<dim, MemorySpaceType>(beam, scan_path)
 {
 }
 
-template <int dim>
-void GoldakHeatSource<dim>::update_time(double time)
+template <int dim, typename MemorySpaceType>
+void GoldakHeatSource<dim, MemorySpaceType>::update_time(double time)
 {
   static const double _pi_over_3_to_1p5 =
       std::pow(dealii::numbers::PI / 3.0, 1.5);
@@ -32,9 +35,10 @@ void GoldakHeatSource<dim>::update_time(double time)
            (this->_beam.radius_squared * this->_beam.depth * _pi_over_3_to_1p5);
 }
 
-template <int dim>
-double GoldakHeatSource<dim>::value(dealii::Point<dim> const &point,
-                                    double const height) const
+template <int dim, typename MemorySpaceType>
+double
+GoldakHeatSource<dim, MemorySpaceType>::value(dealii::Point<dim> const &point,
+                                              double const height) const
 {
   double const z = point[axis<dim>::z] - height;
   if ((z + this->_beam.depth) < 0.)
@@ -61,4 +65,5 @@ double GoldakHeatSource<dim>::value(dealii::Point<dim> const &point,
 }
 } // namespace adamantine
 
-INSTANTIATE_DIM(GoldakHeatSource)
+INSTANTIATE_DIM_DEVICE(GoldakHeatSource)
+INSTANTIATE_DIM_HOST(GoldakHeatSource)

source/GoldakHeatSource.hh

@@ -17,8 +17,8 @@ namespace adamantine
  * The form of the heat source model is taken from the following reference:
  * Coleman et al, Journal of Heat Transfer, (in press, 2020).
  */
-template <int dim>
-class GoldakHeatSource final : public HeatSource<dim>
+template <int dim, typename MemorySpaceType>
+class GoldakHeatSource final : public HeatSource<dim, MemorySpaceType>
 {
 public:
   /**
@@ -31,7 +31,8 @@ public:
    *   - <B>input_file</B>: name of the file that contains the scan path
    *     segments
    */
-  GoldakHeatSource(boost::property_tree::ptree const &database);
+  GoldakHeatSource(BeamHeatSourceProperties const &beam,
+                   ScanPath<MemorySpaceType> const &scan_path);
 
   /**
    * Set the time variable.

source/HeatSource.hh

@@ -29,7 +29,7 @@ namespace adamantine
  * of the part, and the second component is the thickness. That is, the last two
  * components are swapped between the two coordinate systems.
  */
-template <int dim>
+template <int dim, typename MemorySpaceType>
 class HeatSource
 {
 public:
@@ -49,12 +49,9 @@ public:
    *   - <B>input_file</B>: name of the file that contains the scan path
    *     segments
    */
-  HeatSource(boost::property_tree::ptree const &database)
-      : _beam(database),
-        // PropertyTreeInput sources.beam_X.scan_path_file
-        // PropertyTreeInput sources.beam_X.scan_path_format
-        _scan_path(database.get<std::string>("scan_path_file"),
-                   database.get<std::string>("scan_path_file_format"))
+  HeatSource(BeamHeatSourceProperties const &beam,
+             ScanPath<MemorySpaceType> const &scan_path)
+      : _beam(beam), _scan_path(scan_path)
   {
   }
 
@@ -77,7 +74,7 @@ public:
   /**
    * Return the scan path for the heat source.
    */
-  virtual ScanPath const &get_scan_path() const;
+  virtual ScanPath<MemorySpaceType> const &get_scan_path() const;
 
   /**
    * Compute the current height of the where the heat source meets the material
@@ -100,23 +97,25 @@ protected:
   /**
    * The scan path for the heat source.
    */
-  ScanPath _scan_path;
+  ScanPath<MemorySpaceType> _scan_path;
 };
 
-template <int dim>
-inline ScanPath const &HeatSource<dim>::get_scan_path() const
+template <int dim, typename MemorySpaceType>
+inline ScanPath<MemorySpaceType> const &
+HeatSource<dim, MemorySpaceType>::get_scan_path() const
 {
   return _scan_path;
 }
 
-template <int dim>
-inline double HeatSource<dim>::get_current_height(double const time) const
+template <int dim, typename MemorySpaceType>
+inline double
+HeatSource<dim, MemorySpaceType>::get_current_height(double const time) const
 {
   return _scan_path.value(time)[2];
 }
 
-template <int dim>
-inline void HeatSource<dim>::set_beam_properties(
+template <int dim, typename MemorySpaceType>
+inline void HeatSource<dim, MemorySpaceType>::set_beam_properties(
     boost::property_tree::ptree const &database)
 {
   _beam.set_from_database(database);