Browse Source

bump of pyLemma

master
Trevor Irons 5 years ago
parent
commit
d88f0c6891
2 changed files with 5 additions and 5 deletions
  1. 4
    4
      Modules/FDEM1D/src/EMEarth1D.cpp
  2. 1
    1
      python/setup.py

+ 4
- 4
Modules/FDEM1D/src/EMEarth1D.cpp View File

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
             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 ||
235
-                                                     HankelType == FHTKEY51 || HankelType == FHTKONG61 || HankelType == FHTKONG121 ||
236
-                                                     HankelType == FHTKONG241 || HankelType == IRONS )) {
234
+            if ( Antenna->IsHorizontallyPlanar() && ( HankelType == ANDERSON801 || HankelType == FHTKEY201  || HankelType==FHTKEY101 ||
235
+                                                      HankelType == FHTKEY51    || HankelType == FHTKONG61  || HankelType == FHTKONG121 ||
236
+                                                      HankelType == FHTKONG241  || HankelType == IRONS )) {
237
                 #ifdef HAVE_BOOST_PROGRESS
237
                 #ifdef HAVE_BOOST_PROGRESS
238
                 if (progressbar) {
238
                 if (progressbar) {
239
                     disp = new boost::progress_display( Receivers->GetNumberOfPoints()*Antenna->GetNumberOfFrequencies() );
239
                     disp = new boost::progress_display( Receivers->GetNumberOfPoints()*Antenna->GetNumberOfFrequencies() );
263
                 }
263
                 }
264
             } else if (Receivers->GetNumberOfPoints() > Antenna->GetNumberOfFrequencies()) {
264
             } else if (Receivers->GetNumberOfPoints() > Antenna->GetNumberOfFrequencies()) {
265
 
265
 
266
-                std::cout << "freq parallel #1" << std::endl;
266
+                //std::cout << "freq parallel #1" << std::endl;
267
                 //** Progress display bar for long calculations */
267
                 //** Progress display bar for long calculations */
268
                 #ifdef HAVE_BOOST_PROGRESS
268
                 #ifdef HAVE_BOOST_PROGRESS
269
                 if (progressbar) {
269
                 if (progressbar) {

+ 1
- 1
python/setup.py View File

21
 
21
 
22
 setup(
22
 setup(
23
   name             = 'pyLemma',
23
   name             = 'pyLemma',
24
-  version          = '0.0.8', 
24
+  version          = '0.0.9', 
25
   author           = 'Trevor Irons and others',
25
   author           = 'Trevor Irons and others',
26
   author_email     = 'Trevor.Irons@lemmasoftware.org',
26
   author_email     = 'Trevor.Irons@lemmasoftware.org',
27
   description      = 'A short description of the app/lib',
27
   description      = 'A short description of the app/lib',

Loading…
Cancel
Save