ソースを参照

Movement of GetName from headers to make Clang happy :)

submodule
Trevor Irons 7年前
コミット
cdfa8abf79

+ 1
- 3
Modules/FDEM1D/include/DipoleSource.h ファイルの表示

211
             #endif
211
             #endif
212
 
212
 
213
             /** Returns the name of the underlying class, similiar to Python's type */
213
             /** Returns the name of the underlying class, similiar to Python's type */
214
-            virtual inline std::string GetName() const {
215
-                return CName;
216
-            }
214
+            virtual std::string GetName() const ;
217
 
215
 
218
         private:
216
         private:
219
 
217
 

+ 1
- 3
Modules/FDEM1D/include/EMEarth1D.h ファイルの表示

146
              *  Returns the name of the underlying class, similiar to Python's type
146
              *  Returns the name of the underlying class, similiar to Python's type
147
              *  @return string of class name
147
              *  @return string of class name
148
              */
148
              */
149
-            virtual inline std::string GetName() const {
150
-                return CName;
151
-            }
149
+            virtual std::string GetName() const;
152
 
150
 
153
             /**
151
             /**
154
              *  Returns the Mode enum tag.
152
              *  Returns the Mode enum tag.

+ 1
- 3
Modules/FDEM1D/include/FHTAnderson801.h ファイルの表示

148
                         const Real &wavef, KernelEM1DBase* Kernel);
148
                         const Real &wavef, KernelEM1DBase* Kernel);
149
 
149
 
150
         /** Returns the name of the underlying class, similiar to Python's type */
150
         /** Returns the name of the underlying class, similiar to Python's type */
151
-        virtual inline std::string GetName() const {
152
-            return CName;
153
-        }
151
+        virtual inline std::string GetName() const;
154
 
152
 
155
     protected:
153
     protected:
156
 
154
 

+ 1
- 3
Modules/FDEM1D/include/FHTKey101.h ファイルの表示

88
         // ====================  ACCESS        =======================
88
         // ====================  ACCESS        =======================
89
 
89
 
90
         // ====================  INQUIRY       =======================
90
         // ====================  INQUIRY       =======================
91
-        virtual inline std::string GetName() const {
92
-            return CName;
93
-        }
91
+        virtual std::string GetName() const;
94
 
92
 
95
         protected:
93
         protected:
96
 
94
 

+ 1
- 3
Modules/FDEM1D/include/FHTKey201.h ファイルの表示

90
         // ====================  INQUIRY       =======================
90
         // ====================  INQUIRY       =======================
91
 
91
 
92
         /** Returns the name of the underlying class, similiar to Python's type */
92
         /** Returns the name of the underlying class, similiar to Python's type */
93
-        virtual inline std::string GetName() const {
94
-            return CName;
95
-        }
93
+        virtual std::string GetName() const;
96
 
94
 
97
         protected:
95
         protected:
98
 
96
 

+ 1
- 3
Modules/FDEM1D/include/FHTKey51.h ファイルの表示

90
         // ====================  INQUIRY       =======================
90
         // ====================  INQUIRY       =======================
91
 
91
 
92
         /** Returns the name of the underlying class, similiar to Python's type */
92
         /** Returns the name of the underlying class, similiar to Python's type */
93
-        virtual inline std::string GetName() const {
94
-            return CName;
95
-        }
93
+        virtual inline std::string GetName() const ;
96
 
94
 
97
         protected:
95
         protected:
98
 
96
 

+ 1
- 3
Modules/FDEM1D/include/FieldPoints.h ファイルの表示

114
             // ====================  INQUIRY       ===========================
114
             // ====================  INQUIRY       ===========================
115
 
115
 
116
             /** Returns the name of the underlying class, similiar to Python's type */
116
             /** Returns the name of the underlying class, similiar to Python's type */
117
-            virtual inline std::string GetName() const {
118
-                return CName;
119
-            }
117
+            virtual std::string GetName() const ;
120
 
118
 
121
             /// Returns the number of receiverpoints.
119
             /// Returns the number of receiverpoints.
122
             int GetNumberOfPoints();
120
             int GetNumberOfPoints();

+ 1
- 3
Modules/FDEM1D/include/GQChave.h ファイルの表示

85
 			// ====================  INQUIRY       ============================
85
 			// ====================  INQUIRY       ============================
86
 
86
 
