소스 검색

Additional fixes for Kong61 to be utilized.

add-code-of-conduct-1
Trevor Irons 6 년 전
부모
커밋
b69210efd7
3개의 변경된 파일13개의 추가작업 그리고 2개의 파일을 삭제
  1. 6
    1
      Modules/FDEM1D/include/HankelTransformFactory.h
  2. 4
    1
      Modules/FDEM1D/src/EMEarth1D.cpp
  3. 3
    0
      Modules/LemmaCore/src/helper.cpp

+ 6
- 1
Modules/FDEM1D/include/HankelTransformFactory.h 파일 보기

@@ -105,7 +105,12 @@ namespace Lemma {
105 105
                     //return FHTKey101::NewSP();
106 106
                 case FHTKEY51:
107 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 114
                 case CHAVE:
110 115
                     return GQChave::NewSP();
111 116
                 case QWEKEY:

+ 4
- 1
Modules/FDEM1D/src/EMEarth1D.cpp 파일 보기

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

+ 3
- 0
Modules/LemmaCore/src/helper.cpp 파일 보기

@@ -193,6 +193,9 @@ HANKELTRANSFORMTYPE string2Enum<HANKELTRANSFORMTYPE>( const std::string& str ) {
193 193
     else if  (str == "FHTKEY201") return  FHTKEY201;
194 194
     else if  (str == "FHTKEY51") return  FHTKEY51;
195 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 199
     else {
197 200
         throw std::runtime_error("string not recognized as HANKELTRANSFORMTYPE");
198 201
     }

Loading…
취소
저장