More work towards using c++-11, and better documentation.

LICENCE

@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in 
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  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/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.

LemmaCore/include/ASCIIParser.h

@@ -25,8 +25,9 @@
 namespace Lemma {
 
 /**
-  \brief   Provides ASCII input file parsing
-  \details Able to accomodate various inputs and comment styles
+ * \ingroup LemmaCore
+ * \brief   Provides ASCII input file parsing
+ * \details Able to accomodate various inputs and comment styles
  */
 class ASCIIParser : public LemmaObject {
 

LemmaCore/include/CubicSplineInterpolator.h

@@ -45,16 +45,17 @@ struct SplineSet{
 };
 
 /**
-  \brief   Real 1D Natural cubic spline interpolator.
-  \details Splines are fit between knots \f$j\f$ according to the forulae
-           \f[ S_j(x) =  a_j + b_j(x - x_j) + c_j(x-x_j)^2 + d_j(x-x_y)^3  \f]
-           The spline must satisfy the following conditions
-            \f{eqnarray} {
-                S_i(x_i) & = & y_i = S_{i-1}(x_i), i = 1,..., n-1 \\
-                S'_i(x_i) & = &  S'_{i-1}(x_i), i = 1,..., n-1 \\
-                S''_i(x_i) & = & S''_{i-1}(x_i), i = 1,..., n-1 \\
-                S''_0(x_0) & = & S''_{n-1}(x_n) = 0
-            \f}
+ * \ingroup LemmaCore
+ * \brief   Real 1D Natural cubic spline interpolator.
+ * \details Splines are fit between knots \f$j\f$ according to the forulae
+ *          \f[ S_j(x) =  a_j + b_j(x - x_j) + c_j(x-x_j)^2 + d_j(x-x_y)^3  \f]
+ *          The spline must satisfy the following conditions
+ *           \f{eqnarray} {
+ *               S_i(x_i) & = & y_i = S_{i-1}(x_i), i = 1,..., n-1 \\
+ *               S'_i(x_i) & = &  S'_{i-1}(x_i), i = 1,..., n-1 \\
+ *               S''_i(x_i) & = & S''_{i-1}(x_i), i = 1,..., n-1 \\
+ *               S''_0(x_0) & = & S''_{n-1}(x_n) = 0
+ *           \f}
  */
 class CubicSplineInterpolator : public LemmaObject {
 

LemmaCore/include/Data.h

@@ -20,7 +20,9 @@ namespace Lemma {
 
     // ===================================================================
     //        Class:  Data
-    /** \brief Abstract class for data from an instrument
+    /**
+     *  \ingroup LemmaCore
+     *  \brief Abstract class for data from an instrument
      *  \details Currently provides no functionality, but this will likely
      *          change in the near future.
      */

LemmaCore/include/DataReader.h

@@ -21,6 +21,7 @@ namespace Lemma {
 
 // ===================================================================
 //        Class:  DataReader
+/// \ingroup LemmaCore
 /// \brief  Abstract class whose derived members read data files and
 /// converts them to Data Classes
 /// \details

LemmaCore/include/EarthModel.h

@@ -20,6 +20,7 @@ namespace Lemma {
 
     // ===================================================================
     //        Class:  EarthModel
+    /// \ingroup LemmaGroup
     /// \brief abstract class for Earth models
     /// \details
     // ===================================================================

LemmaCore/include/Filter.h

@@ -20,6 +20,7 @@ namespace Lemma {
     //  Class:  Filter
     /**
       @class  Filter
+      \ingroup LemmaCore
       \brief  Abstract class for filtering.
       \details Derived classes include fourier domain and time domain filters.
      */

LemmaCore/include/Grid.h

@@ -20,6 +20,7 @@ namespace Lemma {
 
 // ===============================================================================
 //        Class:  Grid
+/// \ingroup LemmaCore
 /// \brief Abstract base class for grids.
 /// \details Grids define values in space, they may either be an integral part
 /// of models, or simply the output of a forward modelling procedure.

LemmaCore/include/GridReader.h

@@ -25,6 +25,7 @@ namespace Lemma {
 
     /**
       @class
+      \ingroup LemmaCore
       \brief   Abstract class for grid readers.
       \details Provides a consistent interface for reading grid files in Lemma.
      */

LemmaCore/include/Instrument.h

@@ -20,6 +20,7 @@ namespace Lemma {
 
 	// =======================================================================
 	//        Class:  Instrument
+    /// \ingroup LemmaCore
 	/// \brief    Abstract class for instruments
 	/// \details
 	// =======================================================================

LemmaCore/include/LayeredEarth.h

@@ -22,7 +22,8 @@ namespace Lemma {
 
 	// =======================================================================
 	//        Class:  LayeredEarth
-	/// Abstract 1D layered earth.
+    /// \ingroup LemmaCore
+	/// \brief Abstract 1D layered earth.
 	// =======================================================================
 	class LayeredEarth : public EarthModel {
 

LemmaCore/include/LemmaCore.h

@@ -0,0 +1,25 @@
+/* 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      09/15/2016 04:28:16 PM
+ * @version   $Id$
+ * @author    Trevor Irons (ti)
+ * @email     tirons@egi.utah.edu
+ * @copyright Copyright (c) 2016, University of Utah
+ * @copyright Copyright (c) 2016, Lemma Software, LLC
+ */
+
+/**
+    \defgroup LemmaCore LemmaCore
+    @brief    LemmaCore provides the general framework and skeleton for applications.
+    @details  This module is the glue holding Lemma together.
+*/
+

LemmaCore/include/LemmaObject.h

@@ -22,7 +22,9 @@
 
 namespace Lemma {
 
-/** \brief    Abstract class providing common interface for Lemma Objects.
+/**
+  * \ingroup  LemmaCore
+  * \brief    Abstract class providing common interface for Lemma Objects.
   * \details  Lemma objects can be members of other Lemma, and may be members
   *           of multiple objects. Since updates should be atomic, and objects
   *           can be large, it becomes useful to count the number of

LemmaCore/include/RectilinearGrid.h

@@ -22,6 +22,7 @@ namespace Lemma {
     //  Class:  RectilinearGrid
     /**
       @class
+      \ingroup LemmaCore
       \brief   Impliments a rectilinear grid.
       \details A rectilinear grid can vary regularily in space but must be
                constant variation across each dimension. In this way three

LemmaCore/include/RectilinearGridReader.h

@@ -26,8 +26,10 @@ namespace Lemma {
 
     /**
       @class
-      \brief
+      \ingroup LemmaCore
+      \brief   Base Class for rectilinear grid reader data files
       \details
+     \todo this set of classes is deprecated, use serialize methods!
      */
     class RectilinearGridReader : public GridReader {
 

LemmaCore/include/RectilinearGridVTKExporter.h

@@ -36,6 +36,7 @@
 namespace Lemma {
 
 /**
+  \ingroup LemmaCore
   \brief   Exports a LemmaRectilinearGrid into a VTKRectilinearGrid.
   \details Results can then be dumped to a VTK file or used directly.
  */

LemmaCore/include/WindowFilter.h

@@ -27,6 +27,7 @@ namespace Lemma {
     //  Class:  WindowFilter
     /**
       @class   WindowFilter
+      \ingroup LemmaCore
       \brief   Fourier domain window filter.
       \details Current types are Hamming and Hanning. Others to be added.
      */

LemmaCore/include/helper.h

@@ -27,6 +27,15 @@
 
 namespace Lemma {
 
+/** \addtogroup LemmaCore
+ * @{
+ */
+
+    /**
+     *  Convenience function for string conversion
+     *  @param[in] t input value to be converted to string
+     *  @return string representation of input value
+     */
     template <class T>
     inline std::string to_string (const T& t) {
         std::stringstream ss;
@@ -34,16 +43,23 @@ namespace Lemma {
         return ss.str();
     }
 
-
-    // handy little way to convert enums, saves repeated code useful for YAML serializing
+    /// convert enums to string saves repeated code useful for YAML serializing
     std::string enum2String(const FREQUENCYUNITS& Units);
+    /// convert enums to string saves repeated code useful for YAML serializing
     std::string enum2String(const TIMEUNITS& Units);
+    /// convert enums to string saves repeated code useful for YAML serializing
     std::string enum2String(const MAGUNITS& Units);
+    /// convert enums to string saves repeated code useful for YAML serializing
     std::string enum2String(const TEMPUNITS& Units);
+    /// convert enums to string saves repeated code useful for YAML serializing
     std::string enum2String(const FEMCOILORIENTATION& Units);
+    /// convert enums to string saves repeated code useful for YAML serializing
     std::string enum2String(const ORIENTATION& Units);
+    /// convert enums to string saves repeated code useful for YAML serializing
     std::string enum2String(const FIELDCOMPONENT& Comp);
+    /// convert enums to string saves repeated code useful for YAML serializing
     std::string enum2String(const HANKELTRANSFORMTYPE& Htype);
+    /// convert enums to string saves repeated code useful for YAML serializing
     std::string enum2String(const FIELDCALCULATIONS& Htype);
 
     // other way around is a template, where template argument lets us know
@@ -96,6 +112,7 @@ namespace Lemma {
         }
     };
 
+/** @}*/
 
 } // end namespace Lemma
 

Modules/FDEM1D/include/dipolesource.h → Modules/FDEM1D/include/DipoleSource.h

@@ -15,9 +15,10 @@
 #define __DIPOLESOURCE_H
 
 #include "LemmaObject.h"
-#include "layeredearthem.h"
-//#include "kernelem1dmanager.h"
+#include "LayeredEarthEM.h"
 
+#include "receiverpoints.h"
+#include "emearth1d.h"
 
 #ifdef LEMMAUSEVTK
 #include "vtkActor.h"

Modules/FDEM1D/include/receiverpoints.h → Modules/FDEM1D/include/FieldPoints.h

@@ -11,8 +11,8 @@
   @version  $Id: receiverpoints.h 199 2014-12-29 19:25:20Z tirons $
  **/
 
-#ifndef __RECEIVERPOINTS_H
-#define __RECEIVERPOINTS_H
+#ifndef __FIELDPOINTS_H
+#define __FIELDPOINTS_H
 
 #ifdef LEMMAUSEVTK
 #include "vtkPointData.h"
@@ -37,20 +37,22 @@
 namespace Lemma {
 
     // =======================================================================
-    //        Class:  ReceiverPoints
-    /// \brief  Points in the subsurface to make EM calculations,
-    ///  more general than the grids.
+    //        Class:  FieldPoints
+    /**
+     *  \brief  Points in the subsurface where 1D EM calculations are made
+     */ \details
     // =======================================================================
-    class ReceiverPoints : public LemmaObject {
+    class FieldPoints : public LemmaObject {
 
         public:
 
             // ====================    FRIENDS     ===========================
 
-            /** Stream operator printing out information about this class.
+            /**
+             *  Stream operator printing out information about this class.
              */
             friend std::ostream &operator<<(std::ostream &stream,
-                        const ReceiverPoints &ob);
+                        const FieldPoints &ob);
 
             friend class EMEarth1D;
             friend class DipoleSource;
@@ -58,19 +60,23 @@ namespace Lemma {
             // ====================  LIFECYCLE     ===========================
 
             /**
-             *  Returns pointer to new DipoleSource. Location is
-             *  initialized to (0,0,0) type and polarization are
-             *  initialized  to nonworking values that will throw
-             *  exceptions if used.
+             *  Factory method for generating concrete class.
+             *  @return a std::shared_ptr of type FieldPoints
              */
-            static ReceiverPoints* New();
+            static std::shared_ptr<FieldPoints*> NewSP();
 
+        	/**
+             *  Uses YAML to serialize this object.
+             *  @return a YAML::Node
+             */
+            YAML::Node Serialize() const;
 
             /**
-             * @copybrief LemmaObject::Delete()
-             * @copydetails LemmaObject::Delete()
+             *   Constructs an object from a YAML::Node.
+             *   @param[in] node is a YAML node containing the serialized class information
+             *   @return a std::shared_ptr object of FieldPoints
              */
-            void Delete();
+            static std::shared_ptr< FieldPoints* > DeSerialize(const YAML::Node& node);
 
             // ====================  OPERATORS     ===========================
 
@@ -78,10 +84,10 @@ namespace Lemma {
 
             // ====================  ACCESS        ===========================
 
-            /// Sets the number of receivers
+            /** Sets the number of receivers */
             virtual void SetNumberOfReceivers(const int &nrec);
 
-            /// Returns the location of a single receiver as an Eigen Vector
+            /** Returns the location of a single receiver as an Eigen Vector */
             void SetLocation(const int& nrec, const Vector3r& loc);
 
             /// Returns the location of a single receiver as an Eigen Vector
@@ -181,33 +187,21 @@ namespace Lemma {
             /// Returns the mask for this point
             int GetMask(const int& i);
 
-            #ifdef HAVE_YAMLCPP
-        	/**
-             *  Uses YAML to serialize this object.
-             *  @return a YAML::Node
-             */
-            YAML::Node Serialize() const;
-
-            /**
-             *   Constructs an object from a YAML::Node.
-             */
-            static ReceiverPoints* DeSerialize(const YAML::Node& node);
-            #endif
 
         protected:
 
             // ====================  LIFECYCLE     ===========================
 
-            /// Default protected constructor.
-            ReceiverPoints (const std::string& name);
+            /** Default protected constructor. */
+            FieldPoints ( );
 
             #ifdef HAVE_YAMLCPP
-            /// Default protected constructor.
-            ReceiverPoints (const YAML::Node& node);
+            /** Default protected constructor. */
+            FieldPoints (const YAML::Node& node);
             #endif
 
-            /// Default protected constructor.
-            ~ReceiverPoints ();
+            /** Default protected constructor. */
+            ~FieldPoints ();
 
             /**
              * @copybrief LemmaObject::Release()
@@ -275,7 +269,11 @@ namespace Lemma {
             /// H field at receiver locations
             std::vector<Vector3Xcr>     Hfield;
 
-    }; // -----  end of class  ReceiverPoints  -----
+
+            /** ASCII string representation of the class name */
+            static constexpr auto CName = "FieldPoints";
+
+    }; // -----  end of class  FieldPoints  -----
 }
 
-#endif // __RECEIVERPOINTS
+#endif // __FIELDPOINTS

Modules/FDEM1D/src/CMakeLists.txt

@@ -1,6 +1,9 @@
 set (FEM1DSOURCE
 	${FEM1DSOURCE}
+	#${CMAKE_CURRENT_SOURCE_DIR}/AEMSurvey.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/LayeredEarthEM.cpp
+	#${CMAKE_CURRENT_SOURCE_DIR}/FieldPoints.cpp
+	#${CMAKE_CURRENT_SOURCE_DIR}/DipoleSource.cpp
 	#${CMAKE_CURRENT_SOURCE_DIR}/UngroundedElectricDipole.cpp
 	PARENT_SCOPE
 )

Modules/FDEM1D/src/dipolesource.cpp → Modules/FDEM1D/src/DipoleSource.cpp

@@ -33,14 +33,8 @@
 
 #include <iostream>
 #include <fstream>
-#include "dipolesource.h"
-#include "layeredearthem.h"
-#include "receiverpoints.h"
-#include "emearth1d.h"
+#include "DipoleSource.h"
 
-#ifdef LEMMAUSEOMP
-#include "omp.h"
-#endif
 
 // For testing purposes disable VTK and run scale.sh
 #undef LEMMAUSEVTK