changes for Lemma 0.2.0

examples/EMSchur3D.cpp

@@ -54,19 +54,19 @@ int main( int argc, char** argv ) {
 
     //////////////////////////////////////////////////
     // Read in Layered earth, for backgound model
-    auto LayEarthRead = LayeredEarthEMReader::NewSP();
-        try {
-            LayEarthRead->ReadASCIIInputFile( argv[2] );
-        } catch (std::exception& e) {
-		    std::cout << "Caught an error opening ASCII Layered Earth file: ";
-            std::cout << e.what() << std::endl;
-		    std::cout << "enter filename or 0 to exit programme\n";
-		    std::string inp;
-		    std::cin >> inp;
-		    if (inp != "0")
-                GridRead->ReadASCIIGridFile( inp.c_str() );
-            else exit(EXIT_FAILURE);
-	    }
+//     auto LayEarthRead = LayeredEarthEMReader::NewSP();
+//         try {
+//             LayEarthRead->ReadASCIIInputFile( argv[2] );
+//         } catch (std::exception& e) {
+// 		    std::cout << "Caught an error opening ASCII Layered Earth file: ";
+//             std::cout << e.what() << std::endl;
+// 		    std::cout << "enter filename or 0 to exit programme\n";
+// 		    std::string inp;
+// 		    std::cin >> inp;
+// 		    if (inp != "0")
+//                 GridRead->ReadASCIIGridFile( inp.c_str() );
+//             else exit(EXIT_FAILURE);
+// 	    }
 
     /*
     //////////////////////////////////////////////////

include/EMSchur3D.h

@@ -41,8 +41,6 @@ namespace Lemma {
             return stream;
         }
 
-        struct ctor_key {};
-
         //friend std::ostream &operator<<(std::ostream &stream,
         //        const EMSchur3D &ob);
 
@@ -60,12 +58,12 @@ namespace Lemma {
         }
 
         /** Default protected constructor, use New */
-        explicit EMSchur3D ( const ctor_key& key ) : EMSchur3DBase( ), CSolver( nullptr ) {
+        explicit EMSchur3D ( const ctor_key& key ) : EMSchur3DBase( key ), CSolver( nullptr ) {
 
         }
 
         /** Locked DeDerializing constructor, use factory DeSerialize  method*/
-        EMSchur3D (const YAML::Node& node): EMSchur3DBase(node), CSolver( nullptr ) {
+        EMSchur3D (const YAML::Node& node, const ctor_key& key): EMSchur3DBase(node, key), CSolver( nullptr ) {
         }
 
         /** Default protected destructor, use Delete */

include/EMSchur3DBase.h

@@ -143,9 +143,6 @@ class EMSchur3DBase : public LemmaObject {
 
     protected:
 
-    // since this is a ABC, key is not necessary...still would be nice to find a
-    // mechanism for specifying where keys may be passed down from...
-    //struct ctor_key {};
     //template<typename U>
     //friend class EMSchur3D;
 
@@ -154,10 +151,10 @@ class EMSchur3DBase : public LemmaObject {
     // ====================  LIFECYCLE     =======================
 
     /** Default protected constructor, use New */
-    explicit EMSchur3DBase (  );
+    explicit EMSchur3DBase ( const ctor_key&  );
 
     /** Default protected constructor, use New */
-    explicit EMSchur3DBase ( const YAML::Node& node );
+    explicit EMSchur3DBase ( const YAML::Node& node, const ctor_key& );
 
     /** Default protected destructor, use Delete */
     virtual ~EMSchur3DBase ( );

src/EMSchur3DBase.cpp

@@ -56,7 +56,7 @@ namespace Lemma {
     //      Method:  EMSchur3DBase
     // Description:  constructor (protected)
     //--------------------------------------------------------------------------------------
-    EMSchur3DBase::EMSchur3DBase ( ) : LemmaObject( ),
+    EMSchur3DBase::EMSchur3DBase ( const ctor_key& key ) : LemmaObject( key ),
         Grid(nullptr),
         //Survey(nullptr),
         LayModel(nullptr), Cvec(nullptr),
@@ -69,7 +69,7 @@ namespace Lemma {
     //      Method:  EMSchur3DBase
     // Description:  constructor (protected)
     //--------------------------------------------------------------------------------------
-    EMSchur3DBase::EMSchur3DBase ( const YAML::Node& node ) : LemmaObject(),
+    EMSchur3DBase::EMSchur3DBase ( const YAML::Node& node, const ctor_key& key ) : LemmaObject( key ),
         Grid(nullptr),
         //Survey(nullptr),
         LayModel(nullptr), Cvec(nullptr),