Lemma V 0.2.0, ctor_key now only at root level

CMakeLists.txt

@@ -219,8 +219,8 @@ if(COMPILER_SUPPORTS_OPENMP AND LEMMA_USE_OPENMP )
 endif()
 
 set(LEMMA_VERSION_MAJOR "0")
-set(LEMMA_VERSION_MINOR "1")
-set(LEMMA_VERSION_PATCH "2")
+set(LEMMA_VERSION_MINOR "2")
+set(LEMMA_VERSION_PATCH "0")
 set(LEMMA_VERSION "\"${LEMMA_VERSION_MAJOR}.${LEMMA_VERSION_MINOR}.${LEMMA_VERSION_PATCH}\"")
 set(LEMMA_VERSION_NOQUOTES "${LEMMA_VERSION_MAJOR}.${LEMMA_VERSION_MINOR}.${LEMMA_VERSION_PATCH}")
 

Modules/FDEM1D/include/DipoleSource.h

@@ -46,8 +46,6 @@ namespace Lemma {
 
         friend std::ostream &operator<<(std::ostream &stream, const DipoleSource &ob);
 
-        struct ctor_key{};
-
         public:
 
             // ====================  LIFECYCLE     ======================

Modules/FDEM1D/include/EMEarth1D.h

@@ -54,8 +54,6 @@ namespace Lemma {
 		friend std::ostream &operator<<(std::ostream &stream,
 			const EMEarth1D &ob);
 
-        struct ctor_key{};
-
         public:
 
             //friend class KernelEm1D;

Modules/FDEM1D/include/FHTAnderson801.h

@@ -61,8 +61,6 @@ class FHTAnderson801 : public HankelTransform {
 
     friend std::ostream &operator<<(std::ostream &stream, const FHTAnderson801 &ob);
 
-    struct ctor_key {};
-
     public:
 
         // ====================  LIFECYCLE     ==============================

Modules/FDEM1D/include/FHTKey101.h

@@ -39,8 +39,6 @@ namespace Lemma {
 
         friend std::ostream &operator<<(std::ostream &stream, const FHTKey101 &ob);
 
-        struct ctor_key {};
-
         public:
 
         // ====================  LIFECYCLE     =======================

Modules/FDEM1D/include/FHTKey201.h

@@ -38,13 +38,10 @@ namespace Lemma {
     class FHTKey201 : public HankelTransform {
 
         friend std::ostream &operator<<(std::ostream &stream, const FHTKey201 &ob);
-
-        struct ctor_key {};
+        // ====================  LIFECYCLE     =======================
 
         public:
 
-        // ====================  LIFECYCLE     =======================
-
         /** Default locked constructor, use NewSP */
         FHTKey201 ( const ctor_key& );
 

Modules/FDEM1D/include/FHTKey51.h

@@ -39,8 +39,6 @@ namespace Lemma {
 
         friend std::ostream &operator<<(std::ostream &stream, const FHTKey51 &ob);
 
-        struct ctor_key {};
-
         public:
 
         // ====================  LIFECYCLE     =======================

Modules/FDEM1D/include/FieldPoints.h

@@ -56,14 +56,10 @@ namespace Lemma {
          */
         friend std::ostream &operator<<(std::ostream &stream, const FieldPoints &ob);
 
-        struct ctor_key {};
-
         public:
 
             // ====================    FRIENDS     ===========================
 
-
-
             // ====================  LIFECYCLE     ===========================
 
             /** Default locked constructor. */

Modules/FDEM1D/include/GQChave.h

@@ -31,9 +31,6 @@ namespace Lemma {
 	class GQChave : public HankelTransform {
 
 		friend std::ostream &operator<<(std::ostream &stream, const GQChave &ob);
-
-        struct ctor_key{};
-
 		public:
 
 			// ====================  LIFECYCLE     ===========================

Modules/FDEM1D/include/HankelTransform.h

@@ -75,10 +75,10 @@ namespace Lemma {
                 // ====================  LIFECYCLE     =======================
 
                 /// Default protected constructor.
-                HankelTransform ( );
+                HankelTransform ( const ctor_key& );
 
                 /// Default protected constructor.
-                HankelTransform ( const YAML::Node& node );
+                HankelTransform ( const YAML::Node& node, const ctor_key& );
 
                 /// Default protected constructor.
                 ~HankelTransform ( );

Modules/FDEM1D/include/KernelEM1DBase.h

@@ -38,7 +38,7 @@ namespace Lemma {
             // ====================  LIFECYCLE     =======================
 
             /// Default protected constructor.
-            KernelEM1DBase ( ) : LemmaObject( ) {
+            KernelEM1DBase ( const ctor_key& key ) : LemmaObject( key ) {
 
             }
 

Modules/FDEM1D/include/KernelEM1DManager.h

@@ -32,8 +32,6 @@ namespace Lemma {
     // ===================================================================
     class KernelEM1DManager : public LemmaObject {
 
-        struct ctor_key {};
-
         /** Recursively streams information about this class */
         friend std::ostream &operator<<(std::ostream &stream, const KernelEM1DManager &ob);
 

Modules/FDEM1D/include/KernelEM1DReflBase.h

@@ -151,7 +151,7 @@ namespace Lemma {
             // ====================  LIFECYCLE     =======================
 
             /// Default protected constructor.
-            KernelEM1DReflBase ( ) : LemmaObject( )
+            KernelEM1DReflBase ( const ctor_key& key ) : LemmaObject( key )
             {
             }
 

Modules/FDEM1D/include/KernelEM1DReflSpec.h

@@ -38,9 +38,6 @@ namespace Lemma {
     template<EMMODE Mode, DIPOLE_LOCATION Isource, DIPOLE_LOCATION Irecv>
     class KernelEM1DReflSpec : public KernelEM1DReflBase {
 
-        // TODO can we use the manager's key instead to lock for that?
-        struct ctor_key{};
-
         public:
 
             //template<EMMODE Mode2, int Ikernel2, DIPOLE_LOCATION Isource2, DIPOLE_LOCATION Irecv2>
@@ -51,7 +48,7 @@ namespace Lemma {
             // ====================  LIFECYCLE     =======================
 
             /// Default locked constructor.
-            explicit KernelEM1DReflSpec ( const ctor_key& ) : KernelEM1DReflBase( ) {
+            explicit KernelEM1DReflSpec ( const ctor_key& key ) : KernelEM1DReflBase( key ) {
             }
 
             /// Default protected constructor.
@@ -72,7 +69,7 @@ namespace Lemma {
 
             virtual std::string GetName() {
                 return CName;
-            } 
+            }
 
         protected:
         private:

Modules/FDEM1D/include/KernelEM1DSpec.h

@@ -37,14 +37,12 @@ namespace Lemma {
     template<EMMODE Mode, int Ikernel, DIPOLE_LOCATION Isource, DIPOLE_LOCATION Irecv>
     class KernelEM1DSpec : public KernelEM1DBase {
 
-        struct ctor_key {};
-
         public:
 
             // ====================  LIFECYCLE     =======================
 
             /// Default locked constructor.
-            explicit KernelEM1DSpec (const ctor_key& ) : KernelEM1DBase( ), ReflCalc(nullptr) {
+            explicit KernelEM1DSpec (const ctor_key& key ) : KernelEM1DBase( key ), ReflCalc(nullptr) {
             }
 
             /// Default destructor.
@@ -59,7 +57,7 @@ namespace Lemma {
             }
 
             static std::shared_ptr<KernelEM1DSpec> NewSP(LayeredEarthEM* Earth, std::shared_ptr<DipoleSource> Dipole,
-                                                                                        const int& ifreq, const Real& rz) {
+                                                         const int& ifreq, const Real& rz) {
                 auto Obj = std::make_shared< KernelEM1DSpec > ( ctor_key() );
 
                 // under this scenario KernelEM1DSpec manages its own Refl Base

Modules/FDEM1D/include/LayeredEarthEM.h

@@ -34,8 +34,6 @@ namespace Lemma {
         /** Recursively streams information about this class */
         friend std::ostream &operator<<(std::ostream &stream, const LayeredEarthEM &ob);
 
-        struct ctor_key {};
-
         public:
 
             // ====================  LIFECYCLE     ===========================

Modules/FDEM1D/include/PolygonalWireAntenna.h

@@ -29,8 +29,6 @@ namespace Lemma {
 
         friend std::ostream &operator<<(std::ostream &stream, const PolygonalWireAntenna &ob);
 
-        struct ctor_key {};
-
         public:
 
             // ====================  LIFECYCLE     =======================

Modules/FDEM1D/include/QWEKey.h

@@ -50,8 +50,6 @@ namespace Lemma {
 
         friend std::ostream &operator<<(std::ostream &stream, const QWEKey &ob);
 
-        struct ctor_key {};
-
         public:
 
         // ====================  LIFECYCLE     =======================

Modules/FDEM1D/include/WireAntenna.h

@@ -33,9 +33,6 @@ namespace Lemma {
 
         friend std::ostream &operator<<(std::ostream &stream, const WireAntenna &ob);
 
-        protected:
-        struct ctor_key {};
-
         public:
 
             // ====================  LIFECYCLE     =======================

Modules/FDEM1D/src/DipoleSource.cpp

@@ -26,14 +26,14 @@ namespace Lemma {
 
     // ====================    FRIENDS     ======================
     std::ostream &operator<<(std::ostream &stream, const DipoleSource &ob) {
-        stream << ob.Serialize()  << "\n---\n"; // End of doc ---
+        stream << ob.Serialize()  << "\n";
         return stream;
     }
 
 
     // ====================  LIFECYCLE     ======================
 
-    DipoleSource::DipoleSource( const ctor_key& ) : LemmaObject( ),
+    DipoleSource::DipoleSource( const ctor_key& key ) : LemmaObject( key ),
                     Type(NOSOURCETYPE),
                     irec(-1),
                     Phase(0),

Modules/FDEM1D/src/EMEarth1D.cpp

@@ -22,7 +22,7 @@
 namespace Lemma {
 
     std::ostream &operator << (std::ostream &stream, const EMEarth1D &ob) {
-        stream << ob.Serialize()  << "\n---\n"; // End of doc ---
+        stream << ob.Serialize()  << "\n";
         return stream;
     }
 
@@ -70,7 +70,7 @@ namespace Lemma {
     // ====================  LIFECYCLE     ===================================
 
     // TODO init large arrays here.
-    EMEarth1D::EMEarth1D( const ctor_key& ) : LemmaObject( ),
+    EMEarth1D::EMEarth1D( const ctor_key& key ) : LemmaObject( key ),
             Dipole(nullptr), Earth(nullptr), Receivers(nullptr), Antenna(nullptr),
             FieldsToCalculate(BOTH), HankelType(ANDERSON801), icalcinner(0), icalc(0)
         //#ifdef HAVEBOOSTPROGRESS

Modules/FDEM1D/src/FHTAnderson801.cpp

@@ -16,7 +16,7 @@
 namespace Lemma {
 
     std::ostream &operator << (std::ostream &stream, const FHTAnderson801 &ob) {
-        stream << ob.Serialize()  << "\n---\n"; // End of doc ---
+        stream << ob.Serialize()  << "\n";
         return stream;
     }
 
@@ -841,13 +841,13 @@ namespace Lemma {
 	const Real FHTAnderson801::ABSER = 0.904837418035959573;      // 1/exp(.1)
 
 	// ====================  LIFECYCLE     ==============================
-	FHTAnderson801::FHTAnderson801(const ctor_key& ) : HankelTransform( ),
+	FHTAnderson801::FHTAnderson801(const ctor_key& key ) : HankelTransform( key ),
 			             Lambda(0), NumFun(0),
 						 NumConv(0), NumRel(0),
 						 BesselOrder(-1),  Manager(nullptr) {
 	}
 
-    FHTAnderson801::FHTAnderson801( const YAML::Node& node, const ctor_key& ) : HankelTransform( ) {
+    FHTAnderson801::FHTAnderson801( const YAML::Node& node, const ctor_key& key ) : HankelTransform( key ) {
         Lambda = node["Lambda"].as<Real>();
         NumFun = node["NumFun"].as<int>();
 		NumConv = node["NumConv"].as<int>();

Modules/FDEM1D/src/FHTKey101.cpp

@@ -23,7 +23,7 @@ namespace Lemma {
     // ====================  FRIEND METHODS  =====================
 
     std::ostream &operator<<(std::ostream &stream, const FHTKey101 &ob) {
-        stream << ob.Serialize()  << "\n---\n"; // End of doc ---
+        stream << ob.Serialize()  << "\n";
         return stream;
     }
 
@@ -141,7 +141,7 @@ namespace Lemma {
     //      Method:  FHTKey101
     // Description:  constructor (locked)
     //--------------------------------------------------------------------------------------
-    FHTKey101::FHTKey101 ( const ctor_key& ) : HankelTransform( ) {
+    FHTKey101::FHTKey101 ( const ctor_key& key ) : HankelTransform( key ) {
 
     }  // -----  end of method FHTKey101::FHTKey101  (constructor)  -----
 
@@ -150,7 +150,7 @@ namespace Lemma {
     //      Method:  FHTKey101
     // Description:  constructor (protected)
     //--------------------------------------------------------------------------------------
-    FHTKey101::FHTKey101( const YAML::Node& node, const ctor_key& ) : HankelTransform(node) {
+    FHTKey101::FHTKey101( const YAML::Node& node, const ctor_key& key ) : HankelTransform(node, key) {
 
     }
 

Modules/FDEM1D/src/FHTKey201.cpp

@@ -22,7 +22,7 @@ namespace Lemma {
     // ====================  FRIEND METHODS  =====================
 
     std::ostream &operator<<(std::ostream &stream, const FHTKey201 &ob) {
-        stream << ob.Serialize()  << "\n---\n"; // End of doc ---
+        stream << ob.Serialize()  << "\n";
         return stream;
     }
 
@@ -240,7 +240,7 @@ namespace Lemma {
     //      Method:  FHTKey201
     // Description:  constructor (locked)
     //--------------------------------------------------------------------------------------
-    FHTKey201::FHTKey201 (const ctor_key& ) : HankelTransform( ) {
+    FHTKey201::FHTKey201 (const ctor_key& key ) : HankelTransform( key ) {
 
     }  // -----  end of method FHTKey201::FHTKey201  (constructor)  -----
 
@@ -249,7 +249,7 @@ namespace Lemma {
     //      Method:  FHTKey201
     // Description:  constructor (locked)
     //--------------------------------------------------------------------------------------
-    FHTKey201::FHTKey201( const YAML::Node& node, const ctor_key& ) : HankelTransform(node) {
+    FHTKey201::FHTKey201( const YAML::Node& node, const ctor_key& key) : HankelTransform(node, key) {
 
     }
 

Modules/FDEM1D/src/FHTKey51.cpp

@@ -24,7 +24,7 @@ namespace Lemma {
     // ====================  FRIEND METHODS  =====================
 
     std::ostream &operator<<(std::ostream &stream, const FHTKey51 &ob) {
-        stream << ob.Serialize()  << "\n---\n"; // End of doc ---
+        stream << ob.Serialize()  << "\n"; // End of doc ---
         return stream;
     }
 
@@ -92,7 +92,7 @@ namespace Lemma {
     //      Method:  FHTKey51
     // Description:  constructor (locked)
     //--------------------------------------------------------------------------------------
-    FHTKey51::FHTKey51 (const ctor_key& ) : HankelTransform( ) {
+    FHTKey51::FHTKey51 (const ctor_key& key ) : HankelTransform( key ) {
 
     }  // -----  end of method FHTKey51::FHTKey51  (constructor)  -----
 
@@ -101,7 +101,7 @@ namespace Lemma {
     //      Method:  FHTKey51
     // Description:  constructor (protected)
     //--------------------------------------------------------------------------------------
-    FHTKey51::FHTKey51( const YAML::Node& node, const ctor_key& ) : HankelTransform(node) {
+    FHTKey51::FHTKey51( const YAML::Node& node, const ctor_key& key ) : HankelTransform(node, key) {
 
     }
 

Modules/FDEM1D/src/FieldPoints.cpp

@@ -18,13 +18,13 @@ namespace Lemma {
     // ====================    FRIENDS     ======================
 
     std::ostream &operator << (std::ostream &stream, const FieldPoints &ob) {
-        stream << ob.Serialize()  << "\n---\n"; // End of doc ---
+        stream << ob.Serialize()  << "\n";
         return stream;
     }
 
     // ====================  LIFECYCLE     ===================================
 
-    FieldPoints::FieldPoints( const ctor_key& ) : LemmaObject( ),
+    FieldPoints::FieldPoints( const ctor_key& key ) : LemmaObject( key ),
         NumberOfPoints(0), NumberOfBinsE(0), NumberOfBinsH(0) {
     }
 
@@ -33,7 +33,7 @@ namespace Lemma {
     //      Method:  FieldPoints
     // Description:  constructor (protected)
     //--------------------------------------------------------------------------------------
-    FieldPoints::FieldPoints (const YAML::Node& node, const ctor_key&) : LemmaObject(node) {
+    FieldPoints::FieldPoints (const YAML::Node& node, const ctor_key& key) : LemmaObject(node, key) {
         //DeSerialize
         NumberOfPoints = node["NumberOfPoints"].as<int>();
         NumberOfBinsE = node["NumberOfBinsE"].as<int>();

Modules/FDEM1D/src/GQChave.cpp

@@ -22,7 +22,7 @@
 namespace Lemma{
 
     std::ostream &operator<<(std::ostream &stream, const GQChave &ob) {
-        stream << ob.Serialize()  << "\n---\n"; // End of doc ---
+        stream << ob.Serialize()  << "\n";
         return stream;
     }
 
@@ -264,12 +264,12 @@ namespace Lemma{
     const Real J1_X12 = -0.5382308663841630e-15;
 */
 
-    GQChave::GQChave( const ctor_key& ) : HankelTransform( ) {
+    GQChave::GQChave( const ctor_key& key ) : HankelTransform( key ) {
         karg.resize(255, 100);
         kern.resize(510, 100);
     }
 
-    GQChave::GQChave( const YAML::Node& node, const ctor_key& ) : HankelTransform(node) {
+    GQChave::GQChave( const YAML::Node& node, const ctor_key& key ) : HankelTransform(node, key) {
 
     }
 

Modules/FDEM1D/src/HankelTransform.cpp

@@ -16,14 +16,14 @@
 namespace Lemma {
 
     std::ostream &operator << (std::ostream &stream, const HankelTransform &ob) {
-        stream << ob.Serialize()  << "\n---\n"; // End of doc ---
+        stream << ob.Serialize()  << "\n";
         return stream;
     }
 
-	HankelTransform::HankelTransform( ) : LemmaObject( )	{
+	HankelTransform::HankelTransform( const ctor_key& key ) : LemmaObject( key )	{
 	}
 
-    HankelTransform::HankelTransform( const YAML::Node& node ) : LemmaObject( node )	{
+    HankelTransform::HankelTransform( const YAML::Node& node, const ctor_key& key  ) : LemmaObject( node, key )	{
 	}
 
 	HankelTransform::~HankelTransform( ) {

Modules/FDEM1D/src/KernelEM1DManager.cpp

@@ -15,13 +15,13 @@
 namespace Lemma {
 
     std::ostream &operator<<(std::ostream &stream, const KernelEM1DManager &ob) {
-        stream << ob.Serialize() << "\n---\n";
+        stream << ob.Serialize() << "\n";
         return stream;
     }
 
     // ====================  LIFECYCLE     =======================
 
-    KernelEM1DManager::KernelEM1DManager( const ctor_key& ) : LemmaObject( ), TEReflBase(nullptr),
+    KernelEM1DManager::KernelEM1DManager( const ctor_key& key ) : LemmaObject( key ), TEReflBase(nullptr),
         TMReflBase(nullptr), Earth(nullptr), Dipole(nullptr) {
     }
 

Modules/FDEM1D/src/LayeredEarthEM.cpp

@@ -16,16 +16,16 @@
 namespace Lemma {
 
     std::ostream &operator << (std::ostream &stream, const LayeredEarthEM &ob) {
-        stream << ob.Serialize()  << "\n---\n"; // End of doc ---
+        stream << ob.Serialize()  << "\n";
         return stream;
     }
 
     // ====================  LIFECYCLE     ===================================
 
-    LayeredEarthEM::LayeredEarthEM( const ctor_key& key ) : LayeredEarth( LayeredEarth::ctor_key() ) {
+    LayeredEarthEM::LayeredEarthEM( const ctor_key& key ) : LayeredEarth( key ) {
     }
 
-    LayeredEarthEM::LayeredEarthEM( const YAML::Node& node, const ctor_key& ) : LayeredEarth(node) {
+    LayeredEarthEM::LayeredEarthEM( const YAML::Node& node, const ctor_key& key ) : LayeredEarth(node, key) {
         SetNumberOfLayers(NumberOfLayers);
         LayerThickness = node["LayerThickness"].as<VectorXr>();
         if (node["LayerConductivity"]) {

Modules/FDEM1D/src/PolygonalWireAntenna.cpp

@@ -16,19 +16,20 @@
 namespace Lemma {
 
     std::ostream &operator << (std::ostream &stream, const PolygonalWireAntenna &ob) {
-        stream << ob.Serialize()  << "\n---\n"; // End of doc ---
+        stream << ob.Serialize()  << "\n";
         return stream;
     }
 
 	// ====================  LIFECYCLE     =======================
 
-	PolygonalWireAntenna::PolygonalWireAntenna( const ctor_key& key ) : WireAntenna( WireAntenna::ctor_key() ), minDipoleRatio(.15),
+	PolygonalWireAntenna::PolygonalWireAntenna( const ctor_key& key ) :
+            WireAntenna( key ), minDipoleRatio(.15),
    		minDipoleMoment(1e-6), maxDipoleMoment(1e1), rRepeat(1e10,1e10,1e10) {
 		Points.setZero();
         //rRepeat.setOnes();
 	}
 
-    PolygonalWireAntenna::PolygonalWireAntenna( const YAML::Node& node, const ctor_key& ) : WireAntenna(node, WireAntenna::ctor_key() ) {
+    PolygonalWireAntenna::PolygonalWireAntenna( const YAML::Node& node, const ctor_key& key) : WireAntenna(node, key ) {
         minDipoleRatio   = node["minDipoleRatio"].as<Real>();
         maxDipoleMoment  = node["maxDipoleMoment"].as<Real>();
         minDipoleMoment  = node["minDipoleMoment"].as<Real>();

Modules/FDEM1D/src/QWEKey.cpp

@@ -43,7 +43,7 @@ namespace Lemma {
     // Description:  constructor (protected)
     //--------------------------------------------------------------------------------------
     //
-    QWEKey::QWEKey (const ctor_key& ) : HankelTransform( ), RelTol(1e-12), AbsTol(1e-32), nQuad(61), nDelay(1),
+    QWEKey::QWEKey (const ctor_key& key) : HankelTransform( key ), RelTol(1e-12), AbsTol(1e-32), nQuad(61), nDelay(1),
     //QWEKey::QWEKey (const std::string& name) : HankelTransform(name), RelTol(1e-38), AbsTol(1e-48), nQuad(39), nDelay(5),
         nIntervalsMax(40) {
         BesselWeights( J0 ); // TODO experiment with zero weight (J0, J1) options, should be static one time method
@@ -54,7 +54,7 @@ namespace Lemma {
     //      Method:  QWEKey
     // Description:  constructor (locked)
     //--------------------------------------------------------------------------------------
-    QWEKey::QWEKey( const YAML::Node& node, const ctor_key& ) : HankelTransform(node) {
+    QWEKey::QWEKey( const YAML::Node& node, const ctor_key& key ) : HankelTransform(node, key) {
 
     }
 

Modules/FDEM1D/src/WireAntenna.cpp

@@ -16,17 +16,17 @@
 namespace Lemma {
 
     std::ostream &operator << (std::ostream &stream, const WireAntenna &ob) {
-        stream << ob.Serialize()  << "\n---\n"; // End of doc ---
+        stream << ob.Serialize()  << "\n";
         return stream;
     }
 
     // ====================  LIFECYCLE     =======================
 
-    WireAntenna::WireAntenna( const ctor_key& ) : LemmaObject( ),
+    WireAntenna::WireAntenna( const ctor_key& key ) : LemmaObject( key ),
         NumberOfPoints(0), Current(1), NumberOfTurns(1) {
     }
 
-    WireAntenna::WireAntenna( const YAML::Node& node, const ctor_key& ) : LemmaObject( node ) {
+    WireAntenna::WireAntenna( const YAML::Node& node, const ctor_key& key ) : LemmaObject( node, key ) {
         Points =  node["Points"].as<Vector3Xr>();
         Freqs = node["Freqs"].as<VectorXr>();
         NumberOfPoints = node["NumberOfPoints"].as<int>();

Modules/LemmaCore/include/CubicSplineInterpolator.h

@@ -12,9 +12,8 @@
  * @date      09/25/2013 08:20:14 AM
  * @version   $Id$
  * @author    Trevor Irons (ti)
- * @email     Trevor.Irons@xri-geo.com
- * @copyright Copyright (c) 2013, XRI Geophysics, LLC
- * @copyright Copyright (c) 2013, Trevor Irons
+ * @email     Trevor.Irons@lemmasoftware.org
+ * @copyright Copyright (c) 2013,2018 Trevor Irons
  */
 
 #ifndef  CUBICSPLINEINTERPOLATOR_INC
@@ -62,7 +61,7 @@ class CubicSplineInterpolator : public LemmaObject {
     friend std::ostream &operator<<(std::ostream &stream,
             const CubicSplineInterpolator& ob);
 
-    struct ctor_key {};
+    //struct ctor_key {};
 
     public:
 

Modules/LemmaCore/include/Data.h

@@ -70,10 +70,10 @@ namespace Lemma {
             // ====================  LIFECYCLE     =======================
 
             /** Default protected constructor. */
-            Data (  );
+            Data ( const ctor_key& key  );
 
             /** Deserializing contructor */
-            Data ( const YAML::Node& node );
+            Data ( const YAML::Node& node, const ctor_key& key );
 
             /** Default protected constructor. */
             ~Data ( );

Modules/LemmaCore/include/DataReader.h

@@ -53,10 +53,10 @@ class DataReader : public LemmaObject {
         // ====================  LIFECYCLE     =======================
 
         /// Default protected constructor.
-        DataReader ( );
+        DataReader ( const ctor_key& key );
 
         /// Default protected constructor.
-        DataReader ( const YAML::Node& node );
+        DataReader ( const YAML::Node& node, const ctor_key& key );
 
         /// Default protected constructor.
         ~DataReader ( );

Modules/LemmaCore/include/EarthModel.h

@@ -99,10 +99,10 @@ namespace Lemma {
             // ====================  LIFECYCLE     =======================
 
             /// Default protected constructor.
-            EarthModel ( );
+            EarthModel ( const ctor_key& );
 
             /** Deserialize constructor */
-            EarthModel (const YAML::Node& node);
+            EarthModel (const YAML::Node& node, const ctor_key&);
 
             /// Default protected constructor.
             ~EarthModel ();

Modules/LemmaCore/include/Filter.h

@@ -56,10 +56,10 @@ namespace Lemma {
             // ====================  LIFECYCLE     =======================
 
             /// Default protected constructor.
-            Filter ( );
+            Filter ( const ctor_key&  );
 
             /// Default protected constructor.
-            Filter ( const YAML::Node& node );
+            Filter ( const YAML::Node& node, const ctor_key& );
 
             /// Default protected constructor.
             virtual ~Filter ();

Modules/LemmaCore/include/Grid.h

@@ -53,10 +53,10 @@ class Grid : public LemmaObject {
         // ====================  LIFECYCLE     ===================================
 
         /** Protected DeDerializing constructor, use factory DeSerialize  method on non abstract classes*/
-        Grid (const YAML::Node& node);
+        Grid (const YAML::Node& node, const ctor_key& );
 
         /// Default protected constructor.
-        Grid ( );
+        Grid ( const ctor_key& );
 
         /// Default protected constructor.
         virtual ~Grid ( );

Modules/LemmaCore/include/GridReader.h

@@ -60,11 +60,11 @@ namespace Lemma {
             // ====================  LIFECYCLE     =======================
 
             /** Default protected constructor, use New */
-            GridReader ( ) : LemmaObject( ) {
+            GridReader ( const ctor_key& key ) : LemmaObject( key ) {
             }
 
             /** Default protected constructor, use New */
-            GridReader ( const YAML::Node& node ) : LemmaObject( node ) {
+            GridReader ( const YAML::Node& node, const ctor_key& key ) : LemmaObject( node, key ) {
             }
 
             /** Default protected constructor, use Delete */

Modules/LemmaCore/include/LayeredEarth.h

@@ -30,8 +30,6 @@ namespace Lemma {
         friend class LayeredEarthEM;
         friend class LayeredEarthMR;
 
-        struct ctor_key{};
-
 		public:
 
 			// ====================    FRIENDS     ===========================
@@ -107,7 +105,7 @@ namespace Lemma {
 			LayeredEarth ( const ctor_key& );
 
             /** Default protected constructor. */
-			LayeredEarth (const YAML::Node& node);
+			LayeredEarth (const YAML::Node& node, const ctor_key& key);
 
 			/** Default protected constructor. */
 			~LayeredEarth ();

Modules/LemmaCore/include/RectilinearGrid.h

@@ -34,7 +34,7 @@ namespace Lemma {
         /*
          *  This key is used to lock the constructors
          */
-        struct ctor_key {};
+        //struct ctor_key {};
 
         public:
 

Modules/LemmaCore/include/RectilinearGridReader.h

@@ -39,7 +39,7 @@ namespace Lemma {
         /*
          *  This key is used to lock the constructors
          */
-        struct ctor_key {};
+        //struct ctor_key {};
 
         public:
 

Modules/LemmaCore/include/RectilinearGridVTKExporter.h

@@ -45,7 +45,7 @@ class RectilinearGridVTKExporter : public LemmaObject {
     friend std::ostream &operator<<(std::ostream &stream,
             const RectilinearGridVTKExporter &ob);
 
-    struct ctor_key {};
+    //struct ctor_key {};
 
     public:
 

Modules/LemmaCore/include/WindowFilter.h

@@ -30,7 +30,7 @@ namespace Lemma {
 
         friend std::ostream &operator<<(std::ostream &stream, const WindowFilter& ob);
 
-        struct ctor_key {};
+        //struct ctor_key {};
 
         public:
 

Modules/LemmaCore/src/CubicSplineInterpolator.cpp

@@ -12,8 +12,8 @@
  * @date      02/07/2014 12:50:52 PM
  * @version   $Id$
  * @author    Trevor Irons (ti)
- * @email     Trevor.Irons@xri-geo.com
- * @copyright Copyright (c) 2014, Trevor Irons
+ * @email     Trevor.Irons@lemmasoftware.org
+ * @copyright Copyright (c) 2014,2018 Trevor Irons
  */
 
 #include "CubicSplineInterpolator.h"
@@ -40,7 +40,7 @@ namespace Lemma {
     //      Method:  CubicSplineInterpolator
     // Description:  constructor (locked with ctor_key)
     //--------------------------------------------------------------------------------------
-    CubicSplineInterpolator::CubicSplineInterpolator ( const ctor_key& ) : LemmaObject( ) {
+    CubicSplineInterpolator::CubicSplineInterpolator ( const ctor_key& key ) : LemmaObject( key ) {
 
     }  // -----  end of method CubicSplineInterpolator::CubicSplineInterpolator  (constructor)  -----
 
@@ -49,7 +49,7 @@ namespace Lemma {
     //      Method:  CubicSplineInterpolator
     // Description:  DeSerializing constructor (locked with ctor_key)
     //--------------------------------------------------------------------------------------
-    CubicSplineInterpolator::CubicSplineInterpolator (const YAML::Node& node, const ctor_key& ) : LemmaObject(node) {
+    CubicSplineInterpolator::CubicSplineInterpolator (const YAML::Node& node, const ctor_key& key ) : LemmaObject(node, key) {
     }  // -----  end of method CubicSplineInterpolator::CubicSplineInterpolator  (constructor)  -----
 
     //--------------------------------------------------------------------------------------

Modules/LemmaCore/src/Data.cpp

@@ -16,14 +16,14 @@
 namespace Lemma {
 
     std::ostream &operator << (std::ostream &stream, const Data &ob) {
-        stream << ob.Serialize()  << "\n---\n"; // End of doc --- as a direct stream should encapulste thingy
+        stream << ob.Serialize()  << "\n";
         return stream;
     }
 
-	Data::Data(  ) : LemmaObject( ) {
+	Data::Data( const ctor_key& key  ) : LemmaObject( key ) {
 	}
 
-    Data::Data( const YAML::Node& node ) : LemmaObject( node ) {
+    Data::Data( const YAML::Node& node, const ctor_key& key ) : LemmaObject( node, key ) {
 	}
 
 

Modules/LemmaCore/src/DataReader.cpp

@@ -16,15 +16,15 @@
 namespace Lemma {
 
     std::ostream &operator << (std::ostream &stream, const DataReader &ob) {
-        stream << ob.Serialize()  << "\n---\n"; // End of doc --- as a direct stream should encapulste thingy
+        stream << ob.Serialize()  << "\n";
         return stream;
     }
 
-	DataReader::DataReader( ) : LemmaObject( ) {
+	DataReader::DataReader( const ctor_key& key ) : LemmaObject( key ) {
 
 	}
 
-    DataReader::DataReader( const YAML::Node& node ) : LemmaObject( node ) {
+    DataReader::DataReader( const YAML::Node& node, const ctor_key& key ) : LemmaObject( node, key ) {
 
 	}
 

Modules/LemmaCore/src/EarthModel.cpp

@@ -16,17 +16,17 @@
 namespace Lemma {
 
     std::ostream &operator << (std::ostream &stream, const EarthModel &ob) {
-        stream << ob.Serialize()  << "\n---\n"; // End of doc --- as a direct stream should encapulste thingy
+        stream << ob.Serialize()  << "\n";
         return stream;
     }
 
 	// ====================  LIFECYCLE     =======================
 
-	EarthModel::EarthModel() : LemmaObject( ),
+	EarthModel::EarthModel( const ctor_key& key ) : LemmaObject( key ),
         BField(0,0,0), BFieldUnit(0,0,0), BInc(0), BDec(0), BMag(0) {
 	}
 
-    EarthModel::EarthModel(const YAML::Node& node) : LemmaObject(node) {
+    EarthModel::EarthModel(const YAML::Node& node, const ctor_key& key) : LemmaObject(node, key) {
         BInc = node["BInc"].as<double>();
         BDec = node["BDec"].as<double>();
         BMag = node["BMag"].as<double>();

Modules/LemmaCore/src/Filter.cpp

@@ -25,7 +25,7 @@ namespace Lemma {
     //      Method:  Filter
     // Description:  constructor (protected)
     //--------------------------------------------------------------------------------------
-    Filter::Filter( ) : LemmaObject( ) { }
+    Filter::Filter( const ctor_key& key ) : LemmaObject( key ) { }
 
     //--------------------------------------------------------------------------------------
     //       Class:  Filter
@@ -39,7 +39,7 @@ namespace Lemma {
     //      Method:  Filter
     // Description:  DeSerializing constructor (protected)
     //--------------------------------------------------------------------------------------
-    Filter::Filter ( const YAML::Node& node ) : LemmaObject(node) {
+    Filter::Filter ( const YAML::Node& node, const ctor_key& key ) : LemmaObject(node, key) {
     }
 
     //--------------------------------------------------------------------------------------

Modules/LemmaCore/src/Grid.cpp

@@ -22,10 +22,10 @@ namespace Lemma {
 
     // ====================  LIFECYCLE     ===================================
 
-	Grid::Grid( ) : LemmaObject( ) {
+	Grid::Grid( const ctor_key& key ) : LemmaObject( key ) {
 	}
 
-    Grid::Grid( const YAML::Node& node ) : LemmaObject(node) {
+    Grid::Grid( const YAML::Node& node, const ctor_key& key ) : LemmaObject(node, key) {
 
     }
 

Modules/LemmaCore/src/LayeredEarth.cpp

@@ -18,20 +18,20 @@ namespace Lemma {
 	// ====================    FRIENDS     ======================
 
     std::ostream &operator << (std::ostream &stream, const LayeredEarth &ob) {
-        stream << ob.Serialize()  << "\n---\n"; // End of doc
+        stream << ob.Serialize()  << "\n";
         return stream;
     }
 
 	// ====================  LIFECYCLE     ===================================
 
-	LayeredEarth::LayeredEarth( const ctor_key& key ) : EarthModel( ),
+	LayeredEarth::LayeredEarth( const ctor_key& key ) : EarthModel( key ),
 		NumberOfLayers(0), 	NumberOfInterfaces(0) {
 	}
 
 	LayeredEarth::~LayeredEarth() {
 	}
 
-    LayeredEarth::LayeredEarth(const YAML::Node& node) : EarthModel(node) {
+    LayeredEarth::LayeredEarth(const YAML::Node& node, const ctor_key& key) : EarthModel(node, key) {
         NumberOfLayers = node["NumberOfLayers"].as<int>();
         NumberOfInterfaces = node["NumberOfInterfaces"].as<int>();
         LayerThickness = node["LayerThickness"].as<VectorXr>();

Modules/LemmaCore/src/RectilinearGrid.cpp

@@ -22,11 +22,11 @@ namespace Lemma {
 
     // ====================  LIFECYCLE     =======================
 
-    RectilinearGrid::RectilinearGrid( const ctor_key& ) : Grid( ), nx(0), ny(0), nz(0) {
+    RectilinearGrid::RectilinearGrid( const ctor_key& key ) : Grid( key ), nx(0), ny(0), nz(0) {
 
     }
 
-    RectilinearGrid::RectilinearGrid( const YAML::Node& node, const ctor_key& ) : Grid(node) {
+    RectilinearGrid::RectilinearGrid( const YAML::Node& node, const ctor_key& key ) : Grid(node, key) {
 
         nx = node["nx"].as<int>( );
         ny = node["ny"].as<int>( );

Modules/LemmaCore/src/RectilinearGridReader.cpp

@@ -33,7 +33,7 @@ namespace Lemma {
     //      Method:  RectilinearGridReader
     // Description:  constructor (locked)
     //--------------------------------------------------------------------------------------
-    RectilinearGridReader::RectilinearGridReader ( const ctor_key& ) : GridReader( ),
+    RectilinearGridReader::RectilinearGridReader ( const ctor_key& key ) : GridReader( key ),
         rGrid( nullptr ), Parser( nullptr ) {
 
     }  // -----  end of method RectilinearGridReader::RectilinearGridReader  (constructor)  -----
@@ -43,7 +43,7 @@ namespace Lemma {
     //      Method:  RectilinearGridReader
     // Description:  DeSerializing constructor (protected)
     //--------------------------------------------------------------------------------------
-    RectilinearGridReader::RectilinearGridReader (const YAML::Node& node, const ctor_key&  key) : GridReader(node) {
+    RectilinearGridReader::RectilinearGridReader (const YAML::Node& node, const ctor_key&  key) : GridReader(node, key) {
     }  // -----  end of method RectilinearGridReader::RectilinearGridReader  (constructor)  -----
 
     //--------------------------------------------------------------------------------------

Modules/LemmaCore/src/RectilinearGridVTKExporter.cpp

@@ -36,7 +36,7 @@ std::ostream &operator << (std::ostream &stream, const RectilinearGridVTKExporte
 //      Method:  RectilinearGridVTKExporter
 // Description:  constructor (protected)
 //--------------------------------------------------------------------------------------
-RectilinearGridVTKExporter::RectilinearGridVTKExporter ( const ctor_key& ) : LemmaObject( ), Grid(nullptr), VTKGrid(nullptr) {
+RectilinearGridVTKExporter::RectilinearGridVTKExporter ( const ctor_key& key ) : LemmaObject( key ), Grid(nullptr), VTKGrid(nullptr) {
 
 }  // -----  end of method RectilinearGridVTKExporter::RectilinearGridVTKExporter  (constructor)  -----
 
@@ -45,7 +45,7 @@ RectilinearGridVTKExporter::RectilinearGridVTKExporter ( const ctor_key& ) : Lem
 //      Method:  RectilinearGridVTKExporter
 // Description:  DeSerializing constructor (protected)
 //--------------------------------------------------------------------------------------
-RectilinearGridVTKExporter::RectilinearGridVTKExporter (const YAML::Node& node, const ctor_key&  key) : LemmaObject(node) {
+RectilinearGridVTKExporter::RectilinearGridVTKExporter (const YAML::Node& node, const ctor_key&  key) : LemmaObject(node, key) {
     if (node["Grid"]) {
         this->Grid = RectilinearGrid::DeSerialize( node["Grid"] );
     }

Modules/LemmaCore/src/WindowFilter.cpp

@@ -18,7 +18,7 @@ namespace Lemma {
     // ====================  FRIEND METHODS  =====================
 
     std::ostream &operator << (std::ostream &stream, const WindowFilter &ob) {
-        stream << ob.Serialize()  << "\n---\n"; // End of doc --- as a direct stream should encapulste thingy
+        stream << ob.Serialize()  << "\n";
         return stream;
     }
 
@@ -29,7 +29,7 @@ namespace Lemma {
     //      Method:  WindowFilter
     // Description:  constructor (locked with ctor_key)
     //--------------------------------------------------------------------------------------
-    WindowFilter::WindowFilter( const ctor_key& ) : Filter( ),
+    WindowFilter::WindowFilter( const ctor_key& key ) : Filter( key ),
         Width(0), SamplingRate(0), Bandwidth(0), Coefficients(), Type(RECTANGULAR)
     {
     }   // -----  end of method WindowFilter::WindowFilter  (constructor)  -----
@@ -39,7 +39,7 @@ namespace Lemma {
     //      Method:  WindowFilter
     // Description:  DeSerializing constructor (locked with ctor_key)
     //--------------------------------------------------------------------------------------
-    WindowFilter::WindowFilter( const YAML::Node& node, const ctor_key& ) : Filter( node ),
+    WindowFilter::WindowFilter( const YAML::Node& node, const ctor_key& key) : Filter( node, key ),
         Width(0), SamplingRate(0), Bandwidth(0), Coefficients(), Type(RECTANGULAR)
     {
         Width = node["Width"].as<int>( );