87
             /** Returns the name of the underlying class, similiar to Python's type */
87
             /** Returns the name of the underlying class, similiar to Python's type */
88
-            virtual inline std::string GetName() const {
89
-                return CName;
90
-            }
88
+            virtual inline std::string GetName() const ;
91
 
89
 
92
 			// ====================  DATA MEMBERS  ============================
90
 			// ====================  DATA MEMBERS  ============================
93
 
91
 

+ 1
- 3
Modules/FDEM1D/include/HankelTransform.h ファイルの表示

66
 
66
 
67
                 // ====================  INQUIRY       =======================
67
                 // ====================  INQUIRY       =======================
68
                 /** Returns the name of the underlying class, similiar to Python's type */
68
                 /** Returns the name of the underlying class, similiar to Python's type */
69
-                virtual inline std::string GetName() const {
70
-                    return CName;
71
-                }
69
+                virtual inline std::string GetName() const = 0 ;
72
 
70
 
73
                 // ====================  DATA MEMBERS  =======================
71
                 // ====================  DATA MEMBERS  =======================
74
 
72
 

+ 1
- 3
Modules/FDEM1D/include/KernelEM1DManager.h ファイルの表示

133
             // ====================  INQUIRY       =======================
133
             // ====================  INQUIRY       =======================
134
 
134
 
135
             /** Returns the name of the underlying class, similiar to Python's type */
135
             /** Returns the name of the underlying class, similiar to Python's type */
136
-            virtual inline std::string GetName() const {
137
-                return CName;
138
-            }
136
+            virtual inline std::string GetName() const ;
139
 
137
 
140
         protected:
138
         protected:
141
 
139
 

+ 1
- 3
Modules/FDEM1D/include/LayeredEarthEM.h ファイルの表示

245
             VectorXr GetLayerBreathPermitivity( );
245
             VectorXr GetLayerBreathPermitivity( );
246
 
246
 
247
             /** Returns the name of the underlying class, similiar to Python's type */
247
             /** Returns the name of the underlying class, similiar to Python's type */
248
-            virtual inline std::string GetName() const {
249
-                return CName;
250
-            }
248
+            virtual std::string GetName() const ;
251
 
249
 
252
         protected:
250
         protected:
253
 
251
 

+ 1
- 3
Modules/FDEM1D/include/PolygonalWireAntenna.h ファイルの表示

97
             // ====================  INQUIRY       =======================
97
             // ====================  INQUIRY       =======================
98
 
98
 
99
             /** Returns the name of the underlying class, similiar to Python's type */
99
             /** Returns the name of the underlying class, similiar to Python's type */
100
-            virtual inline std::string GetName() const {
101
-                return CName;
102
-            }
100
+            virtual std::string GetName() const ;
103
 
101
 
104
         protected:
102
         protected:
105
 
103
 

+ 1
- 3
Modules/FDEM1D/include/QWEKey.h ファイルの表示

100
         // ====================  INQUIRY       =======================
100
         // ====================  INQUIRY       =======================
101
 
101
 
102
         /** Returns the name of the underlying class, similiar to Python's type */
102
         /** Returns the name of the underlying class, similiar to Python's type */
103
-        virtual inline std::string GetName() const {
104
-            return CName;
105
-        }
103
+        virtual std::string GetName() const ;
106
 
104
 
107
         protected:
105
         protected:
108
 
106
 

+ 1
- 3
Modules/FDEM1D/include/WireAntenna.h ファイルの表示

187
             bool IsHorizontallyPlanar();
187
             bool IsHorizontallyPlanar();
188
 
188
 
189
             /** Returns the name of the underlying class, similiar to Python's type */
189
             /** Returns the name of the underlying class, similiar to Python's type */
190
-            virtual inline std::string GetName() const {
191
-                return CName;
192
-            }
190
+            virtual std::string GetName() const;
193
 
191
 
194
         protected:
192
         protected:
195
 
193
 

+ 9
- 0
Modules/FDEM1D/src/DipoleSource.cpp ファイルの表示

107
         return Obj;
107
         return Obj;
108
     }
108
     }
109
 
109
 
110
+    //--------------------------------------------------------------------------------------
111
+    //       Class:  DipoleSource
112
+    //      Method:  GetName
113
+    // Description:  Class identifier
114
+    //--------------------------------------------------------------------------------------
115
+    inline std::string DipoleSource::GetName (  ) const {
116
+        return CName;
117
+    }		// -----  end of method DipoleSource::GetName  -----
118
+
110
     // ====================  ACCESS        ======================
