Переглянути джерело

Tracing templated FHT spec. errors

add-code-of-conduct-1
Trevor Irons 6 роки тому
джерело
коміт
58f10d3888

+ 10
- 5
Modules/FDEM1D/include/FHT.h Переглянути файл

@@ -101,11 +101,7 @@ namespace Lemma {
101 101
         // ====================  OPERATIONS    =======================
102 102
 
103 103
         Complex Zgauss(const int&, const Lemma::EMMODE&, const int&, const Real&,
104
-            const Real&, Lemma::KernelEM1DBase* Kernel) {
105
-            // TODO, in 101 or 51 we never reach here!!
106
-            std::cout << "Zgauss " << std::endl;
107
-            return this->Zans(0, Kernel->GetManagerIndex());
108
-        }
104
+            const Real&, Lemma::KernelEM1DBase* Kernel);
109 105
 
110 106
         /// Computes related kernels, if applicable, otherwise this is
111 107
         /// just a dummy function.
@@ -173,6 +169,15 @@ namespace Lemma {
173 169
 
174 170
     }; // -----  end of class  FHT  ----
175 171
 
172
+
173
+    template < HANKELTRANSFORMTYPE Type >
174
+    Complex FHT<Type>::Zgauss(const int& ii, const Lemma::EMMODE& mode, const int& jj, const Real& val,
175
+            const Real& val2, Lemma::KernelEM1DBase* Kernel){
176
+            // TODO, in 101 or 51 we never reach here!!
177
+            //std::cout << "Zgauss " << std::endl;
178
+            return this->Zans(0, Kernel->GetManagerIndex());
179
+    }
180
+
176 181
     // Specialisations
177 182
     // Note that ANDERSON801, CHAVE, QWEKEY will throw errors as they are not consistent
178 183
     //      part of this class

+ 4
- 2
Modules/FDEM1D/src/DipoleSource.cpp Переглянути файл

@@ -932,15 +932,17 @@ namespace Lemma {
932 932
                             }
933 933
                             break;
934 934
                         case H:
935
-                            //std::cout << "Fuck me gently with a chainsaw..." << std::endl;
935
+                            std::cout << "Fuck me gently with a chainsaw..." << std::endl;
936 936
                             //std::cout << f.cols() << "\t" << f.rows() << std::endl;
937 937
                             //std::cout << "kern" <<  KernelManager->GetRAWKernel(ik[5]);
938
+                            //std::cout << "Inputs\t" << TM << "\t" << rho << "\t" << wavef << "\t" << ik[5] << "\t" << KernelManager->GetRAWKernel(ik[5])<< std::endl;
939
+                            //Hankel->Zgauss(5, TM, 0, rho, wavef, nullptr);
938 940
                             f(5) = Hankel->Zgauss(5, TM, 0, rho, wavef, KernelManager->GetRAWKernel(ik[5]));
939 941
                             f(6) = Hankel->Zgauss(6, TM, 1, rho, wavef, KernelManager->GetRAWKernel(ik[6]));
940 942
                             f(7) = Hankel->Zgauss(7, TE, 0, rho, wavef, KernelManager->GetRAWKernel(ik[7]))*KernelManager->GetRAWKernel(ik[7])->GetZs()/KernelManager->GetRAWKernel(ik[7])->GetZm();
941 943
                             f(8) = Hankel->Zgauss(8, TE, 1, rho, wavef, KernelManager->GetRAWKernel(ik[8]))*KernelManager->GetRAWKernel(ik[8])->GetZs()/KernelManager->GetRAWKernel(ik[8])->GetZm();
942 944
                             f(9) = Hankel->Zgauss(9, TE, 1, rho, wavef, KernelManager->GetRAWKernel(ik[9]))*KernelManager->GetRAWKernel(ik[9])->GetZs()/KernelManager->GetRAWKernel(ik[9])->GetZm();
943
-                            //std::cout << "HARDER!!!!" << std::endl;
945
+                            std::cout << "HARDER!!!!" << std::endl;
944 946
                             if (std::abs(Pol[1]) > 0) {
945 947
                                 this->Receivers->AppendHfield(ifreq, irec,
946 948
                                         Pol[1]*QPI*(sps*f(5)+c2p*f(6)/rho-cps*f(7)+c2p*f(8)/rho)*Moment,

+ 7
- 1
Modules/FDEM1D/src/FHT.cpp Переглянути файл

@@ -22,6 +22,12 @@
22 22
 namespace Lemma {
23 23
 
24 24
     template<>
25
+    FHT<FHTKEY201>::FHT( const ctor_key& key ) : HankelTransform(key)
26
+    {
27
+
28
+    }
29
+
30
+    template<>
25 31
     const Eigen::Matrix<Real, Eigen::Dynamic, 3>  FHT<FHTKEY201>::WT =
26 32
         ( Eigen::Matrix<Real, 201, 3>()   <<
27 33
         // Base                   J0                      J1
@@ -331,7 +337,7 @@ namespace Lemma {
331 337
        1.1528587427833875e+03,  -3.1406113278782205e-05,   6.2412989356183992e-06,
332 338
        1.3394307643944169e+03,   9.1385289919391839e-06,  -2.0349222128793154e-06,
333 339
        1.5561965278371533e+03,  -1.8949818224609619e-06,   4.8072849734177625e-07,
334
-       1.8080424144560632e+03,   2.0794387557779629e-07,  -6.0462736574031818e-08).finished();
340
+       1.8080424144560632e+03,   2.0794387557779629e-07,  -6.0462736574031818e-08 ).finished();
335 341
 
336 342
     template<>
337 343
     const Eigen::Matrix<Real, Eigen::Dynamic, 3>  FHT<FHTKEY51>::WT =

Завантаження…
Відмінити
Зберегти