Browse Source

Anderson801 is compiling.

enhancement_3
T-bone 8 years ago
parent
commit
595c8562e5

+ 1
- 1
Modules/FDEM1D/include/HankelTransform.h View File

50
                 /// = omega * sqrt( EP*AMU )  amu = 4 pi e-7  ep = 8.85e-12
50
                 /// = omega * sqrt( EP*AMU )  amu = 4 pi e-7  ep = 8.85e-12
51
                 virtual Complex Zgauss(const int &ikk, const EMMODE &imode,
51
                 virtual Complex Zgauss(const int &ikk, const EMMODE &imode,
52
                             const int &itype, const Real &rho,
52
                             const int &itype, const Real &rho,
53
-                            const Real &wavef, std::shared_ptr<KernelEm1DBase> Kernel)=0;
53
+                            const Real &wavef, std::shared_ptr<KernelEM1DBase> Kernel)=0;
54
 
54
 
55
                 /// Computes related kernels, if applicable, otherwise this is
55
                 /// Computes related kernels, if applicable, otherwise this is
56
                 /// just a dummy function.
56
                 /// just a dummy function.

+ 5
- 5
Modules/FDEM1D/include/KernelEM1DBase.h View File

22
     enum EMMODE {TM, TE, NONE};
22
     enum EMMODE {TM, TE, NONE};
23
 
23
 
24
     // ===================================================================
24
     // ===================================================================
25
-    //  Class:  KernelEm1DBase
25
+    //  Class:  KernelEM1DBase
26
     /**
26
     /**
27
       @class
27
       @class
28
       \brief   Pure virtual base class of KernelEm1D
28
       \brief   Pure virtual base class of KernelEm1D
29
       \details Defines interface for HankelTransform classes
29
       \details Defines interface for HankelTransform classes
30
      */
30
      */
31
     // ===================================================================
31
     // ===================================================================
32
-    class KernelEm1DBase : public LemmaObject {
32
+    class KernelEM1DBase : public LemmaObject {
33
 
33
 
34
         friend class KernelEM1DManager;
34
         friend class KernelEM1DManager;
35
 
35
 
38
             // ====================  LIFECYCLE     =======================
38
             // ====================  LIFECYCLE     =======================
39
 
39
 
40
             /// Default protected constructor.
40
             /// Default protected constructor.
41
-            KernelEm1DBase ( ) : LemmaObject( ) {
41
+            KernelEM1DBase ( ) : LemmaObject( ) {
42
 
42
 
43
             }
43
             }
44
 
44
 
45
             /// Default protected constructor.
45
             /// Default protected constructor.
46
-            ~KernelEm1DBase () {
46
+            ~KernelEM1DBase () {
47
             }
47
             }
48
 
48
 
49
             // ====================  OPERATORS     =======================
49
             // ====================  OPERATORS     =======================
95
             /** ASCII string representation of the class name */
95
             /** ASCII string representation of the class name */
96
             static constexpr auto CName = "KernelEM1DBase";
96
             static constexpr auto CName = "KernelEM1DBase";
97
 
97
 
98
-    }; // -----  end of class  KernelEm1DBase  -----
98
+    }; // -----  end of class  KernelEM1DBase  -----
99
 
99
 
100
 } // namespace Lemma
100
 } // namespace Lemma
101
 
101
 

+ 3
- 3
Modules/FDEM1D/include/KernelEM1DManager.h View File

115
             /** Returns pointer to specified kernel indice. Indices are assigned in the same
115
             /** Returns pointer to specified kernel indice. Indices are assigned in the same
116
                 order as they are created by AddKernel.
116
                 order as they are created by AddKernel.
117
              */
117
              */
118
-            std::shared_ptr<KernelEm1DBase>    GetKernel(const unsigned int& ik);
118
+            std::shared_ptr<KernelEM1DBase>    GetKernel(const unsigned int& ik);
119
 
119
 
