Minor tweaks including VTK version bump

CMakeLists.txt

@@ -214,18 +214,21 @@ endif()
 #endif()
 
 if ( LEMMA_VTK8_SUPPORT ) 
-	find_package(VTK 8.0 COMPONENTS vtkCommonCore vtkRenderingCore vtkFiltersCore vtkFiltersSources 
+	find_package(VTK 8.2 COMPONENTS vtkCommonCore vtkRenderingCore vtkFiltersCore vtkFiltersSources 
 			vtkCommonDataModel vtkFiltersHyperTree vtkIOXML vtkIOImage vtkIOLegacy vtkIOGeometry vtkInteractionStyle 
 			vtkRenderingAnnotation vtkFiltersHybrid vtkFiltersModeling vtkRenderingVolumeOpenGL2 NO_MODULE)
+	#find_package(VTK 8 NO_MODULE) 
+			#vtkCommonDataModel vtkFiltersHyperTree vtkIOXML vtkIOImage vtkIOLegacy vtkIOGeometry vtkInteractionStyle 
+			#vtkRenderingAnnotation vtkFiltersHybrid vtkFiltersModeling vtkRenderingVolumeOpenGL2 NO_MODULE)
 	if (VTK_FOUND)
-		message(STATUS "VTK 8 was found! ") 
+		message(STATUS "VTK 8 was found! " ${VTK_VERSION}, ${VTK_USE_FILE} ) 
 		set(volumeRenderer volumerenderer.cxx)
-	    include(${VTK_USE_FILE}) 
+	    #include(${VTK_USE_FILE}) 
 	else()
 		message( STATUS "External build of VTK 8 has been added, this may take some time to build." )
 		ExternalProject_Add(VTK8
   		GIT_REPOSITORY "https://gitlab.kitware.com/vtk/vtk.git"
-		GIT_TAG  "v8.1.0"
+		GIT_TAG  "v8.2.0"
     	PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/vtk8
   		CMAKE_ARGS 
     	    -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} 

Modules/FDEM1D/include/KernelEM1DReflSpec.h

@@ -144,6 +144,7 @@ namespace Lemma {
     // Default mode definitions
     template<EMMODE Mode, DIPOLE_LOCATION Isource, DIPOLE_LOCATION Irecv>
     void KernelEM1DReflSpec<Mode, Isource, Irecv>::ComputeReflectionCoeffs(const Real& lambda) {
+
         static bool called = false;
         if (!called) {
             std::cout << "unspecialised Reflection function KernelEM1DReflSpec<"
@@ -153,6 +154,7 @@ namespace Lemma {
         }
 
         rams = lambda*lambda;
+
         //////////////////////////////////////////
         // Compute TEM stuff
 

Modules/FDEM1D/include/KernelEM1DSpec.h

@@ -1228,6 +1228,7 @@ namespace Lemma {
         return pot/ReflCalc->uk;
 
     }
+
     template<EMMODE Mode, int Ikernel, DIPOLE_LOCATION Isource, DIPOLE_LOCATION Irecv>
     int KernelEM1DSpec<Mode, Ikernel, Isource, Irecv>::GetBesselOrder( ) {
         std::cerr << "Calling base GetBesselOrder in KernelEM1DSpec < " << Mode
@@ -1449,12 +1450,15 @@ namespace Lemma {
                         ((Real)(2.)*ReflCalc->LayerDepth(ReflCalc->nlay-2)-ReflCalc->rx_z-ReflCalc->tx_z));
             } else {
                 con = ReflCalc->rtu(ReflCalc->lays)*(SS_SN(ReflCalc->id-1,0)*
-                    std::exp(ReflCalc->uk*((Real)(2.)*ReflCalc->LayerDepth(ReflCalc->lays-1) -
-                                    ReflCalc->rx_z-ReflCalc->tx_z)) + SS_SN(ReflCalc->id-1, 1)*ReflCalc->rtd(ReflCalc->lays) *
-                        std::exp(ReflCalc->uk*(ReflCalc->tx_z-ReflCalc->rx_z-(Real)(2.)* ReflCalc->LayerThickness(ReflCalc->lays)))) +
-                    ReflCalc->rtd(ReflCalc->lays)*(SS_SN(ReflCalc->id-1, 2)* std::exp(ReflCalc->uk*(ReflCalc->rx_z+ReflCalc->tx_z-(Real)(2.) *
-                        ReflCalc->LayerDepth(ReflCalc->lays))) + SS_SN(ReflCalc->id-1, 3)*ReflCalc->rtu(ReflCalc->lays) *
-                    std::exp(ReflCalc->uk*(ReflCalc->rx_z-ReflCalc->tx_z-(Real)(2.) * ReflCalc->LayerThickness(ReflCalc->lays)))) ;
+                    std::exp(ReflCalc->uk*((Real)(2.)*ReflCalc->LayerDepth(ReflCalc->lays-1)-ReflCalc->rx_z-ReflCalc->tx_z))
+                    + SS_SN(ReflCalc->id-1, 1)*ReflCalc->rtd(ReflCalc->lays)
+                    * std::exp(ReflCalc->uk*(ReflCalc->tx_z-ReflCalc->rx_z-(Real)(2.)* ReflCalc->LayerThickness(ReflCalc->lays))))
+                    + ReflCalc->rtd(ReflCalc->lays)
+                    * ( SS_SN(ReflCalc->id-1, 2)
+                        * std::exp(ReflCalc->uk*(ReflCalc->rx_z+ReflCalc->tx_z-(Real)(2.) * ReflCalc->LayerDepth(ReflCalc->lays)))
+                        + SS_SN(ReflCalc->id-1, 3)*ReflCalc->rtu(ReflCalc->lays)
+                        * std::exp(ReflCalc->uk*(ReflCalc->rx_z-ReflCalc->tx_z-(Real)(2.) * ReflCalc->LayerThickness(ReflCalc->lays)))
+                      ) ;
                 con /= ((Real)(1.)-ReflCalc->rtu(ReflCalc->lays)*ReflCalc->rtd(ReflCalc->lays)*ReflCalc->cf(ReflCalc->lays)) ;
             }
         }

Modules/FDEM1D/src/DipoleSource.cpp

@@ -223,15 +223,12 @@ namespace Lemma {
 
         switch (pol) {
             case (XPOLARISATION):
-                //this->Polarisation = pol;
                 this->Phat = (VectorXr(3) << 1, 0, 0).finished();
                 break;
             case (YPOLARISATION):
-                //this->Polarisation = pol;
                 this->Phat = (VectorXr(3) << 0, 1, 0).finished();
                 break;
             case (ZPOLARISATION):
-                //this->Polarisation = pol;
                 this->Phat = (VectorXr(3) << 0, 0, 1).finished();
                 break;
             default:
@@ -784,7 +781,6 @@ namespace Lemma {
                         case E:
                             f(10) = Hankel->Zgauss(10, TM, 1, rho, wavef, KernelManager->GetRAWKernel(ik[10])) / KernelManager->GetRAWKernel(ik[10])->GetYm();
                             f(11) = Hankel->Zgauss(11, TM, 0, rho, wavef, KernelManager->GetRAWKernel(ik[11])) / KernelManager->GetRAWKernel(ik[11])->GetYm();
-                            std::cout.precision(12);
                             this->Receivers->AppendEfield(ifreq, irec,
                                 -Pol[2]*QPI*cp*f(10)*Moment,
                                 -Pol[2]*QPI*sp*f(10)*Moment,