WOrk towards new C++-11

Modules/FDEM1D/include/LayeredEarthEM.h

@@ -25,19 +25,32 @@ namespace Lemma {
     /// \brief  1D layered earth. Attributes include all aspects of
     /// Cole-Cole model.
     /// \details   Primarily used for EM calculations.
+    /** @todo Layer 0 can be set right now, but all logic ignores and assumes
+              air layer. This is surprising to users and constitutes a bug.
+     */
     // =======================================================================
     class LayeredEarthEM : public LayeredEarth {
 
-        public:
+        // ====================    FRIENDS     ===========================
+        /** Recursively streams information about this class */
+        friend std::ostream &operator<<(std::ostream &stream, const LayeredEarthEM &ob);
+
 
-            // ====================    FRIENDS     ===========================
+        struct ctor_key {};
 
-            /** Recursively streams information about this class */
-            friend std::ostream &operator<<(std::ostream &stream,
-                        const LayeredEarthEM &ob);
+        public:
 
             // ====================  LIFECYCLE     ===========================
 
+            /** Default protected constructor. */
+            explicit LayeredEarthEM ( const ctor_key& );
+
+            /** Default protected constructor. */
+			LayeredEarthEM ( const YAML::Node& node, const ctor_key& );
+
+            /** Default protected constructor. */
+            virtual ~LayeredEarthEM ();
+
             /**
              *  Factory method for generating concrete class.
              *  @return a std::shared_ptr of type LayeredEarthEM
@@ -240,23 +253,8 @@ namespace Lemma {
 
         protected:
 
-            // ====================  LIFECYCLE     ===========================
-
-            /** Default protected constructor. */
-            LayeredEarthEM ( );
-
-            /** Default protected constructor. */
-			LayeredEarthEM (const YAML::Node& node);
-
-            /** Default protected constructor. */
-            ~LayeredEarthEM ();
-
-            /**
-             * @copybrief LemmaObject::Release()
-             * @copydetails LemmaObject::Release()
-             */
-            void Release();
 
+        private:
             // ====================  DATA MEMBERS  ===========================
 
             /** Vector of layer Conductivity */
@@ -304,8 +302,6 @@ namespace Lemma {
             /** Relaxation breath for each layer */
             VectorXr          LayerBreathPermitivity;
 
-            private:
-
             /** ASCII string representation of the class name */
             static constexpr auto CName = "LayeredEarthEM";
 

Modules/FDEM1D/src/LayeredEarthEM.cpp

@@ -16,23 +16,49 @@
 namespace Lemma {
 
     std::ostream &operator << (std::ostream &stream, const LayeredEarthEM &ob) {
-        stream << ob.Serialize()  << "\n---\n"; // End of doc --- as a direct stream should encapulste thingy
+        stream << ob.Serialize()  << "\n---\n"; // End of doc ---
         return stream;
     }
 
     // ====================  LIFECYCLE     ===================================
 
-    LayeredEarthEM::LayeredEarthEM( ) : LayeredEarth() {
+    LayeredEarthEM::LayeredEarthEM( const ctor_key& ) : LayeredEarth() {
+    }
+
+    LayeredEarthEM::LayeredEarthEM( const YAML::Node& node, const ctor_key& ) : LayeredEarth(node) {
+
+        LayerConductivity = node["LayerConductivity"].as<VectorXcr>();
+
+        LayerSusceptibility = node["LayerSusceptibility"].as<VectorXcr>();
+        LayerLowFreqSusceptibility = node["LayerLowFreqSusceptibility"].as<VectorXr>();
+        LayerHighFreqSusceptibility = node["LayerHighFreqSusceptibility"].as<VectorXr>();
+        LayerTauSusceptibility = node["LayerTauSusceptibility"].as<VectorXr>();
+        LayerBreathSusceptibility = node["LayerBreathSusceptibility"].as<VectorXr>();
+
+        LayerPermitivity = node["LayerPermitivity"].as<VectorXcr>();
+        LayerLowFreqPermitivity = node["LayerLowFreqPermitivity"].as<VectorXr>();
+        LayerHighFreqPermitivity = node["LayerHighFreqPermitivity"].as<VectorXr>();
+        LayerTauPermitivity = node["LayerTauPermitivity"].as<VectorXr>();
+        LayerBreathPermitivity = node["LayerBreathPermitivity"].as<VectorXr>();
+
     }
 
     LayeredEarthEM::~LayeredEarthEM() {
     }
 
     std::shared_ptr<LayeredEarthEM> LayeredEarthEM::NewSP() {
-        std::shared_ptr<LayeredEarthEM> sp(new  LayeredEarthEM( ), LemmaObjectDeleter() );
-        return sp;
+        return std::make_shared<LayeredEarthEM> ( ctor_key() );
     }
 
+    std::shared_ptr<LayeredEarthEM> LayeredEarthEM::DeSerialize( const YAML::Node& node ) {
+        if (node.Tag() != "LayeredEarthEM") {
+            throw  DeSerializeTypeMismatch( "LayeredEarthEM", node.Tag());
+        }
+        return std::make_shared<LayeredEarthEM> ( node, ctor_key() );
+    }
+
+
+
     YAML::Node LayeredEarthEM::Serialize() const {
         YAML::Node node = LayeredEarth::Serialize();
         node.SetTag( GetName() );
@@ -110,7 +136,7 @@ namespace Lemma {
         LayerConductivity[ilay] = sig;
     }
 
-/*
+/*  // TODO fix layer 0 problem, 1/0 --> infty, plus layer 0 is ignored anyway
     void LayeredEarthEM::SetLayerResistivity(const VectorXcr &rhos) {
         if (rhos.size() != this->NumberOfLayers )
             throw EarthModelParametersDoNotMatchNumberOfLayers( );

Modules/LemmaCore/src/CubicSplineInterpolator.cpp

@@ -29,7 +29,7 @@ namespace Lemma {
     // ====================  FRIEND METHODS  =====================
 
     std::ostream &operator << (std::ostream &stream, const CubicSplineInterpolator &ob) {
-        stream << ob.Serialize()  << "\n---\n"; // End of doc --- as a direct stream should encapulste thingy
+        stream << ob.Serialize()  << "\n---\n"; // End of doc ---
         return stream;
     }