120
             /** Returns pointer to connected dipole.
120
             /** Returns pointer to connected dipole.
121
              */
121
              */
122
             std::shared_ptr<DipoleSource>    GetDipole( );
122
             std::shared_ptr<DipoleSource>    GetDipole( );
123
 
123
 
124
-            inline std::vector< std::shared_ptr<KernelEm1DBase> >  GetSTLVector() {
124
+            inline std::vector< std::shared_ptr<KernelEM1DBase> >  GetSTLVector() {
125
                 return KernelVec;
125
                 return KernelVec;
126
             }
126
             }
127
 
127
 
139
             // ====================  DATA MEMBERS  =========================
139
             // ====================  DATA MEMBERS  =========================
140
 
140
 
141
             /** List of KernelEm1D instances */
141
             /** List of KernelEm1D instances */
142
-            std::vector< std::shared_ptr<KernelEm1DBase> >  KernelVec;
142
+            std::vector< std::shared_ptr<KernelEM1DBase> >  KernelVec;
143
 
143
 
144
             /** Reflection base used for TE mode */
144
             /** Reflection base used for TE mode */
145
             std::shared_ptr<KernelEM1DReflBase>        TEReflBase;
145
             std::shared_ptr<KernelEM1DReflBase>        TEReflBase;

+ 2
- 2
Modules/FDEM1D/include/KernelEM1DSpec.h View File

35
      */
35
      */
36
     // ===================================================================
36
     // ===================================================================
37
     template<EMMODE Mode, int Ikernel, DIPOLE_LOCATION Isource, DIPOLE_LOCATION Irecv>
37
     template<EMMODE Mode, int Ikernel, DIPOLE_LOCATION Isource, DIPOLE_LOCATION Irecv>
38
-    class KernelEM1DSpec : public KernelEm1DBase {
38
+    class KernelEM1DSpec : public KernelEM1DBase {
39
 
39
 
40
         struct ctor_key {};
40
         struct ctor_key {};
41
 
41
 
44
             // ====================  LIFECYCLE     =======================
44
             // ====================  LIFECYCLE     =======================
45
 
45
 
46
             /// Default locked constructor.
46
             /// Default locked constructor.
47
-            explicit KernelEM1DSpec (const ctor_key& ) : KernelEm1DBase( ), ReflCalc(nullptr) {
47
+            explicit KernelEM1DSpec (const ctor_key& ) : KernelEM1DBase( ), ReflCalc(nullptr) {
48
             }
48
             }
49
 
49
 
50
             /// Default destructor.
50
             /// Default destructor.

+ 1
- 1
Modules/FDEM1D/src/FHTAnderson801.cpp View File

964
 
964
 
965
 	Complex FHTAnderson801::Zgauss(const int &ikk, const EMMODE &imode,
965
 	Complex FHTAnderson801::Zgauss(const int &ikk, const EMMODE &imode,
966
 						const int &itype, const Real &rho,
966
 						const int &itype, const Real &rho,
967
-						const Real &wavef, KernelEm1DBase *Kernel) {
967
+						const Real &wavef, std::shared_ptr<KernelEM1DBase> Kernel) {
968
 
968
 
969
         // TODO, right here we want to return the splined solution instead in the
969
         // TODO, right here we want to return the splined solution instead in the
970
         //       case of lagged convolution!
970
         //       case of lagged convolution!

+ 1
- 1
Modules/FDEM1D/src/KernelEM1DManager.cpp View File

51
         rx_z = rx_zin;
51
         rx_z = rx_zin;
52
     }
52
     }
53
 
53
 
54
-    std::shared_ptr<KernelEm1DBase> KernelEM1DManager::GetKernel(const unsigned int& ik) {
54
+    std::shared_ptr<KernelEM1DBase> KernelEM1DManager::GetKernel(const unsigned int& ik) {
55
         return KernelVec[ik];
55
         return KernelVec[ik];
56
     }
56
     }
57
 
57
 

Loading…
Cancel
Save