Browse Source

Fix default to Key201

lagkey
Trevor Irons 6 years ago
parent
commit
ee8ede0688
2 changed files with 1 additions and 9 deletions
  1. 0
    1
      Modules/FDEM1D/examples/Hantenna.cpp
  2. 1
    8
      Modules/FDEM1D/src/EMEarth1D.cpp

+ 0
- 1
Modules/FDEM1D/examples/Hantenna.cpp View File

153
 		EmEarth->AttachFieldPoints(receivers);
153
 		EmEarth->AttachFieldPoints(receivers);
154
 		EmEarth->SetFieldsToCalculate(H);
154
 		EmEarth->SetFieldsToCalculate(H);
155
         EmEarth->SetHankelTransformMethod(string2Enum<HANKELTRANSFORMTYPE>(config[0]));
155
         EmEarth->SetHankelTransformMethod(string2Enum<HANKELTRANSFORMTYPE>(config[0]));
156
-        EmEarth->SetHankelTransformMethod(FHTKEY201);
157
 
156
 
158
     ///////////////////////////////////////////////
157
     ///////////////////////////////////////////////
159
 	// Keep track of time
158
 	// Keep track of time

+ 1
- 8
Modules/FDEM1D/src/EMEarth1D.cpp View File

229
         }
229
         }
230
 
230
 
231
         if (Antenna->GetName() == std::string("PolygonalWireAntenna") || Antenna->GetName() == std::string("TEMTransmitter") ) {
231
         if (Antenna->GetName() == std::string("PolygonalWireAntenna") || Antenna->GetName() == std::string("TEMTransmitter") ) {
232
-
233
             icalc += 1;
232
             icalc += 1;
234
-
235
             // 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
236
-            /* TODO FIX THIS ISSUES */
237
             if (Antenna->IsHorizontallyPlanar() && HankelType == ANDERSON801) {
234
             if (Antenna->IsHorizontallyPlanar() && HankelType == ANDERSON801) {
238
-                //std::cout << "Lag baby lag" << std::endl;
239
                 for (int ifreq=0; ifreq<Antenna->GetNumberOfFrequencies();++ifreq) {
235
                 for (int ifreq=0; ifreq<Antenna->GetNumberOfFrequencies();++ifreq) {
240
-                    //std::cout << "Num Recs" <<  Receivers->GetNumberOfPoints() << std::endl;
241
                     Real wavef = 2.*PI* Antenna->GetFrequency(ifreq);
236
                     Real wavef = 2.*PI* Antenna->GetFrequency(ifreq);
242
                     #ifdef LEMMAUSEOMP
237
                     #ifdef LEMMAUSEOMP
243
                     #pragma omp parallel
238
                     #pragma omp parallel
248
                     #pragma omp for schedule(static, 1)
243
                     #pragma omp for schedule(static, 1)
249
                     #endif
244
                     #endif
250
                     for (int irec=0; irec<Receivers->GetNumberOfPoints(); ++irec) {
245
                     for (int irec=0; irec<Receivers->GetNumberOfPoints(); ++irec) {
251
-                    //for (int irec=0; irec<2; ++irec) { // TODO FIXME BELO
252
                         auto AntCopy = static_cast<PolygonalWireAntenna*>(Antenna.get())->ClonePA();
246
                         auto AntCopy = static_cast<PolygonalWireAntenna*>(Antenna.get())->ClonePA();
253
                         SolveLaggedTxRxPair(irec, Hankel.get(), wavef, ifreq, AntCopy.get());
247
                         SolveLaggedTxRxPair(irec, Hankel.get(), wavef, ifreq, AntCopy.get());
254
-                        //exit(0);
255
                     }
248
                     }
256
-                    //Receivers->ClearFields(); // FIXME DEBUG TODO
249
+                    //Receivers->ClearFields();
257
                     #ifdef LEMMAUSEOMP
250
                     #ifdef LEMMAUSEOMP
258
                     }
251
                     }
259
                     #endif
252
                     #endif

Loading…
Cancel
Save