浏览代码

Additional fixes for Kong61 to be utilized.

add-code-of-conduct-1
Trevor Irons 6 年前
父节点
当前提交
b69210efd7

+ 6
- 1
Modules/FDEM1D/include/HankelTransformFactory.h 查看文件

105
                     //return FHTKey101::NewSP();
105
                     //return FHTKey101::NewSP();
106
                 case FHTKEY51:
106
                 case FHTKEY51:
107
                     return FHT<FHTKEY51>::NewSP();
107
                     return FHT<FHTKEY51>::NewSP();
108
-                    //return FHTKey51::NewSP();
108
+                case FHTKONG61:
109
+                    return FHT<FHTKONG61>::NewSP();
110
+//                 case FHTKONG121:
111
+//                     return FHT<FHTKONG121>::NewSP();
112
+//                 case FHTKONG241:
113
+//                     return FHT<FHTKONG241>::NewSP();
109
                 case CHAVE:
114
                 case CHAVE:
110
                     return GQChave::NewSP();
115
                     return GQChave::NewSP();
111
                 case QWEKEY:
116
                 case QWEKEY:

+ 4
- 1
Modules/FDEM1D/src/EMEarth1D.cpp 查看文件

232
             icalc += 1;
232
             icalc += 1;
233
             // Check to see if they are all on a plane? If so we can do this fast
233
             // Check to see if they are all on a plane? If so we can do this fast
234
             if (Antenna->IsHorizontallyPlanar() && ( HankelType == ANDERSON801 || HankelType== FHTKEY201 || HankelType==FHTKEY101 ||
234
             if (Antenna->IsHorizontallyPlanar() && ( HankelType == ANDERSON801 || HankelType== FHTKEY201 || HankelType==FHTKEY101 ||
235
-                                                     HankelType == FHTKEY51 )) {
235
+                                                     HankelType == FHTKEY51 || HankelType == FHTKONG61 )) {
236
                 #ifdef HAVE_BOOST_PROGRESS
236
                 #ifdef HAVE_BOOST_PROGRESS
237
                 if (progressbar) {
237
                 if (progressbar) {
238
                     disp = new boost::progress_display( Receivers->GetNumberOfPoints()*Antenna->GetNumberOfFrequencies() );
238
                     disp = new boost::progress_display( Receivers->GetNumberOfPoints()*Antenna->GetNumberOfFrequencies() );
297
                         case FHTKEY51:
297
                         case FHTKEY51:
298
                             Hankel = FHTKey51::NewSP();
298
                             Hankel = FHTKey51::NewSP();
299
                             break;
299
                             break;
300
+                        case FHTKONG61:
301
+                            Hankel = FHT<FHTKONG61>::NewSP();
302
+                            break;
300
                         case QWEKEY:
303
                         case QWEKEY:
301
                             Hankel = QWEKey::NewSP();
304
                             Hankel = QWEKey::NewSP();
302
                             break;
305
                             break;

+ 3
- 0
Modules/LemmaCore/src/helper.cpp 查看文件

193
     else if  (str == "FHTKEY201") return  FHTKEY201;
193
     else if  (str == "FHTKEY201") return  FHTKEY201;
194
     else if  (str == "FHTKEY51") return  FHTKEY51;
194
     else if  (str == "FHTKEY51") return  FHTKEY51;
195
     else if  (str == "FHTKEY101") return  FHTKEY101;
195
     else if  (str == "FHTKEY101") return  FHTKEY101;
196
+    else if  (str == "FHTKONG61") return  FHTKONG61;
197
+    else if  (str == "FHTKONG121") return  FHTKONG121;
198
+    else if  (str == "FHTKONG241") return  FHTKONG241;
196
     else {
199
     else {
197
         throw std::runtime_error("string not recognized as HANKELTRANSFORMTYPE");
200
         throw std::runtime_error("string not recognized as HANKELTRANSFORMTYPE");
198
     }
201
     }

正在加载...
取消
保存