Parcourir la source

Kong121 added, but not verified yet

add-code-of-conduct-1
Trevor Irons il y a 6 ans
Parent
révision
240ac61982

+ 2
- 2
Modules/FDEM1D/include/HankelTransformFactory.h Voir le fichier

@@ -107,8 +107,8 @@ namespace Lemma {
107 107
                     return FHT<FHTKEY51>::NewSP();
108 108
                 case FHTKONG61:
109 109
                     return FHT<FHTKONG61>::NewSP();
110
-//                 case FHTKONG121:
111
-//                     return FHT<FHTKONG121>::NewSP();
110
+                case FHTKONG121:
111
+                    return FHT<FHTKONG121>::NewSP();
112 112
 //                 case FHTKONG241:
113 113
 //                     return FHT<FHTKONG241>::NewSP();
114 114
                 case CHAVE:

+ 4
- 1
Modules/FDEM1D/src/EMEarth1D.cpp Voir le fichier

@@ -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 || HankelType == FHTKONG61 )) {
235
+                                                     HankelType == FHTKEY51 || HankelType == FHTKONG61 || FHTKONG121 )) {
236 236
                 #ifdef HAVE_BOOST_PROGRESS
237 237
                 if (progressbar) {
238 238
                     disp = new boost::progress_display( Receivers->GetNumberOfPoints()*Antenna->GetNumberOfFrequencies() );
@@ -300,6 +300,9 @@ namespace Lemma {
300 300
                         case FHTKONG61:
301 301
                             Hankel = FHT<FHTKONG61>::NewSP();
302 302
                             break;
303
+                        case FHTKONG121:
304
+                            Hankel = FHT<FHTKONG121>::NewSP();
305
+                            break;
303 306
                         case QWEKEY:
304 307
                             Hankel = QWEKey::NewSP();
305 308
                             break;

+ 126
- 0
Modules/FDEM1D/src/FHT.cpp Voir le fichier

@@ -455,4 +455,130 @@ namespace Lemma {
455 455
         0.37524723159601002e+02,   -.69102205995825531e-04,   -.28146036357227600e-03,
456 456
         0.42521082000062783e+02,   0.67792635718095777e-05,   0.18788896009128770e-04 ).finished();
457 457
 
458
+    template<>
459
+    const Eigen::Matrix<Real, Eigen::Dynamic, 3>  FHT<FHTKONG121>::WT =
460
+        ( Eigen::Matrix<Real, 61, 3>()   <<
461
+       // Base                   J0                        J1
462
+        0.10077854290485105e-02,  0.30018305463183890e+03,  0.14159106906236584e+05,
463
+        0.11306077036215634e-02,  -.14997153161927693e+04,  -.63894162353990403e+05,
464
+        0.12683987510072388e-02,  0.32362173919097522e+04,  0.12310811383612661e+06,
465
+        0.14229828670044432e-02,  -.35889806191080561e+04,  -.11486817725824723e+06,
466
+        0.15964066806122474e-02,  0.99319938998747637e+03,  -.14753412401589708e+04,
467
+        0.17909662505412698e-02,  0.38179279963153253e+04,  0.17820074382693824e+06,
468
+        0.20092374640700602e-02,  -.85085234766944122e+04,  -.32884341392696078e+06,
469
+        0.22541101407146007e-02,  0.11207327477259456e+05,  0.40034208858031681e+06,
470
+        0.25288262922292556e-02,  -.11531776512925609e+05,  -.39292610305676475e+06,
471
+        0.28370230454855348e-02,  0.10180936873156406e+05,  0.33649847192558867e+06,
472
+        0.31827807965096669e-02,  -.81063361758784658e+04,  -.26286375592255167e+06,
473
+        0.35706772332182498e-02,  0.60085437844429871e+04,  0.19276161687520225e+06,
474
+        0.40058479420904168e-02,  -.42367917320848228e+04,  -.13532470402888930e+06,
475
+        0.44940544011834518e-02,  0.28856159727039544e+04,  0.92200446462483131e+05,
476
+        0.50417602596909790e-02,  -.19188095349896853e+04,  -.61548829780693632e+05,
477
+        0.56562169139531080e-02,  0.12551171902691910e+04,  0.40522494324288629e+05,
478
+        0.63455595129091099e-02,  -.81182810371631717e+03,  -.26431609499963735e+05,
479
+        0.71189146640646597e-02,  0.52111815723616189e+03,  0.17133134814156092e+05,
480
+        0.79865212659555023e-02,  -.33278260848862072e+03,  -.11059551444776085e+05,
481
+        0.89598660668788899e-02,  0.21176915752357209e+03,  0.71191992278972921e+04,
482
+        0.10051835744633576e-01,  -.13443218355814457e+03,  -.45742755998737493e+04,
483
+        0.11276887520740558e-01,  0.85194650584339684e+02,  0.29354874569128351e+04,
484
+        0.12651240568005305e-01,  -.53917022467612526e+02,  -.18822749389993348e+04,
485
+        0.14193090745577676e-01,  0.34088478048287179e+02,  0.12062795877473545e+04,
486
+        0.15922851504511684e-01,  -.21523595959544657e+02,  -.77277108232453850e+03,
487
+        0.17863424153314034e-01,  0.13577090924007551e+02,  0.49492492631541484e+03,
488
+        0.20040501061684014e-01,  -.85434684440849118e+01,  -.31691334079981812e+03,
489
+        0.22482905816735520e-01,  0.53682354535020123e+01,  0.20289254048774126e+03,
490
+        0.25222974835227209e-01,  -.33525766356269853e+01,  -.12987117322606318e+03,
491
+        0.28296985484186854e-01,  0.20885260837282376e+01,  0.83111905719290576e+02,
492
+        0.31745636378067939e-01,  -.12793232916734436e+01,  -.53171419417674883e+02,
493
+        0.35614586211371861e-01,  0.78058884271469897e+00,  0.34001318850873965e+02,
494
+        0.39955058260653903e-01,  -.45242438742651114e+00,  -.21727145676811332e+02,
495
+        0.44824518559266870e-01,  0.26089203241610426e+00,  0.13868836029693362e+02,
496
+        0.50287436723591865e-01,  -.12338615646032285e+00,  -.88371017147469129e+01,
497
+        0.56416139503777350e-01,  0.56281416318118380e-01,  0.56159478530342604e+01,
498
+        0.63291768359640704e-01,  0.70125081568702717e-02,  -.35528681405641978e+01,
499
+        0.71005353739636984e-01,  -.22285034855420188e-01,  0.22326264948682826e+01,
500
+        0.79659020285898011e-01,  0.58388786672113245e-01,  -.13861956199997831e+01,
501
+        0.89367338921753192e-01,  -.50279850215481377e-01,  0.84533815622227582e+00,
502
+        0.10025884372280371e+00,  0.78597196793220414e-01,  -.49730994319610561e+00,
503
+        0.11247773365428958e+00,  -.57780915798218570e-01,  0.27626521874054144e+00,
504
+        0.12618578170503872e+00,  0.86833839108689789e-01,  -.13207677866949757e+00,
505
+        0.14156447669413402e+00,  -.56713538106749770e-01,  0.42681318795235568e-01,
506
+        0.15881742610692068e+00,  0.90861627775228854e-01,  0.18663686575331840e-01,
507
+        0.17817305177289841e+00,  -.51733726817583675e-01,  -.53208742589031535e-01,
508
+        0.19988761407514449e+00,  0.93892545736654870e-01,  0.81715199974391917e-01,
509
+        0.22424860473053532e+00,  -.44578054953703386e-01,  -.92375366349240665e-01,
510
+        0.25157855305975646e+00,  0.97333941326658679e-01,  0.10918440876205196e+00,
511
+        0.28223929614052329e+00,  -.35809206216951828e-01,  -.10784697385032857e+00,
512
+        0.31663676937905316e+00,  0.10187303599617950e+00,  0.12263194639047151e+00,
513
+        0.35522638092495146e+00,  -.25533080595253506e-01,  -.11291394172961393e+00,
514
+        0.39851904108451419e+00,  0.10787869351568864e+00,  0.13120315240462399e+00,
515
+        0.44708792655935642e+00,  -.13731146379316628e-01,  -.11264897932654486e+00,
516
+        0.50157606906605545e+00,  0.11549428371538972e+00,  0.13910357869782769e+00,
517
+        0.56270486880695569e+00,  -.49007131028919334e-03,  -.10858278920034534e+00,
518
+        0.63128364550692595e+00,  0.12453783048394922e+00,  0.14870786320325752e+00,
519
+        0.70822035346779999e+00,  0.13716079779752552e-01,  -.10058646924687212e+00,
520
+        0.79453360250333405e+00,  0.13420142569679816e+00,  0.16184445590085567e+00,
521
+        0.89136614390683133e+00,  0.27562751092388021e-01,  -.87680656207090757e-01,
522
+        0.10000000000000000e+01,  0.14247216088490525e+00,  0.18020003971865040e+00,
523
+        0.11218734375719384e+01,  0.38106514837307398e-01,  -.68631869765463246e-01,
524
+        0.12586000099294778e+01,  0.14519350403349998e+00,  0.20499322719217808e+00,
525
+        0.14119899196676591e+01,  0.39680378340821582e-01,  -.43037250192290703e-01,
526
+        0.15840739849944818e+01,  0.13490403422658193e+00,  0.23549230905732943e+00,
527
+        0.17771305269140385e+01,  0.22901601418290750e-01,  -.13817950392389918e-01,
528
+        0.19937155332430825e+01,  0.10048732915054742e+00,  0.26547248491456293e+00,
529
+        0.22366964988199869e+01,  -.24201736611187494e-01,  0.78529706964075002e-02,
530
+        0.25092903899362975e+01,  0.31137736528372380e-01,  0.27711681990519133e+00,
531
+        0.28151062356240644e+01,  -.10740460659967459e+00,  -.39269616914972142e-02,
532
+        0.31581929096897681e+01,  -.67585707297970046e-01,  0.23652124461108126e+00,
533
+        0.35430927361089823e+01,  -.20086348522717648e+00,  -.87535132259551965e-01,
534
+        0.39749016274947486e+01,  -.13938783391528009e+00,  0.11096253210869840e+00,
535
+        0.44593365528478257e+01,  -.21109045469819143e+00,  -.25015308781917761e+00,
536
+        0.50028112278335879e+01,  -.60476076401026799e-01,  -.50607353375473493e-01,
537
+        0.56125210296931574e+01,  -.20240530933718630e-01,  -.35378711425963411e+00,
538
+        0.62965382610266571e+01,  0.20107385437033698e+00,  -.11888933264390817e-01,
539
+        0.70639190237012111e+01,  0.20478593615229865e+00,  -.12848274860566231e+00,
540
+        0.79248231178494901e+01,  0.21005450988434599e+00,  0.34458207638195643e+00,
541
+        0.88906485533713706e+01,  -.10138188698229451e+00,  0.12029950796999150e+00,
542
+        0.99741824548147235e+01,  -.24443221085371702e+00,  0.20091357644979224e+00,
543
+        0.11189770357552707e+02,  -.20919885878257014e+00,  -.40637916861032514e+00,
544
+        0.12553506136668235e+02,  0.25885662664839104e+00,  -.77844503202361123e-01,
545
+        0.14083445083124413e+02,  0.22511239447558806e+00,  0.84393485976334601e-01,
546
+        0.15799842948260402e+02,  -.24749979171782066e+00,  0.38585911280828078e+00,
547
+        0.17725424121461643e+02,  -.15834221813675839e+00,  -.53710156851306179e+00,
548
+        0.19885682491564729e+02,  0.41669469785897478e+00,  0.29613984212416533e+00,
549
+        0.22309218975275826e+02,  -.38746305352335819e+00,  -.25577176944819074e-01,
550
+        0.25028120181337815e+02,  0.24494648145680814e+00,  -.99525029843826690e-01,
551
+        0.28078383223801051e+02,  -.12494432093301468e+00,  0.11347854243597852e+00,
552
+        0.31500392308747937e+02,  0.56623704291934376e-01,  -.87204036114652397e-01,
553
+        0.35339453404279688e+02,  -.24422912005250250e-01,  0.58226255619279292e-01,
554
+        0.39646394072572605e+02,  0.10546622665155797e-01,  -.36883375167178621e-01,
555
+        0.44478236405528754e+02,  -.47164930460653993e-02,  0.23021285157529506e-01,
556
+        0.49898951973407868e+02,  0.22239210348696040e-02,  -.14375628722401815e-01,
557
+        0.55980308781644155e+02,  -.11112568714436552e-02,  0.90237392744176772e-02,
558
+        0.62802821449201709e+02,  0.58623849306147836e-03,  -.56969386329969772e-02,
559
+        0.70456817188432538e+02,  -.32371481890903825e-03,  0.36146490050027961e-02,
560
+        0.79043631699564457e+02,  0.18516534379096563e-03,  -.23030074382742690e-02,
561
+        0.88676950812960627e+02,  -.10858319212643027e-03,  0.14726883339263065e-02,
562
+        0.99484315641933861e+02,  0.64653084189876281e-04,  -.94515928495026650e-03,
563
+        0.11160881117370802e+03,  -.38733129356665885e-04,  0.60913472182886252e-03,
564
+        0.12521096065476522e+03,  0.23124613983496482e-04,  -.39467913721300099e-03,
565
+        0.14047085085144619e+03,  -.13593265028285278e-04,  0.25756984272807789e-03,
566
+        0.15759051632336701e+03,  0.77226585608530268e-05,  -.16970914383967808e-03,
567
+        0.17679661427643231e+03,  -.40941184416352728e-05,  0.11317330787388945e-03,
568
+        0.19834342540938118e+03,  0.18578931549417668e-05,  -.76493433852811981e-04,
569
+        0.22251622048381586e+03,  -.49885201653307130e-06,  0.52337311186417404e-04,
570
+        0.24963503718969392e+03,  -.29669295903973297e-06,  -.36072348136781267e-04,
571
+        0.28005891731040066e+03,  0.72005338190127765e-06,  0.24847205794977743e-04,
572
+        0.31419066028569421e+03,  -.89038493548159272e-06,  -.16954676816358357e-04,
573
+        0.35248215610770893e+03,  0.88868839302693829e-06,  0.11370634951567925e-04,
574
+        0.39544036815532411e+03,  -.77878715022764851e-06,  -.74452601658677115e-05,
575
+        0.44363404517712638e+03,  0.61518900846996585e-06,  0.47280436641109142e-05,
576
+        0.49770125128680706e+03,  -.44159321883066467e-06,  -.28859162979423948e-05,
577
+        0.55835781366498543e+03,  0.28741104780859982e-06,  0.16691593098206021e-05,
578
+        0.62640679981148924e+03,  -.16745354865744502e-06,  -.89400895772153075e-06,
579
+        0.70274914982295252e+03,  0.84959064735970960e-07,  0.42755247064623627e-06,
580
+        0.78839560446263238e+03,  -.35626208459379747e-07,  -.17204733141025195e-06,
581
+        0.88448008694509986e+03,  0.11120656477437054e-07,  0.52194089326250459e-07,
582
+        0.99227471560502624e+03,  -.19689609552964338e-08,  -.90671074377795857e-08 ).finished();
583
+
458 584
 }		// -----  end of Lemma  name  -----

Chargement…
Annuler
Enregistrer