Remove HeatSource.hh

Author: masterleinad

source/CMakeLists.txt

@@ -7,7 +7,7 @@ set(Adamantine_HEADERS
     ${CMAKE_CURRENT_SOURCE_DIR}/ExperimentalData.hh
     ${CMAKE_CURRENT_SOURCE_DIR}/Geometry.hh
     ${CMAKE_CURRENT_SOURCE_DIR}/GoldakHeatSource.hh
-    ${CMAKE_CURRENT_SOURCE_DIR}/HeatSource.hh
+    ${CMAKE_CURRENT_SOURCE_DIR}/HeatSources.hh
     ${CMAKE_CURRENT_SOURCE_DIR}/ImplicitOperator.hh
     ${CMAKE_CURRENT_SOURCE_DIR}/MaterialProperty.hh
     ${CMAKE_CURRENT_SOURCE_DIR}/MaterialProperty.templates.hh

source/CubeHeatSource.cc

@@ -15,7 +15,6 @@ namespace adamantine
 {
 template <int dim>
 CubeHeatSource<dim>::CubeHeatSource(boost::property_tree::ptree const &database)
-    : HeatSource<dim, dealii::MemorySpace::Default>()
 {
   _start_time = database.get<double>("start_time");
   _end_time = database.get<double>("end_time");

source/CubeHeatSource.hh

@@ -8,9 +8,9 @@
 #ifndef CUBE_HEAT_SOURCE_HH
 #define CUBE_HEAT_SOURCE_HH
 
-#include <HeatSource.hh>
+#include <BeamHeatSourceProperties.hh>
 
-#include <deal.II/base/memory_space.h>
+#include <deal.II/base/point.h>
 
 namespace adamantine
 {
@@ -20,7 +20,6 @@ namespace adamantine
  */
 template <int dim>
 class CubeHeatSource final
-    : public HeatSource<dim, dealii::MemorySpace::Default>
 {
 public:
   /**
@@ -41,18 +40,26 @@ public:
   /**
    * Set the time variable.
    */
-  void update_time(double time) final;
+  void update_time(double time);
 
   /**
    * Return the value of the source for a given point and time.
    */
   double value(dealii::Point<dim> const &point,
-               double const /*height*/) const final;
+               double const /*height*/) const;
   /**
    * Compute the current height of the where the heat source meets the material
    * (i.e. the current scan path height).
    */
-  double get_current_height(double const time) const final;
+  double get_current_height(double const time) const;
+
+void set_beam_properties(
+    boost::property_tree::ptree const &database)
+{
+  _beam.set_from_database(database);
+}
+
+  BeamHeatSourceProperties get_beam_properties() const { return _beam; }
 
 private:
   bool _source_on = false;
@@ -61,7 +68,12 @@ private:
   double _value;
   dealii::Point<dim> _min_point;
   dealii::Point<dim> _max_point;
-};
+  double _alpha;
+    /**
+   * Structure of the physical properties of the beam heat source.
+   */
+  BeamHeatSourceProperties _beam;
+  };
 } // namespace adamantine
 
 #endif

source/ElectronBeamHeatSource.cc

@@ -18,7 +18,7 @@ template <int dim, typename MemorySpaceType>
 ElectronBeamHeatSource<dim, MemorySpaceType>::ElectronBeamHeatSource(
     BeamHeatSourceProperties const &beam,
     ScanPath<MemorySpaceType> const &scan_path)
-    : HeatSource<dim, MemorySpaceType>(beam, scan_path)
+    : _beam(beam), _scan_path(scan_path)
 {
 }
 

source/ElectronBeamHeatSource.hh

@@ -8,17 +8,18 @@
 #ifndef ELECTRON_BEAM_HEAT_SOURCE_HH
 #define ELECTRON_BEAM_HEAT_SOURCE_HH
 
-#include <HeatSource.hh>
+#include <BeamHeatSourceProperties.hh>
+#include <ScanPath.hh>
 
 namespace adamantine
 {
 /**
- * A derived class from HeatSource for a model of an electron beam heat source.
+ * A model of an electron beam heat source.
  * 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, typename MemorySpaceType>
-class ElectronBeamHeatSource final : public HeatSource<dim, MemorySpaceType>
+class ElectronBeamHeatSource
 {
 public:
   /**
@@ -37,18 +38,42 @@ public:
   /**
    * Set the time variable.
    */
-  void update_time(double time) final;
+  void update_time(double time);
 
   /**
    * Returns the value of an electron beam heat source at a specified point and
    * time.
    */
   double value(dealii::Point<dim> const &point,
-               double const height) const final;
+               double const height) const;
+
+  ScanPath<MemorySpaceType> const &get_scan_path() const {return _scan_path;}
+
+  double get_current_height(double const time) const
+{
+  return _scan_path.value(time)[2];
+}
+
+void set_beam_properties(
+    boost::property_tree::ptree const &database)
+{
+  _beam.set_from_database(database);
+}
+
+  BeamHeatSourceProperties get_beam_properties() const { return _beam; }
 
 private:
   dealii::Point<3> _beam_center;
   double _alpha;
+    /**
+   * Structure of the physical properties of the beam heat source.
+   */
+  BeamHeatSourceProperties _beam;
+
+  /**
+   * The scan path for the heat source.
+   */
+  ScanPath<MemorySpaceType> _scan_path;
 };
 } // namespace adamantine
 

