Tweak for clang and OSX

Modules/LemmaCore/include/ASCIIParser.h

@@ -138,9 +138,7 @@ class ASCIIParser : public LemmaObject {
     int GetFileLocation();
 
     /** Returns the name of the underlying class, similiar to Python's type */
-    virtual inline std::string GetName() const {
-        return CName;
-    }
+    virtual std::string GetName() const;
 
     // ====================  INQUIRY       =======================
 

Modules/LemmaCore/include/EarthModel.h

@@ -92,9 +92,7 @@ namespace Lemma {
             Real GetMagneticFieldMagnitudeInGauss( );
 
             /** Returns the name of the underlying class, similiar to Python's type */
-            virtual inline std::string GetName() const {
-                return this->CName;
-            }
+            virtual inline std::string GetName() const;
 
         protected:
 

Modules/LemmaCore/include/Filter.h

@@ -49,9 +49,7 @@ namespace Lemma {
             // ====================  INQUIRY       =======================
 
             /** Returns the name of the underlying class, similiar to Python's type */
-            virtual inline std::string GetName() const {
-                return this->CName;
-            }
+            virtual std::string GetName() const;
 
         protected:
 

Modules/LemmaCore/include/Grid.h

@@ -46,9 +46,7 @@ class Grid : public LemmaObject {
         // ====================  INQUIRY       ===================================
 
         /** Returns the name of the underlying class, similiar to Python's type */
-        virtual inline std::string GetName() const {
-            return this->CName;
-        }
+        virtual std::string GetName() const;
 
     protected:
 

Modules/LemmaCore/include/GridReader.h

@@ -53,9 +53,7 @@ namespace Lemma {
             // ====================  INQUIRY       =======================
 
             /** Returns the name of the underlying class, similiar to Python's type */
-            virtual inline std::string GetName() const {
-                return this->CName;
-            }
+            virtual std::string GetName() const = 0;
 
         protected:
 

Modules/LemmaCore/include/Instrument.h

@@ -49,9 +49,7 @@ namespace Lemma {
 			// ====================  INQUIRY       ===========================
 
             /** Returns the name of the underlying class, similiar to Python's type */
-            virtual inline std::string GetName() const {
-                return this->CName;
-            }
+            virtual std::string GetName() const = 0;
 
 			// ====================  DATA MEMBERS  ===========================
 

Modules/LemmaCore/include/LayeredEarth.h

@@ -94,9 +94,7 @@ namespace Lemma {
             YAML::Node Serialize() const;
 
             /** Returns the name of the underlying class, similiar to Python's type */
-            virtual inline std::string GetName() const {
-                return this->CName;
-            }
+            virtual std::string GetName() const;
 
 		protected:
 

Modules/LemmaCore/include/LemmaObject.h

@@ -83,9 +83,7 @@ class LemmaObject {
             Was chosen over typeid due to name mangling among various compilers, and the need for consistency
             in Serialized objects.
          */
-        virtual inline std::string GetName() const {
-            return this->CName;
-        }
+        virtual std::string GetName() const;
 
     protected:
 

Modules/LemmaCore/include/RectilinearGrid.h

@@ -180,9 +180,7 @@ namespace Lemma {
             // ====================  INQUIRY       =======================
 
             /** Returns the name of the underlying class, similiar to Python's type */
-            virtual inline std::string GetName() const {
-                return this->CName;
-            }
+            virtual inline std::string GetName() const;
 
         protected:
 

Modules/LemmaCore/include/RectilinearGridReader.h

@@ -114,9 +114,7 @@ namespace Lemma {
             // ====================  INQUIRY       =======================
 
             /** Returns the name of the underlying class, similiar to Python's type */
-            virtual inline std::string GetName() const {
-                return this->CName;
-            }
+            virtual std::string GetName() const ;
 
         protected:
 

Modules/LemmaCore/include/RectilinearGridVTKExporter.h

@@ -101,9 +101,7 @@ class RectilinearGridVTKExporter : public LemmaObject {
     void WriteVTKGrid( const std::string& name );
 
     /** Returns the name of the underlying class, similiar to Python's type */
-    virtual inline std::string GetName() const {
-        return this->CName;
-    }
+    virtual inline std::string GetName() const;
 
     protected:
 

Modules/LemmaCore/include/WindowFilter.h

@@ -96,9 +96,7 @@ namespace Lemma {
             VectorXr GetFilterCoefficients( );
 
             /** Returns the name of the underlying class, similiar to Python's type */
-            virtual inline std::string GetName() const {
-                return this->CName;
-            }
+            virtual inline std::string GetName() const ;
 
         protected:
 

Modules/LemmaCore/src/ASCIIParser.cpp

@@ -84,6 +84,15 @@ namespace Lemma {
 
     //--------------------------------------------------------------------------------------
     //       Class:  ASCIIParser
+    //      Method:  GetName
+    // Description:  Class identifier
+    //--------------------------------------------------------------------------------------
+    inline std::string ASCIIParser::GetName (  ) const {
+        return CName;
+    }		// -----  end of method ASCIIParser::GetName  -----
+
+    //--------------------------------------------------------------------------------------
+    //       Class:  ASCIIParser
     //      Method:  ASCIIParser
     // Description:  DeSerializing constructor (protected)
     //--------------------------------------------------------------------------------------

Modules/LemmaCore/src/CMakeLists.txt

@@ -14,6 +14,5 @@ set (SOURCE
 	${CMAKE_CURRENT_SOURCE_DIR}/LayeredEarth.cpp			   # ABC, no key
 	${CMAKE_CURRENT_SOURCE_DIR}/Data.cpp                       # ABC, no key
 	${CMAKE_CURRENT_SOURCE_DIR}/DataReader.cpp                 # ABC, no key
-	${CMAKE_CURRENT_SOURCE_DIR}/Instrument.cpp                 # ABC, no key
 	PARENT_SCOPE
 )

Modules/LemmaCore/src/EarthModel.cpp

@@ -48,7 +48,17 @@ namespace Lemma {
 	}
 
  	// ====================  ACCESS        ===================================
-	void EarthModel::SetMagneticFieldComponents(const Vector3r &bfield,
+
+    //--------------------------------------------------------------------------------------
+    //       Class:  EarthModel
+    //      Method:  GetName
+    // Description:  Class identifier
+    //--------------------------------------------------------------------------------------
+    inline std::string EarthModel::GetName (  ) const {
+        return CName;
+    }		// -----  end of method EarthModel::get_GetName  -----
+
+    void EarthModel::SetMagneticFieldComponents(const Vector3r &bfield,
 					const MAGUNITS &unit) {
 
  		this->BField = bfield;

Modules/LemmaCore/src/Filter.cpp

@@ -52,4 +52,14 @@ namespace Lemma {
         // FILL IN CLASS SPECIFICS HERE
         return node;
     }		// -----  end of method Filter::Serialize  -----
+
+    //--------------------------------------------------------------------------------------
+    //       Class:  Filter
+    //      Method:  GetName
+    // Description:  Class identifier
+    //--------------------------------------------------------------------------------------
+    inline std::string Filter::GetName (  ) const {
+        return CName;
+    }		// -----  end of method Filter::get_GetName  -----
+
 }		// -----  end of Lemma  name  -----

Modules/LemmaCore/src/Grid.cpp

@@ -38,4 +38,13 @@ namespace Lemma {
         return node;
     }
 
+    //--------------------------------------------------------------------------------------
+    //       Class:  Grid
+    //      Method:  GetName
+    // Description:  Class identifier
+    //--------------------------------------------------------------------------------------
+    inline std::string Grid::GetName (  ) const {
+        return CName;
+    }		// -----  end of method Grid::get_GetName  -----
+
 }

Modules/LemmaCore/src/Instrument.cpp

@@ -1,44 +0,0 @@
-/* This file is part of Lemma, a geophysical modelling and inversion API */
-
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/**
-  @file
-  @author   Trevor Irons
-  @date     02/05/2010
-  @version  $Id: instrument.cpp 193 2014-11-10 23:51:41Z tirons $
- **/
-
-#include "Instrument.h"
-
-namespace Lemma {
-
-    std::ostream &operator << (std::ostream &stream, const Instrument &ob) {
-        stream << ob.Serialize()  << "\n---\n"; // End of doc --- as a direct stream should encapulste thingy
-        return stream;
-    }
-
-	Instrument::Instrument( ) : LemmaObject() {
-	}
-
-    Instrument::Instrument( const YAML::Node& node ) : LemmaObject( node ) {
-	    // Fill in class specifics
-    }
-
-	Instrument::~Instrument() {
-	}
-
-    //--------------------------------------------------------------------------------------
-    //       Class:  Instrument
-    //      Method:  Serialize
-    //--------------------------------------------------------------------------------------
-    YAML::Node  Instrument::Serialize (  ) const {
-        YAML::Node node = LemmaObject::Serialize();;
-        node.SetTag( GetName() );
-        // Fill in class specifics
-        return node;
-    }		// -----  end of method Instrument::Serialize  -----
-
-}		// -----  end of Lemma  name  -----

Modules/LemmaCore/src/LayeredEarth.cpp

@@ -51,6 +51,15 @@ namespace Lemma {
 
 	// ====================  ACCESS        ===================================
 
+    //--------------------------------------------------------------------------------------
+    //       Class:  LayeredEarth
+    //      Method:  GetName
+    // Description:  Class identifier
+    //--------------------------------------------------------------------------------------
+    inline std::string LayeredEarth::GetName (  ) const {
+        return CName;
+    }		// -----  end of method LayeredEarth::get_GetName  -----
+
 	void LayeredEarth::SetLayerThickness(const VectorXr &thick) {
 		if (thick.size() != this->NumberOfLayers - 2)
 			throw EarthModelParametersDoNotMatchNumberOfLayers( );

Modules/LemmaCore/src/LemmaObject.cpp

@@ -40,6 +40,10 @@ namespace Lemma {
 
     // ====================  INQUIRY       ==============================
 
+    inline std::string LemmaObject::GetName() const {
+        return CName;
+    }
+
     // ====================  ACCESS        ==============================
 
     // ====================  ACCESS        ==============================

Modules/LemmaCore/src/RectilinearGrid.cpp

@@ -81,6 +81,14 @@ namespace Lemma {
         return std::make_shared< RectilinearGrid > ( node, ctor_key() );
     }
 
+    //--------------------------------------------------------------------------------------
+    //       Class:  RectilinearGrid
+    //      Method:  GetName
+    // Description:  Class identifier
+    //--------------------------------------------------------------------------------------
+    inline std::string RectilinearGrid::GetName (  ) const {
+        return CName;
+    }		// -----  end of method RectilinearGrid::get_GetName  -----
 
     // ====================  OPERATIONS    =======================
 

Modules/LemmaCore/src/RectilinearGridReader.cpp

@@ -73,7 +73,7 @@ namespace Lemma {
         //node["CommentString"] = CommentString;
         //node["BufferSize"] = BufferSize;
         return node;
-    }		// -----  end of method ASCIIParser::Serialize  -----
+    }		// -----  end of method GridReader::Serialize  -----
 
     //--------------------------------------------------------------------------------------
     //       Class:  RectilinearGridReader
@@ -84,7 +84,16 @@ namespace Lemma {
             throw  DeSerializeTypeMismatch( "RectilinearGridReader", node.Tag());
         }
         return std::make_shared< RectilinearGridReader >( node, ctor_key() ); //, ctor_key() );
-    }		// -----  end of method ASCIIParser::DeSerialize  -----
+    }		// -----  end of method GridReader::DeSerialize  -----
+
+    //--------------------------------------------------------------------------------------
+    //       Class:  RectilinearGridReader
+    //      Method:  GetName
+    // Description:  Class identifier
+    //--------------------------------------------------------------------------------------
+    inline std::string RectilinearGridReader::GetName (  ) const {
+        return CName;
+    }		// -----  end of method RectilinearGridReader::get_GetName  -----
 
     //--------------------------------------------------------------------------------------
     //       Class:  RectilinearGridReader

Modules/LemmaCore/src/RectilinearGridVTKExporter.cpp

@@ -70,6 +70,15 @@ RectilinearGridVTKExporter::~RectilinearGridVTKExporter () {
 
 //--------------------------------------------------------------------------------------
 //       Class:  RectilinearGridVTKExporter
+//      Method:  GetName
+// Description:  Class identifier
+//--------------------------------------------------------------------------------------
+inline std::string RectilinearGridVTKExporter::GetName (  ) const {
+    return CName;
+}		// -----  end of method RectilinearGridVTKExporter::GetName  -----
+
+//--------------------------------------------------------------------------------------
+//       Class:  RectilinearGridVTKExporter
 //      Method:  SetGrid
 //--------------------------------------------------------------------------------------
 void RectilinearGridVTKExporter::SetGrid ( std::shared_ptr<RectilinearGrid> GridIn ) {

Modules/LemmaCore/src/WindowFilter.cpp

@@ -97,6 +97,15 @@ namespace Lemma {
         return std::make_shared<WindowFilter>( node, ctor_key() );
     }
 
+    //--------------------------------------------------------------------------------------
+    //       Class:  WindowFilter
+    //      Method:  GetName
+    // Description:  Class identifier
+    //--------------------------------------------------------------------------------------
+    inline std::string WindowFilter::GetName (  ) const {
+        return CName;
+    }		// -----  end of method WindowFilter::GetName  -----
+
     // ====================  OPERATIONS    =======================
 
     void WindowFilter::SetWindowType(const WINDOWTYPE &type) {