119
     // ====================  ACCESS        ======================
111
     void DipoleSource::SetLocation(const Vector3r &posin) {
120
     void DipoleSource::SetLocation(const Vector3r &posin) {
112
         this->Location = posin;
121
         this->Location = posin;

+ 9
- 0
Modules/FDEM1D/src/EMEarth1D.cpp ファイルの表示

98
         return node;
98
         return node;
99
     }
99
     }
100
 
100
 
101
+    //--------------------------------------------------------------------------------------
102
+    //       Class:  EMEarth1D
103
+    //      Method:  GetName
104
+    // Description:  Class identifier
105
+    //--------------------------------------------------------------------------------------
106
+    inline std::string EMEarth1D::GetName (  ) const {
107
+        return CName;
108
+    }		// -----  end of method EMEarth1D::GetName  -----
109
+
101
     // ====================  ACCESS        ===================================
110
     // ====================  ACCESS        ===================================
102
     void EMEarth1D::AttachDipoleSource( std::shared_ptr<DipoleSource> dipoleptr) {
111
     void EMEarth1D::AttachDipoleSource( std::shared_ptr<DipoleSource> dipoleptr) {
103
         Dipole = dipoleptr;
112
         Dipole = dipoleptr;

+ 9
- 0
Modules/FDEM1D/src/FHTAnderson801.cpp ファイルの表示

891
         splineVecImag.clear();
891
         splineVecImag.clear();
892
     }
892
     }
893
 
893
 
894
+    //--------------------------------------------------------------------------------------
895
+    //       Class:  FHTAnderson801
896
+    //      Method:  GetName
897
+    // Description:  Class identifier
898
+    //--------------------------------------------------------------------------------------
899
+    inline std::string FHTAnderson801::GetName (  ) const {
900
+        return CName;
901
+    }		// -----  end of method FHTAnderson801::GetName  -----
902
+
894
 	// ====================  OPERATIONS    ==============================
903
 	// ====================  OPERATIONS    ==============================
895
 
904
 