source/GoldakHeatSource.cc

@@ -18,7 +18,7 @@ template <int dim, typename MemorySpaceType>
 GoldakHeatSource<dim, MemorySpaceType>::GoldakHeatSource(
     BeamHeatSourceProperties const &beam,
     ScanPath<MemorySpaceType> const &scan_path)
-    : HeatSource<dim, MemorySpaceType>(beam, scan_path)
+    : _beam(beam), _scan_path(scan_path)
 {
 }
 

source/GoldakHeatSource.hh

@@ -8,17 +8,18 @@
 #ifndef GOLDAK_HEAT_SOURCE_HH
 #define GOLDAK_HEAT_SOURCE_HH
 
-#include <HeatSource.hh>
+#include <BeamHeatSourceProperties.hh>
+#include <ScanPath.hh>
 
 namespace adamantine
 {
 /**
- * A derived class from HeatSource for the Goldak model of a laser heat source.
+ * Goldak model of a laser heat source.
  * 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, typename MemorySpaceType>
-class GoldakHeatSource final : public HeatSource<dim, MemorySpaceType>
+class GoldakHeatSource
 {
 public:
   /**
@@ -37,18 +38,42 @@ public:
   /**
    * Set the time variable.
    */
-  void update_time(double time) final;
+  void update_time(double time);
 
   /**
    * Returns the value of a Goldak heat source at a specified point and
    * time.
    */
   double value(dealii::Point<dim> const &point,
-               double const height) const final;
+               double const height) const;
+
+  ScanPath<MemorySpaceType> const &get_scan_path() const {return _scan_path;}
+
+  double get_current_height(double const time) const
+{
+  return _scan_path.value(time)[2];
+}
+
+void set_beam_properties(
+    boost::property_tree::ptree const &database)
+{
+  _beam.set_from_database(database);
+}
+
+  BeamHeatSourceProperties get_beam_properties() const { return _beam; }
 
 private:
   dealii::Point<3> _beam_center;
   double _alpha;
+    /**
+   * Structure of the physical properties of the beam heat source.
+   */
+  BeamHeatSourceProperties _beam;
+
+  /**
+   * The scan path for the heat source.
+   */
+  ScanPath<MemorySpaceType> _scan_path;
 };
 } // namespace adamantine
 

source/HeatSource.hh

@@ -19,6 +19,8 @@
 #include <istream>
 #include <vector>
 
+#include <Kokkos_Core.hpp>
+
 namespace adamantine
 {
 /**

source/ScanPath.hh

@@ -19,9 +19,6 @@ namespace adamantine
 // Forward declarations
 class Timer;
 
-template <int dim, typename MemorySpaceType>
-class HeatSource;
-
 /**
  * This class defines the interface for ThermalPhysics used in run(). The
  * objective of this class is to simplify code in run() by reducing the number