Start on templated FHT

Modules/FDEM1D/examples/CMakeLists.txt

@@ -2,6 +2,10 @@ add_executable( LayeredEarthEM LayeredEarthEM.cpp  )
 target_link_libraries(  LayeredEarthEM  "lemmacore" "fdem1d")
 set_property(TARGET LayeredEarthEM PROPERTY CXX_STANDARD 14)
 
+add_executable( FHT FHT.cpp  )
+target_link_libraries(  FHT  "lemmacore" "fdem1d")
+set_property(TARGET FHT PROPERTY CXX_STANDARD 14)
+
 add_executable( FieldPoints FieldPoints.cpp  )
 target_link_libraries(  FieldPoints  "lemmacore" "fdem1d")
 set_property(TARGET FieldPoints PROPERTY CXX_STANDARD 14)

Modules/FDEM1D/examples/FHT.cpp

@@ -0,0 +1,27 @@
+/* This file is part of Lemma, a geophysical modelling and inversion API.
+ * More information is available at http://lemmasoftware.org
+ */
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+/**
+ * @file
+ * @date      05/03/2018 09:44:21 AM
+ * @version   $Id$
+ * @author    Trevor Irons (ti)
+ * @email     tirons@egi.utah.edu
+ * @copyright Copyright (c) 2018, University of Utah
+ * @copyright Copyright (c) 2018, Lemma Software, LLC
+ */
+
+#include "FHT.h"
+using namespace Lemma;
+
+int main() {
+    std::cout << "FHT test" << std::endl;
+
+    //auto fht = FHT::NewSP();
+}

Modules/FDEM1D/include/FHT.h

@@ -19,21 +19,25 @@
 
 
 #pragma once
-#include "HankekTransform.h"
+#include "HankelTransform.h"
 
 namespace Lemma {
 
     /**
-      \brief   Impliments a fast Hankel transform through digital filtering.
-      \details A genearl Fast Hankel Transform routine which uses the digital
-               filter apporach. This approach performs a complete sweep of the
-               coeficients, for a variant that uses a longer filter which may
+      \ingroup FDEM1D
+      \brief   Impliments lagged and related fast Hankel transform through
+               digital filtering.
+      \details A general Fast Hankel Transform routine which uses the digital
+               filter apporach. Both lagged and related kernels are supported in
+               order to minimize kernel function calls.
+               This approach performs a complete sweep of the
+               coefficients , for a variant that uses a longer filter which may
                be truncated, see FHTAnderson801.
-               @see FHTAndersion801
+               @see FHTAnderson801
                @see GQChave
-               @see @QKEKey
+               @see QWEKey
      */
-    class FHT : public HankekTransform {
+    class FHT : public HankelTransform {
 
         friend std::ostream &operator<<(std::ostream &stream, const FHT &ob);
 
@@ -41,11 +45,31 @@ namespace Lemma {
 
         // ====================  LIFECYCLE     =======================
 
-        /*
+        /**
+         * Default protected constructor, use NewSP methods to construct
+         * @see FHT::NewSP
+         */
+        FHT (const ctor_key& key ) : HankelTransform( key ) {
+        }
+
+        /**
+         * Protected DeDerializing constructor, use factory DeSerialize  method.
+         * @see FHT::DeSerialize
+         */
+        FHT (const YAML::Node& node, const ctor_key& key) : HankelTransform(node, key) {
+        }
+
+        /** Default protected destructor, use smart pointers (std::shared_ptr) */
+        ~FHT () {
+        }
+
+        /**
          *  Factory method for generating concrete class.
          *  @return a std::shared_ptr of type FHT
          */
-        static std::shared_ptr< FHT > NewSP();
+        static std::shared_ptr< FHT > NewSP() {
+            return std::make_shared< FHT >( ctor_key() );
+        }
 
         /**
          *  Uses YAML to serialize this object.
@@ -64,35 +88,30 @@ namespace Lemma {
 
         // ====================  OPERATIONS    =======================
 
+        Complex Zgauss(const int&, const Lemma::EMMODE&, const int&, const Real&, const Real&, Lemma::KernelEM1DBase*) {
+            return 0;
+        }
+
         // ====================  ACCESS        =======================
 
         // ====================  INQUIRY       =======================
 
+        /** Returns the name of the underlying class, similiar to Python's type */
+        virtual std::string GetName() const {
+            return this->CName;
+        }
 
 
         protected:
 
         // ====================  LIFECYCLE     =======================
 
-        /**
-         * Default protected constructor, use NewSP methods to construct
-         * @see FHT::NewSP
-         */
-        FHT (const std::string& name);
-
-        /**
-         * Protected DeDerializing constructor, use factory DeSerialize  method.
-         * @see FHT::DeSerialize
-         */
-        FHT (const YAML::Node& node);
-
-        /** Default protected destructor, use smart pointers (std::shared_ptr) */
-        ~FHT ();
-
         // ====================  DATA MEMBERS  =========================
 
         private:
 
+        static constexpr auto CName = "FHT";
+
     }; // -----  end of class  FHT  -----
 }  // -----  end of namespace Lemma ----