Fixed some filenames to move away from all lowercase convention of yore.

Modules/FDEM1D/CMakeLists.txt

@@ -1,5 +1,5 @@
 add_subdirectory("src")
-add_library( fdem1d ${FEM1DSOURCE} )  
+add_library( fdem1d ${FDEM1DSOURCE} )  
 target_include_directories( fdem1d PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" )
 
 set_target_properties(fdem1d PROPERTIES 

Modules/FDEM1D/include/kernelem1dbase.h → Modules/FDEM1D/include/KernelEM1DBase.h

@@ -9,7 +9,6 @@
 
   @author   Trevor Irons
   @date     05/18/2012
-  @version  $Id: kernelem1dbase.h 193 2014-11-10 23:51:41Z tirons $
  **/
 
 #ifndef  KERNELEM1DBASE_INC

Modules/FDEM1D/include/KernelEM1DManager.h

@@ -14,9 +14,7 @@
 #ifndef  KERNELEM1DMANAGER_INC
 #define  KERNELEM1DMANAGER_INC
 
-//#include "dipolesource.h"
-//#include "kernelem1dreflbase.h"
-#include "kernelem1dbase.h"
+#include "KernelEM1DBase.h"
 #include "KernelEM1DSpec.h"
 
 namespace Lemma {

Modules/FDEM1D/include/KernelEM1DReflSpec.h

@@ -8,14 +8,13 @@
   @file
   @author   Trevor Irons
   @date     05/18/2012
-  @version  $Id: kernelem1dreflspec.h 123 2014-02-05 23:47:20Z tirons $
  **/
 
 #ifndef  KERNELEM1DREFLSPEC_INC
 #define  KERNELEM1DREFLSPEC_INC
 
 #include "DipoleSource.h"
-#include "kernelem1dreflbase.h"
+#include "KernelEM1DReflBase.h"
 #include "LayeredEarthEM.h"
 
 namespace Lemma {

Modules/FDEM1D/include/KernelEM1DSpec.h

@@ -8,16 +8,15 @@
   @file
   @author   Trevor Irons
   @date     05/16/2012
-  @version  $Id: kernelem1dspec.h 123 2014-02-05 23:47:20Z tirons $
  **/
 
 #ifndef  KERNELEM1DSPEC_INC
 #define  KERNELEM1DSPEC_INC
 
-#include "kernelem1dbase.h"
+#include "KernelEM1DBase.h"
 #include "KernelEM1DReflSpec.h"
 
-#include "kernelem1dreflbase.h"
+#include "KernelEM1DReflBase.h"
 #include "LayeredEarthEM.h"
 #include "DipoleSource.h"
 

Modules/FDEM1D/include/hankeltransform.h

@@ -14,7 +14,6 @@
 #ifndef __hankeltransform_h
 #define __hankeltransform_h
 
-//#include "kernelem1dbase.h"
 #include "KernelEM1DSpec.h"
 #include "KernelEM1DManager.h"
 

Modules/FDEM1D/include/hankeltransformgaussianquadrature.h

@@ -13,7 +13,7 @@
 #define  _HANKELTRANSFORMGAUSSIANQUADRATURE_h_INC
 
 #include "hankeltransform.h"
-#include "kernelem1dbase.h"
+#include "KernelEM1DBase.h"
 
 #ifdef HAVEBOOSTCYLBESSEL
 #include "boost/math/special_functions.hpp"

Modules/FDEM1D/include/hankeltransformhankel2.h

@@ -15,7 +15,7 @@
 #define __HANKEL2_H
 
 #include "hankeltransform.h"
-#include "kernelem1dbase.h"
+#include "KernelEM1DBase.h"
 #include "KernelEM1DSpec.h"
 #include "CubicSplineInterpolator.h"
 

Modules/FDEM1D/include/kernelem1dreflbase.h

@@ -1,246 +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     05/18/2012
-  @version  $Id: kernelem1dreflbase.h 193 2014-11-10 23:51:41Z tirons $
- **/
-
-#ifndef  KERNELEM1DREFLBASE_INC
-#define  KERNELEM1DREFLBASE_INC
-
-//#include "KernelEM1DSpec.h"
-#include "kernelem1dbase.h"
-#include "DipoleSource.h"
-#include "LayeredEarthEM.h"
-
-namespace Lemma {
-
-    enum DIPOLE_LOCATION { INAIR, INGROUND };
-
-    // forward declaration for friend
-    template<EMMODE Mode, int Ikernel, DIPOLE_LOCATION Isource, DIPOLE_LOCATION Irecv>
-    class KernelEM1DSpec;
-
-
-    // ===================================================================
-    //  Class:  KernelEM1DReflBase
-    /**
-      @class
-      \brief   Abstract class defining EM1DRefl class.
-      \details Derived classes are template specialized for optimal performance.
-     */
-    // ===================================================================
-    class KernelEM1DReflBase : public LemmaObject {
-
-        template<EMMODE Mode, int Ikernel, DIPOLE_LOCATION Isource, DIPOLE_LOCATION Irecv>
-        friend class KernelEM1DSpec;
-        friend class KernelEM1DManager;
-        //friend class DipoleSource;
-
-        public:
-
-            // ====================  LIFECYCLE     =======================
-
-            // ====================  OPERATORS     =======================
-
-            // ====================  OPERATIONS    =======================
-
-            void Initialise( std::shared_ptr<LayeredEarthEM> EarthIn) {
-
-                nlay = EarthIn->GetNumberOfLayers();
-                zh = VectorXcr::Zero(nlay);
-                yh = VectorXcr::Zero(nlay);
-                u = VectorXcr::Zero(nlay);
-                cf = VectorXcr::Zero(nlay);    // nlay -1 (lay 0 empty)
-                rtu = VectorXcr::Zero(nlay);   // nlay -1 Interfaces only
-                rtd = VectorXcr::Zero(nlay);   // nlay -1 Interfaces only
-                kk = VectorXcr::Zero(nlay);
-                Zyu = VectorXcr::Zero(nlay);
-                Zyd = VectorXcr::Zero(nlay);
-                Zyi = VectorXcr::Zero(nlay);
-                th = VectorXcr::Zero(nlay);
-
-                // Don't attach Earth, because this is performance critical.
-                // Everying is internal, it's OK relax Frankie
-                //if (Earth != NULL) {
-                //    Earth->DetachFrom(this);
-                //    Earth = NULL;
-                //}
-                //EarthIn->AttachTo(this);
-                Earth = EarthIn;
-
-                LayerThickness.resize(nlay);
-                for (int ilay=0; ilay<nlay; ++ilay) {
-                    LayerThickness(ilay) =  Earth->GetLayerThickness(ilay);
-                }
-
-                LayerDepth.resize(nlay);
-                for (int ilay=0; ilay<nlay; ++ilay) {
-                    LayerDepth(ilay) =  Earth->GetLayerDepth(ilay);
-                }
-
-            }
-
-            void SetUpSource( std::shared_ptr<DipoleSource> Dipole, const int &ifreq ) {
-
-                zh(0) = Complex(0, Dipole->GetAngularFrequency(ifreq)*MU0);
-                yh(0) = Complex(0, Dipole->GetAngularFrequency(ifreq)*EPSILON0);
-                kk(0) = -zh(0) * yh(0);
-
-                Earth->EvaluateColeColeModel(Dipole->GetAngularFrequency(ifreq));
-
-                for (int ilay=1; ilay<Earth->GetNumberOfLayers(); ++ilay) {
-                    zh(ilay) = zh(0) * Earth->GetLayerSusceptibility(ilay);
-                    yh(ilay) = Earth->GetLayerConductivity(ilay) +
-                            yh(0)*Earth->GetLayerPermitivity(ilay);
-                    kk(ilay)   = -zh(ilay)*yh(ilay);
-                }
-
-                tx_z = Dipole->GetLocation(2);
-                lays = 0;
-                Real Depth(0);
-                for (int ilay=1; ilay<nlay; ++ilay) {
-                    if (tx_z > Depth) {
-                        lays = ilay;
-                    }
-                    Depth += LayerThickness(ilay);
-                }
-            }
-
-            void SetUpReceiver(const Real &rz) {
-                rx_z = rz;
-                Real Depth(0.);
-                layr = 0;
-                for (int ilay=1; ilay<Earth->GetNumberOfLayers(); ++ilay) {
-                    if (rx_z > Depth) {
-                        layr = ilay;
-                    }
-                    Depth += LayerThickness(ilay);
-                }
-            }
-
-            // ====================  ACCESS        =======================
-            Complex GetYm() {
-                return yh(layr);
-            }
-
-            Complex GetZm() {
-                return zh(layr);
-            }
-
-            Complex GetZs() {
-                return zh(lays);
-            }
-
-            Complex GetKs() {
-                return kk(lays);
-            }
-
-            // ====================  INQUIRY       =======================
-
-        protected:
-
-            // ====================  LIFECYCLE     =======================
-
-            /// Default protected constructor.
-            KernelEM1DReflBase ( ) : LemmaObject( )
-            {
-            }
-
-            /// Default protected constructor.
-            ~KernelEM1DReflBase () {
-            }
-
-            // ====================  OPERATIONS    =======================
-
-            /** Computes reflection coefficients. Depending on the
-             * specialisation, this will either be TM or TE mode.
-             */
-            virtual void ComputeReflectionCoeffs(const Real& lambda)=0;
-
-            /** Precomputes expensive calculations that are reused by insances
-             * of KernelEM1DSpec in the calculation of Related potentials.
-             */
-            virtual void PreComputePotentialTerms()=0;
-
-            // ====================  DATA MEMBERS  =========================
-
-			/// Bessel order, only 0 or 1 supported
-			int id; // Needs to be dim nRel, or separate
-
-            /// Layer the source is in
-			int lays;
-
-			/// Layer the receiver is in
-			int layr;
-
-			/// Number of Layers
-			int nlay;
-
-            /// Number of Related kernels to be computed
-            int nRelated;
-
-            /// Used in related kernel precompute calls
-            int relIud;
-
-			/// Receiver z position
-			Real rx_z;
-
-			/// Transmitter z position
-			Real tx_z;
-
-            /// bessel arg squared
-            Real rams;
-
-            /** Related part of con term */
-            Complex  relCon;
-
-            Complex  relenukadz;
-
-            Complex  relexp_pbs1;
-
-            Complex  relexp_pbs2;
-
-            Complex  rel_a;
-
-			/// TM or TE mode
-			EMMODE mode;
-
-            /// Pointer to layered earth
-            std::shared_ptr<LayeredEarthEM> Earth;
-
-			Complex       uk;
-			Complex       um;
-			VectorXcr     cf;  // nlay
-			VectorXcr      u;  // nlay
-			VectorXcr     yh;  // nlay
-			VectorXcr     zh;  // nlay
-			VectorXcr     kk;  // nlay
-			VectorXcr    Zyu;  //(nlay); //Zyu.setZero();
-			VectorXcr    Zyd;  //(nlay); //Zyd.setZero();
-			VectorXcr    Zyi;  //(nlay); //Zyi.setZero();
-			VectorXcr     th;  //(nlay);
-			VectorXr     LayerThickness;
-			VectorXr     LayerDepth;
-
-			/// Reflection/Transmission coeffients for upgoing waves in a
-			/// layered earth model
-			VectorXcr    rtu;
-
-			/// Reflection/Transmission coeffients for downgoing waves in
-			/// a layered earth model
-			VectorXcr    rtd;
-
-        private:
-
-    }; // -----  end of class  KernelEM1DReflBase  -----
-
-}		// -----  end of Lemma  name  -----
-
-#endif   // ----- #ifndef KERNELEM1DREFLBASE_INC  -----

Modules/FDEM1D/src/CMakeLists.txt

@@ -1,11 +1,16 @@
-set (FEM1DSOURCE
-	${FEM1DSOURCE}
+set (FDEM1DSOURCE
+	${FDEM1DSOURCE}
+
 	#${CMAKE_CURRENT_SOURCE_DIR}/AEMSurvey.cpp
+	#${CMAKE_CURRENT_SOURCE_DIR}/AEMSurveyReader.cpp
+
 	${CMAKE_CURRENT_SOURCE_DIR}/LayeredEarthEM.cpp
+	
 	${CMAKE_CURRENT_SOURCE_DIR}/FieldPoints.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/WireAntenna.cpp
-	${CMAKE_CURRENT_SOURCE_DIR}/KernelEM1DManager.cpp
+	
 	${CMAKE_CURRENT_SOURCE_DIR}/DipoleSource.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/WireAntenna.cpp
+
 	
 	${CMAKE_CURRENT_SOURCE_DIR}/KernelEM1DManager.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/KernelEM1DSpec.cpp

Modules/FDEM1D/src/KernelEM1DManager.cpp

@@ -8,7 +8,6 @@
   @file
   @author   Trevor Irons
   @date     06/26/2012
-  @version  $Id: kernelem1dmanager.cpp 193 2014-11-10 23:51:41Z tirons $
  **/
 
 #include "KernelEM1DManager.h"

Modules/FDEM1D/src/KernelEM1DReflSpec.cpp

@@ -8,7 +8,6 @@
   @file
   @author   Trevor Irons
   @date     05/18/2012
-  @version  $Id: kernelem1dreflspec.cpp 169 2014-09-06 22:16:12Z tirons $
  **/
 
 #include "KernelEM1DReflSpec.h"

Modules/FDEM1D/src/KernelEM1DSpec.cpp

@@ -8,7 +8,6 @@
   @file
   @author   Trevor Irons
   @date     05/17/2012
-  @version  $Id: kernelem1dspec.cpp 87 2013-09-05 22:44:05Z tirons $
  **/
 
 #include "KernelEM1DSpec.h"