896
     void FHTAnderson801::ComputeRelated(const Real& rho, std::shared_ptr<KernelEM1DBase> Kernel) {
905
     void FHTAnderson801::ComputeRelated(const Real& rho, std::shared_ptr<KernelEM1DBase> Kernel) {

+ 9
- 0
Modules/FDEM1D/src/FHTKey101.cpp ファイルの表示

198
 
198
 
199
     //--------------------------------------------------------------------------------------
199
     //--------------------------------------------------------------------------------------
200
     //       Class:  FHTKey101
200
     //       Class:  FHTKey101
201
+    //      Method:  GetName
202
+    // Description:  Class identifier
203
+    //--------------------------------------------------------------------------------------
204
+    inline std::string FHTKey101::GetName (  ) const {
205
+        return CName;
206
+    }		// -----  end of method FHTKey101::GetName  -----
207
+
208
+    //--------------------------------------------------------------------------------------
209
+    //       Class:  FHTKey101
201
     //      Method:  Zgauss
210
     //      Method:  Zgauss
202
     //--------------------------------------------------------------------------------------
211
     //--------------------------------------------------------------------------------------
203
     Complex FHTKey101::Zgauss ( const int &ikk, const EMMODE &imode,
212
     Complex FHTKey101::Zgauss ( const int &ikk, const EMMODE &imode,

+ 9
- 0
Modules/FDEM1D/src/FHTKey201.cpp ファイルの表示

297
 
297
 
298
     //--------------------------------------------------------------------------------------
298
     //--------------------------------------------------------------------------------------
299
     //       Class:  FHTKey201
299
     //       Class:  FHTKey201
300
+    //      Method:  GetName
301
+    // Description:  Class identifier
302
+    //--------------------------------------------------------------------------------------
303
+    inline std::string FHTKey201::GetName (  ) const {
304
+        return CName;
305
+    }		// -----  end of method FHTKey201::GetName  -----
306
+
307
+    //--------------------------------------------------------------------------------------
308
+    //       Class:  FHTKey201
300
     //      Method:  Zgauss
309
     //      Method:  Zgauss
301
     //--------------------------------------------------------------------------------------
310
     //--------------------------------------------------------------------------------------
302
     Complex FHTKey201::Zgauss ( const int &ikk, const EMMODE &imode,
311
     Complex FHTKey201::Zgauss ( const int &ikk, const EMMODE &imode,

+ 9
- 0
Modules/FDEM1D/src/FHTKey51.cpp ファイルの表示

149
 
149
 
150
     //--------------------------------------------------------------------------------------
150
     //--------------------------------------------------------------------------------------
151
     //       Class:  FHTKey51
151
     //       Class:  FHTKey51
152
+    //      Method:  GetName
153
+    // Description:  Class identifier
154
+    //--------------------------------------------------------------------------------------
155
+    inline std::string FHTKey51::GetName (  ) const {
156
+        return CName;
157
+    }		// -----  end of method FHTKey51::GetName  -----
158
+
159
+    //--------------------------------------------------------------------------------------
160
+    //       Class:  FHTKey51
152
     //      Method:  Zgauss
161
     //      Method:  Zgauss
153
     //--------------------------------------------------------------------------------------
162
     //--------------------------------------------------------------------------------------
154
     Complex FHTKey51::Zgauss ( const int &ikk, const EMMODE &imode,
163
     Complex FHTKey51::Zgauss ( const int &ikk, const EMMODE &imode,

+ 9
- 0
Modules/FDEM1D/src/FieldPoints.cpp ファイルの表示

79
         return std::make_shared<FieldPoints> ( node, ctor_key() );
79
         return std::make_shared<FieldPoints> ( node, ctor_key() );
80
     }		// -----  end of method FieldPoints::DeSerialize  -----
80
     }		// -----  end of method FieldPoints::DeSerialize  -----
81
 
81
 
82
+    //--------------------------------------------------------------------------------------
83
+    //       Class:  FieldPoints
84
+    //      Method:  GetName
85
+    // Description:  Class identifier
86
+    //--------------------------------------------------------------------------------------
87
+    inline std::string FieldPoints::GetName (  ) const {
88
+        return CName;
89
+    }		// -----  end of method FieldPoints::GetName  -----
90
+
82
     // ====================  ACCESS        ===================================
91
     // ====================  ACCESS        ===================================
83
 
92
 
84
     void FieldPoints::SetNumberOfPoints(const int &nrec) {
93
     void FieldPoints::SetNumberOfPoints(const int &nrec) {

+ 9
- 0
Modules/FDEM1D/src/GQChave.cpp ファイルの表示

309
 
309
 
310
     /////////////////////////////////////////////////////////////
310
     /////////////////////////////////////////////////////////////
311
 
311
 
312
+    //--------------------------------------------------------------------------------------
313
+    //       Class:  GQChave
314
+    //      Method:  GetName
315
+    // Description:  Class identifier
316
+    //--------------------------------------------------------------------------------------
317
+    inline std::string GQChave::GetName (  ) const {
318
+        return CName;
319
+    }		// -----  end of method GQChave::GetName  -----
320
+
312
     Complex GQChave::
321
     Complex GQChave::
313
             Zgauss(const int &ikk, const EMMODE &mode,
322
             Zgauss(const int &ikk, const EMMODE &mode,
314
                     const int &itype, const Real &rho, const Real &wavef,
323
                     const int &itype, const Real &rho, const Real &wavef,

+ 9
- 1
Modules/FDEM1D/src/KernelEM1DManager.cpp ファイルの表示

19
         return stream;
19
         return stream;
20
     }
20
     }
21
 
21
 
22
-
23
     // ====================  LIFECYCLE     =======================
22
     // ====================  LIFECYCLE     =======================
24
 
23
 
25
     KernelEM1DManager::KernelEM1DManager( const ctor_key& ) : LemmaObject( ), TEReflBase(nullptr),
24
     KernelEM1DManager::KernelEM1DManager( const ctor_key& ) : LemmaObject( ), TEReflBase(nullptr),
37
 
36
 
38
     // ====================  ACCESS        =======================
37
     // ====================  ACCESS        =======================
39
 
38
 
39
+    //--------------------------------------------------------------------------------------
40
+    //       Class:  KernelEM1DManager
41
+    //      Method:  GetName
42
+    // Description:  Class identifier
43
+    //--------------------------------------------------------------------------------------
44
+    inline std::string KernelEM1DManager::GetName (  ) const {
45
+        return CName;
46
+    }		// -----  end of method KernelEM1DManager::GetName  -----
47
+
40
     // A race condition can develop with these. It's OK to not attach, since this is an internal class, and
48
     // A race condition can develop with these. It's OK to not attach, since this is an internal class, and
41
     // we know what is going on.
49
     // we know what is going on.
42
     void KernelEM1DManager::SetEarth( std::shared_ptr<LayeredEarthEM> Earthin) {
50
     void KernelEM1DManager::SetEarth( std::shared_ptr<LayeredEarthEM> Earthin) {

+ 9
- 0
Modules/FDEM1D/src/LayeredEarthEM.cpp ファイルの表示

74
         return node;
74
         return node;
75
     }
75
     }
76
 
76
 
77
+    //--------------------------------------------------------------------------------------
78
+    //       Class:  LayeredEarthEM
79
+    //      Method:  GetName
80
+    // Description:  Class identifier
81
+    //--------------------------------------------------------------------------------------
82
+    inline std::string LayeredEarthEM::GetName (  ) const {
83
+        return CName;
84
+    }		// -----  end of method LayeredEarthEM::GetName  -----
85
+
77
     // ====================  OPERATIONS    ===================================
86
     // ====================  OPERATIONS    ===================================
78
     void LayeredEarthEM::EvaluateColeColeModel(const Real& omega) {
87
     void LayeredEarthEM::EvaluateColeColeModel(const Real& omega) {
79
 
88
 

+ 8
- 0
Modules/FDEM1D/src/PolygonalWireAntenna.cpp ファイルの表示

93
 		return copy;
93
 		return copy;
94
 	}
94
 	}
95
 
95
 
96
+    //--------------------------------------------------------------------------------------
97
+    //       Class:  PolygonalWireAntenna
98
+    //      Method:  GetName
99
+    // Description:  Class identifier
100
+    //--------------------------------------------------------------------------------------
101
+    inline std::string PolygonalWireAntenna::GetName (  ) const {
102
+        return CName;
103
+    }		// -----  end of method PolygonalWireAntenna::GetName  -----
96
 
104
 
97
     void PolygonalWireAntenna::SetMinDipoleRatio (const Real& ratio) {
105
     void PolygonalWireAntenna::SetMinDipoleRatio (const Real& ratio) {
98
         minDipoleRatio = ratio;
106
         minDipoleRatio = ratio;

+ 9
- 0
Modules/FDEM1D/src/QWEKey.cpp ファイルの表示

102
 
102
 
103
     //--------------------------------------------------------------------------------------
103
     //--------------------------------------------------------------------------------------
104
     //       Class:  QWEKey
104
     //       Class:  QWEKey
105
+    //      Method:  GetName
106
+    // Description:  Class identifier
107
+    //--------------------------------------------------------------------------------------
108
+    inline std::string QWEKey::GetName (  ) const {
109
+        return CName;
110
+    }		// -----  end of method QWEKey::GetName  -----
111
+
112
+    //--------------------------------------------------------------------------------------
113
+    //       Class:  QWEKey
105
     //      Method:  Zgauss
114
     //      Method:  Zgauss
106
     //--------------------------------------------------------------------------------------
115
     //--------------------------------------------------------------------------------------
107
     Complex QWEKey::Zgauss ( const int &ikk, const EMMODE &imode,
116
     Complex QWEKey::Zgauss ( const int &ikk, const EMMODE &imode,

+ 8
- 0
Modules/FDEM1D/src/WireAntenna.cpp ファイルの表示

80
         return std::make_shared<WireAntenna> ( node, ctor_key() );
80
         return std::make_shared<WireAntenna> ( node, ctor_key() );
81
     }		// -----  end of method WireAntenna::DeSerialize  -----
81
     }		// -----  end of method WireAntenna::DeSerialize  -----
82
 
82
 
83
+    //--------------------------------------------------------------------------------------
84
+    //       Class:  WireAntenna
85
+    //      Method:  GetName
86
+    // Description:  Class identifier
87
+    //--------------------------------------------------------------------------------------
88
+    inline std::string WireAntenna::GetName (  ) const {
89
+        return CName;
90
+    }		// -----  end of method WireAntenna::GetName  -----
83
 
91
 
84
     // ====================  ACCESS        =======================
92
     // ====================  ACCESS        =======================
85
 
93
 

読み込み中…
キャンセル
保存