work towards AEM support again

Modules/FDEM1D/include/AEMSurvey.h

@@ -21,7 +21,7 @@
 #define  AEMSURVEY_INC
 
 #include "LemmaObject.h"
-#include "dipolesource.h"
+#include "DipoleSource.h"
 
 namespace Lemma {
 

Modules/FDEM1D/include/FDEM1D

@@ -1,4 +1,5 @@
 #include "LayeredEarthEM.h"
+#include "LayeredEarthEMReader.h"
 
 #include "FieldPoints.h"
 

Modules/FDEM1D/include/LayeredEarthEMReader.h

@@ -34,8 +34,6 @@ namespace Lemma {
 		friend std::ostream &operator<<(std::ostream &stream,
 			const LayeredEarthEMReader &ob);
 
-        struct ctor_key{};
-
         public:
 
         // ====================  LIFECYCLE     =======================
@@ -55,14 +53,14 @@ namespace Lemma {
         /** Default destructor */
         virtual ~LayeredEarthEMReader ();
 
-        /** YAML Serializing method
+        /* YAML Serializing method
          */
-        YAML::Node Serialize() const;
+        //YAML::Node Serialize() const;
 
-        /**
+        /*
          *   Constructs an object from a YAML::Node.
          */
-        static std::shared_ptr< LayeredEarthEMReader > DeSerialize(const YAML::Node& node);
+        //static std::shared_ptr< LayeredEarthEMReader > DeSerialize(const YAML::Node& node);
 
         // ====================  OPERATORS     =======================
 
@@ -84,7 +82,7 @@ namespace Lemma {
 
         /** @return the pointer address of the LayeredEarthEM
          */
-        LayeredEarthEM* GetLayeredEarth();
+        std::shared_ptr<LayeredEarthEM> GetLayeredEarth();
 
         // ====================  INQUIRY       =======================
 
@@ -101,7 +99,7 @@ namespace Lemma {
 
         // ====================  DATA MEMBERS  =========================
 
-        LayeredEarthEM*         LayEarth;
+        std::shared_ptr<LayeredEarthEM>         LayEarth;
 
         /** ASCII string representation of the class name */
         static constexpr auto CName = "LayeredEarthEMReader";

Modules/FDEM1D/src/CMakeLists.txt

@@ -2,7 +2,7 @@ set (FDEM1DSOURCE
 	${FDEM1DSOURCE}
 
 	${CMAKE_CURRENT_SOURCE_DIR}/LayeredEarthEM.cpp
-#	${CMAKE_CURRENT_SOURCE_DIR}/LayeredEarthEMReader.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/LayeredEarthEMReader.cpp
 	
 	${CMAKE_CURRENT_SOURCE_DIR}/FieldPoints.cpp
 	
@@ -25,8 +25,9 @@ set (FDEM1DSOURCE
 	
 	${CMAKE_CURRENT_SOURCE_DIR}/EMEarth1D.cpp
 
-	#${CMAKE_CURRENT_SOURCE_DIR}/AEMSurvey.cpp
-	#${CMAKE_CURRENT_SOURCE_DIR}/AEMSurveyReader.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/AEMSurvey.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/AEMSurveyReader.cpp
+	
 	#${CMAKE_CURRENT_SOURCE_DIR}/UngroundedElectricDipole.cpp
 	PARENT_SCOPE
 )

Modules/FDEM1D/src/LayeredEarthEMReader.cpp

@@ -35,7 +35,7 @@ namespace Lemma {
     //      Method:  LayeredEarthEMReader
     // Description:  constructor (protected)
     //--------------------------------------------------------------------------------------
-    LayeredEarthEMReader::LayeredEarthEMReader ( const ctor_key& key ) : LemmaObject(),
+    LayeredEarthEMReader::LayeredEarthEMReader ( const ctor_key& key ) : LemmaObject( key ),
         LayEarth(nullptr) {
 
     }  // -----  end of method LayeredEarthEMReader::LayeredEarthEMReader  (constructor)  -----
@@ -46,10 +46,8 @@ namespace Lemma {
     //      Method:  New()
     // Description:  public constructor
     //--------------------------------------------------------------------------------------
-    LayeredEarthEMReader* LayeredEarthEMReader::New() {
-        LayeredEarthEMReader*  Obj = new LayeredEarthEMReader("LayeredEarthEMReader");
-        Obj->AttachTo(Obj);
-        return Obj;
+    std::shared_ptr<LayeredEarthEMReader> LayeredEarthEMReader::NewSP() {
+        return std::make_shared<LayeredEarthEMReader>( ctor_key() );
     }
 
     //--------------------------------------------------------------------------------------
@@ -58,33 +56,13 @@ namespace Lemma {
     // Description:  destructor (protected)
     //--------------------------------------------------------------------------------------
     LayeredEarthEMReader::~LayeredEarthEMReader () {
-        if (LayEarth) LayEarth->Delete();
     }  // -----  end of method LayeredEarthEMReader::~LayeredEarthEMReader  (destructor)  -----
 
     //--------------------------------------------------------------------------------------
     //       Class:  LayeredEarthEMReader
-    //      Method:  Delete
-    // Description:  public destructor
-    //--------------------------------------------------------------------------------------
-    void LayeredEarthEMReader::Delete() {
-        this->DetachFrom(this);
-    }
-
-    //--------------------------------------------------------------------------------------
-    //       Class:  LayeredEarthEMReader
-    //      Method:  Release
-    // Description:  destructor (protected)
-    //--------------------------------------------------------------------------------------
-    void LayeredEarthEMReader::Release() {
-        delete this;
-    }
-
-
-    //--------------------------------------------------------------------------------------
-    //       Class:  LayeredEarthEMReader
     //      Method:  GetLayeredEarth
     //--------------------------------------------------------------------------------------
-    LayeredEarthEM* LayeredEarthEMReader::GetLayeredEarth (  ) {
+    std::shared_ptr<LayeredEarthEM> LayeredEarthEMReader::GetLayeredEarth (  ) {
         return LayEarth;
     }		// -----  end of method LayeredEarthEMReader::GetLayeredEarth  -----
 
@@ -94,9 +72,9 @@ namespace Lemma {
     //      Method:  ReadASCIIInputFile
     //--------------------------------------------------------------------------------------
     void LayeredEarthEMReader::ReadASCIIInputFile ( const std::string& name ) {
-        if (LayEarth) LayEarth->Delete();
-        ASCIIParser* Parser = ASCIIParser::New();
-        LayEarth = LayeredEarthEM::New();
+
+        auto Parser = ASCIIParser::NewSP();
+        LayEarth = LayeredEarthEM::NewSP();
 
         Parser->SetCommentString("//");
         Parser->Open(name);
@@ -114,7 +92,6 @@ namespace Lemma {
         sigma(nlay) = 1./Parser->ReadReals(1)[0];
         LayEarth->SetLayerConductivity(sigma);
         if (thick.size() > 0) LayEarth->SetLayerThickness(thick);
-        Parser->Delete();
         return ;
     }		// -----  end of method LayeredEarthEMReader::ReadASCIIInputFile  -----