Some more changes towards C++-11. Not yet though

Modules/FDEM1D/include/DipoleSource.h

@@ -14,10 +14,8 @@
 #ifndef __DIPOLESOURCE_H
 #define __DIPOLESOURCE_H
 
+#include "LemmaObject.h"
 #include "LayeredEarthEM.h"
-#include "FieldPoints.h"
-
-//#include "emearth1d.h"
 
 #ifdef LEMMAUSEVTK
 #include "vtkActor.h"
@@ -33,6 +31,7 @@ namespace Lemma {
 
     // Forward declarations
     class KernelEM1DManager;
+    class FieldPoints;
     class HankelTransform;
 
     // ==========================================================================
@@ -41,7 +40,7 @@ namespace Lemma {
     /// \details  More complex sources are constructed from a superposition of
     ///           dipoles.
     // ==========================================================================
-    class DipoleSource : public LemmaObject {
+    class DipoleSource : public std::enable_shared_from_this<DipoleSource>,  LemmaObject {
 
         // ====================    FRIENDS     ======================
 

Modules/FDEM1D/include/KernelEM1DManager.h

@@ -36,6 +36,7 @@ namespace Lemma {
 
         struct ctor_key {};
 
+        /** Recursively streams information about this class */
         friend std::ostream &operator<<(std::ostream &stream, const KernelEM1DManager &ob);
 
         public:
@@ -43,7 +44,7 @@ namespace Lemma {
             // ====================  LIFECYCLE     =======================
 
             /** Default protected constructor. */
-            KernelEM1DManager (const std::string& name);
+            KernelEM1DManager ( const ctor_key& );
 
             /** Default protected constructor. */
             ~KernelEM1DManager ();

Modules/FDEM1D/include/KernelEM1DReflSpec.h

@@ -15,15 +15,14 @@
 #define  KERNELEM1DREFLSPEC_INC
 
 #include "DipoleSource.h"
-#include "LayeredEarthEM.h"
-
 #include "kernelem1dreflbase.h"
+#include "LayeredEarthEM.h"
 
 namespace Lemma {
 
     // forward declaration for friend
-    template<EMMODE Mode, int Ikernel, DIPOLE_LOCATION Isource, DIPOLE_LOCATION Irecv>
-    class KernelEM1DSpec;
+    //template<EMMODE Mode, int Ikernel, DIPOLE_LOCATION Isource, DIPOLE_LOCATION Irecv>
+    //class KernelEM1DSpec;
 
     // ===================================================================
     //  Class:  KernelEM1DReflSpec
@@ -45,9 +44,9 @@ namespace Lemma {
 
         public:
 
-            // what do these template parameters do -TI
-            template<EMMODE Mode2, int Ikernel2, DIPOLE_LOCATION Isource2, DIPOLE_LOCATION Irecv2>
-            friend class KernelEM1DSpec;
+            //template<EMMODE Mode2, int Ikernel2, DIPOLE_LOCATION Isource2, DIPOLE_LOCATION Irecv2>
+            //friend class KernelEM1DSpec;
+
             friend class KernelEM1DManager;
 
             // ====================  LIFECYCLE     =======================

Modules/FDEM1D/include/kernelem1dreflbase.h

@@ -24,8 +24,8 @@ namespace Lemma {
     enum DIPOLE_LOCATION { INAIR, INGROUND };
 
     // forward declaration for friend
-    //template<EMMODE Mode, int Ikernel, DIPOLE_LOCATION Isource, DIPOLE_LOCATION Irecv>
-    //class KernelEM1DSpec;
+    template<EMMODE Mode, int Ikernel, DIPOLE_LOCATION Isource, DIPOLE_LOCATION Irecv>
+    class KernelEM1DSpec;
 
 
     // ===================================================================
@@ -38,9 +38,9 @@ namespace Lemma {
     // ===================================================================
     class KernelEM1DReflBase : public LemmaObject {
 
-        //template<EMMODE Mode, int Ikernel, DIPOLE_LOCATION Isource, DIPOLE_LOCATION Irecv>
+        template<EMMODE Mode, int Ikernel, DIPOLE_LOCATION Isource, DIPOLE_LOCATION Irecv>
         friend class KernelEM1DSpec;
-        //friend class KernelEM1DManager;
+        friend class KernelEM1DManager;
         //friend class DipoleSource;
 
         public:

Modules/FDEM1D/src/CMakeLists.txt

@@ -4,7 +4,12 @@ set (FEM1DSOURCE
 	${CMAKE_CURRENT_SOURCE_DIR}/LayeredEarthEM.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/FieldPoints.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/WireAntenna.cpp
-#	${CMAKE_CURRENT_SOURCE_DIR}/DipoleSource.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/KernelEM1DManager.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/DipoleSource.cpp
+	
+	${CMAKE_CURRENT_SOURCE_DIR}/KernelEM1DReflSpec.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/KernelEM1DSpec.cpp
+
 	#${CMAKE_CURRENT_SOURCE_DIR}/UngroundedElectricDipole.cpp
 	PARENT_SCOPE
 )

Modules/FDEM1D/src/DipoleSource.cpp

@@ -13,12 +13,12 @@
 
 #include "DipoleSource.h"
 #include "KernelEM1DManager.h"
-#include "FieldPoints.h"
 
 //#include "GroundedElectricDipole.h"
 //#include "UngroundedElectricDipole.h"
 //#include "MagneticDipole.h"
 
+#include "FieldPoints.h"
 #include "hankeltransform.h"
 
 namespace Lemma {

Modules/FDEM1D/src/KernelEM1DManager.cpp

@@ -11,89 +11,52 @@
   @version  $Id: kernelem1dmanager.cpp 193 2014-11-10 23:51:41Z tirons $
  **/
 
-#include "kernelem1dmanager.h"
-
+#include "KernelEM1DManager.h"
 
 namespace Lemma {
 
-    std::ostream &operator<<(std::ostream &stream,
-                const KernelEM1DManager &ob) {
-        stream << *(LemmaObject*)(&ob);
+    std::ostream &operator<<(std::ostream &stream, const KernelEM1DManager &ob) {
+        stream << ob.Serialize() << "\n---\n";
         return stream;
     }
 
 
     // ====================  LIFECYCLE     =======================
 
-    KernelEM1DManager::KernelEM1DManager(const std::string& name) :
-                    LemmaObject(name), TEReflBase(NULL), TMReflBase(NULL), Earth(NULL), Dipole(NULL) {
+    KernelEM1DManager::KernelEM1DManager( const ctor_key& ) : LemmaObject( ), TEReflBase(nullptr),
+        TMReflBase(nullptr), Earth(nullptr), Dipole(nullptr) {
     }
 
     KernelEM1DManager::~KernelEM1DManager() {
 
-        if (this->NumberOfReferences != 0)
-            throw DeleteObjectWithReferences(this);
-
-//         if (Earth != NULL) {
-//             Earth->DetachFrom(this);
-//         }
-//
-//         if (Dipole != NULL) {
-//             Dipole->DetachFrom(this);
-//         }
-
-        for (unsigned int ik=0; ik<KernelVec.size(); ++ik) {
-            KernelVec[ik]->Delete();
-        }
-
-        if (TEReflBase != NULL) TEReflBase->Delete();
-        if (TMReflBase != NULL) TMReflBase->Delete();
-
-    }
-
-    KernelEM1DManager* KernelEM1DManager::New() {
-        KernelEM1DManager* Obj = new KernelEM1DManager("KernelEM1DManager");
-        Obj->AttachTo(Obj);
-        return Obj;
     }
 
-    void KernelEM1DManager::Delete() {
-        this->DetachFrom(this);
+    std::shared_ptr<KernelEM1DManager> KernelEM1DManager::NewSP() {
+        return std::make_shared<KernelEM1DManager>( ctor_key() );
     }
 
-    void KernelEM1DManager::Release() {
-        delete this;
-    }
 
     // ====================  ACCESS        =======================
 
     // A race condition can develop with these. It's OK to not attach, since this is an internal class, and
     // we know what is going on.
-    void KernelEM1DManager::SetEarth(LayeredEarthEM* Earthin) {
-        //if (Earth != NULL) {
-        //    Earth->DetachFrom(this);
-        //}
-        //Earthin->AttachTo(this);
+    void KernelEM1DManager::SetEarth( std::shared_ptr<LayeredEarthEM> Earthin) {
         Earth = Earthin;
     }
 
-    void KernelEM1DManager::SetDipoleSource(DipoleSource* DipoleIn, const int& ifreqin,
+    void KernelEM1DManager::SetDipoleSource( std::shared_ptr<DipoleSource> DipoleIn, const int& ifreqin,
             const Real& rx_zin) {
-        //if (Dipole != NULL) {
-        //    Dipole->DetachFrom(this);
-        //}
-        //DipoleIn->AttachTo(this);
         Dipole = DipoleIn;
 
         ifreq = ifreqin;
         rx_z = rx_zin;
     }
 
-    KernelEm1DBase* KernelEM1DManager::GetKernel(const unsigned int& ik) {
+    std::shared_ptr<KernelEm1DBase> KernelEM1DManager::GetKernel(const unsigned int& ik) {
         return KernelVec[ik];
     }
 
-    DipoleSource* KernelEM1DManager::GetDipole( ) {
+    std::shared_ptr<DipoleSource> KernelEM1DManager::GetDipole( ) {
         return Dipole;
     }
 
@@ -101,12 +64,12 @@ namespace Lemma {
 
     void KernelEM1DManager::ComputeReflectionCoeffs(const Real& lambda, const int& idx, const Real& rho0) {
 
-        if (TEReflBase != NULL) {
+        if (TEReflBase != nullptr) {
             TEReflBase->ComputeReflectionCoeffs(lambda);
             TEReflBase->PreComputePotentialTerms( );
         }
 
-        if (TMReflBase != NULL) {
+        if (TMReflBase != nullptr) {
             TMReflBase->ComputeReflectionCoeffs(lambda);
             TMReflBase->PreComputePotentialTerms( );
         }
@@ -115,11 +78,11 @@ namespace Lemma {
 
     void KernelEM1DManager::ResetSource(const int& ifreq) {
 
-        if (TEReflBase != NULL) {
+        if (TEReflBase != nullptr) {
             TEReflBase->SetUpSource(Dipole, ifreq);
         }
 
-        if (TMReflBase != NULL) {
+        if (TMReflBase != nullptr) {
             TMReflBase->SetUpSource(Dipole, ifreq);
 
         }

Modules/FDEM1D/src/kernelem1dreflspec.cpp → Modules/FDEM1D/src/KernelEM1DReflSpec.cpp

@@ -11,7 +11,7 @@
   @version  $Id: kernelem1dreflspec.cpp 169 2014-09-06 22:16:12Z tirons $
  **/
 
-#include "kernelem1dreflspec.h"
+#include "KernelEM1DReflSpec.h"
 
 namespace Lemma {
 

Modules/FDEM1D/src/kernelem1dspec.cpp → Modules/FDEM1D/src/KernelEM1DSpec.cpp

@@ -11,7 +11,7 @@
   @version  $Id: kernelem1dspec.cpp 87 2013-09-05 22:44:05Z tirons $
  **/
 
-#include "kernelem1dspec.h"
+#include "KernelEM1DSpec.h"
 
 namespace Lemma {
 

Modules/LemmaCore/include/LemmaObject.h

@@ -34,7 +34,7 @@ namespace Lemma {
   *           standard. All Lemma objects should be created as C++-11 Smart pointers, using
   *           the supplied New method. Calls to Delete are no longer necessary or available.
   */
-class LemmaObject : public std::enable_shared_from_this<LemmaObject> {
+class LemmaObject {
 
     /**
      *  Streams class information as YAML::Node