Browse Source

Minor tweaks including VTK version bump

iss7
Trevor Irons 5 years ago
parent
commit
9ffb228649

+ 7
- 4
CMakeLists.txt View File

214
 #endif()
214
 #endif()
215
 
215
 
216
 if ( LEMMA_VTK8_SUPPORT ) 
216
 if ( LEMMA_VTK8_SUPPORT ) 
217
-	find_package(VTK 8.0 COMPONENTS vtkCommonCore vtkRenderingCore vtkFiltersCore vtkFiltersSources 
217
+	find_package(VTK 8.2 COMPONENTS vtkCommonCore vtkRenderingCore vtkFiltersCore vtkFiltersSources 
218
 			vtkCommonDataModel vtkFiltersHyperTree vtkIOXML vtkIOImage vtkIOLegacy vtkIOGeometry vtkInteractionStyle 
218
 			vtkCommonDataModel vtkFiltersHyperTree vtkIOXML vtkIOImage vtkIOLegacy vtkIOGeometry vtkInteractionStyle 
219
 			vtkRenderingAnnotation vtkFiltersHybrid vtkFiltersModeling vtkRenderingVolumeOpenGL2 NO_MODULE)
219
 			vtkRenderingAnnotation vtkFiltersHybrid vtkFiltersModeling vtkRenderingVolumeOpenGL2 NO_MODULE)
220
+	#find_package(VTK 8 NO_MODULE) 
221
+			#vtkCommonDataModel vtkFiltersHyperTree vtkIOXML vtkIOImage vtkIOLegacy vtkIOGeometry vtkInteractionStyle 
222
+			#vtkRenderingAnnotation vtkFiltersHybrid vtkFiltersModeling vtkRenderingVolumeOpenGL2 NO_MODULE)
220
 	if (VTK_FOUND)
223
 	if (VTK_FOUND)
221
-		message(STATUS "VTK 8 was found! ") 
224
+		message(STATUS "VTK 8 was found! " ${VTK_VERSION}, ${VTK_USE_FILE} ) 
222
 		set(volumeRenderer volumerenderer.cxx)
225
 		set(volumeRenderer volumerenderer.cxx)
223
-	    include(${VTK_USE_FILE}) 
226
+	    #include(${VTK_USE_FILE}) 
224
 	else()
227
 	else()
225
 		message( STATUS "External build of VTK 8 has been added, this may take some time to build." )
228
 		message( STATUS "External build of VTK 8 has been added, this may take some time to build." )
226
 		ExternalProject_Add(VTK8
229
 		ExternalProject_Add(VTK8
227
   		GIT_REPOSITORY "https://gitlab.kitware.com/vtk/vtk.git"
230
   		GIT_REPOSITORY "https://gitlab.kitware.com/vtk/vtk.git"
228
-		GIT_TAG  "v8.1.0"
231
+		GIT_TAG  "v8.2.0"
229
     	PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/vtk8
232
     	PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/vtk8
230
   		CMAKE_ARGS 
233
   		CMAKE_ARGS 
231
     	    -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} 
234
     	    -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} 

+ 2
- 0
Modules/FDEM1D/include/KernelEM1DReflSpec.h View File

144
     // Default mode definitions
144
     // Default mode definitions
145
     template<EMMODE Mode, DIPOLE_LOCATION Isource, DIPOLE_LOCATION Irecv>
145
     template<EMMODE Mode, DIPOLE_LOCATION Isource, DIPOLE_LOCATION Irecv>
146
     void KernelEM1DReflSpec<Mode, Isource, Irecv>::ComputeReflectionCoeffs(const Real& lambda) {
146
     void KernelEM1DReflSpec<Mode, Isource, Irecv>::ComputeReflectionCoeffs(const Real& lambda) {
147
+
147
         static bool called = false;
148
         static bool called = false;
148
         if (!called) {
149
         if (!called) {
149
             std::cout << "unspecialised Reflection function KernelEM1DReflSpec<"
150
             std::cout << "unspecialised Reflection function KernelEM1DReflSpec<"
153
         }
154
         }
154
 
155
 
155
         rams = lambda*lambda;
156
         rams = lambda*lambda;
157
+
156
         //////////////////////////////////////////
158
         //////////////////////////////////////////
157
         // Compute TEM stuff
159
         // Compute TEM stuff
158
 
160
 

+ 10
- 6
Modules/FDEM1D/include/KernelEM1DSpec.h View File

1228
         return pot/ReflCalc->uk;
1228
         return pot/ReflCalc->uk;
1229
 
1229
 
1230
     }
1230
     }
1231
+
1231
     template<EMMODE Mode, int Ikernel, DIPOLE_LOCATION Isource, DIPOLE_LOCATION Irecv>
1232
     template<EMMODE Mode, int Ikernel, DIPOLE_LOCATION Isource, DIPOLE_LOCATION Irecv>
1232
     int KernelEM1DSpec<Mode, Ikernel, Isource, Irecv>::GetBesselOrder( ) {
1233
     int KernelEM1DSpec<Mode, Ikernel, Isource, Irecv>::GetBesselOrder( ) {
1233
         std::cerr << "Calling base GetBesselOrder in KernelEM1DSpec < " << Mode
1234
         std::cerr << "Calling base GetBesselOrder in KernelEM1DSpec < " << Mode
1449
                         ((Real)(2.)*ReflCalc->LayerDepth(ReflCalc->nlay-2)-ReflCalc->rx_z-ReflCalc->tx_z));
1450
                         ((Real)(2.)*ReflCalc->LayerDepth(ReflCalc->nlay-2)-ReflCalc->rx_z-ReflCalc->tx_z));
1450
             } else {
1451
             } else {
1451
                 con = ReflCalc->rtu(ReflCalc->lays)*(SS_SN(ReflCalc->id-1,0)*
1452
                 con = ReflCalc->rtu(ReflCalc->lays)*(SS_SN(ReflCalc->id-1,0)*
1452
-                    std::exp(ReflCalc->uk*((Real)(2.)*ReflCalc->LayerDepth(ReflCalc->lays-1) -
1453
-                                    ReflCalc->rx_z-ReflCalc->tx_z)) + SS_SN(ReflCalc->id-1, 1)*ReflCalc->rtd(ReflCalc->lays) *
1454
-                        std::exp(ReflCalc->uk*(ReflCalc->tx_z-ReflCalc->rx_z-(Real)(2.)* ReflCalc->LayerThickness(ReflCalc->lays)))) +
1455
-                    ReflCalc->rtd(ReflCalc->lays)*(SS_SN(ReflCalc->id-1, 2)* std::exp(ReflCalc->uk*(ReflCalc->rx_z+ReflCalc->tx_z-(Real)(2.) *
1456
-                        ReflCalc->LayerDepth(ReflCalc->lays))) + SS_SN(ReflCalc->id-1, 3)*ReflCalc->rtu(ReflCalc->lays) *
1457
-                    std::exp(ReflCalc->uk*(ReflCalc->rx_z-ReflCalc->tx_z-(Real)(2.) * ReflCalc->LayerThickness(ReflCalc->lays)))) ;
1453
+                    std::exp(ReflCalc->uk*((Real)(2.)*ReflCalc->LayerDepth(ReflCalc->lays-1)-ReflCalc->rx_z-ReflCalc->tx_z))
1454
+                    + SS_SN(ReflCalc->id-1, 1)*ReflCalc->rtd(ReflCalc->lays)
1455
+                    * std::exp(ReflCalc->uk*(ReflCalc->tx_z-ReflCalc->rx_z-(Real)(2.)* ReflCalc->LayerThickness(ReflCalc->lays))))
1456
+                    + ReflCalc->rtd(ReflCalc->lays)
1457
+                    * ( SS_SN(ReflCalc->id-1, 2)
1458
+                        * std::exp(ReflCalc->uk*(ReflCalc->rx_z+ReflCalc->tx_z-(Real)(2.) * ReflCalc->LayerDepth(ReflCalc->lays)))
1459
+                        + SS_SN(ReflCalc->id-1, 3)*ReflCalc->rtu(ReflCalc->lays)
1460
+                        * std::exp(ReflCalc->uk*(ReflCalc->rx_z-ReflCalc->tx_z-(Real)(2.) * ReflCalc->LayerThickness(ReflCalc->lays)))
1461
+                      ) ;
1458
                 con /= ((Real)(1.)-ReflCalc->rtu(ReflCalc->lays)*ReflCalc->rtd(ReflCalc->lays)*ReflCalc->cf(ReflCalc->lays)) ;
1462
                 con /= ((Real)(1.)-ReflCalc->rtu(ReflCalc->lays)*ReflCalc->rtd(ReflCalc->lays)*ReflCalc->cf(ReflCalc->lays)) ;
1459
             }
1463
             }
1460
         }
1464
         }

+ 0
- 4
Modules/FDEM1D/src/DipoleSource.cpp View File

223
 
223
 
224
         switch (pol) {
224
         switch (pol) {
225
             case (XPOLARISATION):
225
             case (XPOLARISATION):
226
-                //this->Polarisation = pol;
227
                 this->Phat = (VectorXr(3) << 1, 0, 0).finished();
226
                 this->Phat = (VectorXr(3) << 1, 0, 0).finished();
228
                 break;
227
                 break;
229
             case (YPOLARISATION):
228
             case (YPOLARISATION):
230
-                //this->Polarisation = pol;
231
                 this->Phat = (VectorXr(3) << 0, 1, 0).finished();
229
                 this->Phat = (VectorXr(3) << 0, 1, 0).finished();
232
                 break;
230
                 break;
233
             case (ZPOLARISATION):
231
             case (ZPOLARISATION):
234
-                //this->Polarisation = pol;
235
                 this->Phat = (VectorXr(3) << 0, 0, 1).finished();
232
                 this->Phat = (VectorXr(3) << 0, 0, 1).finished();
236
                 break;
233
                 break;
237
             default:
234
             default:
784
                         case E:
781
                         case E:
785
                             f(10) = Hankel->Zgauss(10, TM, 1, rho, wavef, KernelManager->GetRAWKernel(ik[10])) / KernelManager->GetRAWKernel(ik[10])->GetYm();
782
                             f(10) = Hankel->Zgauss(10, TM, 1, rho, wavef, KernelManager->GetRAWKernel(ik[10])) / KernelManager->GetRAWKernel(ik[10])->GetYm();
786
                             f(11) = Hankel->Zgauss(11, TM, 0, rho, wavef, KernelManager->GetRAWKernel(ik[11])) / KernelManager->GetRAWKernel(ik[11])->GetYm();
783
                             f(11) = Hankel->Zgauss(11, TM, 0, rho, wavef, KernelManager->GetRAWKernel(ik[11])) / KernelManager->GetRAWKernel(ik[11])->GetYm();
787
-                            std::cout.precision(12);
788
                             this->Receivers->AppendEfield(ifreq, irec,
784
                             this->Receivers->AppendEfield(ifreq, irec,
789
                                 -Pol[2]*QPI*cp*f(10)*Moment,
785
                                 -Pol[2]*QPI*cp*f(10)*Moment,
790
                                 -Pol[2]*QPI*sp*f(10)*Moment,
786
                                 -Pol[2]*QPI*sp*f(10)*Moment,

Loading…
Cancel
Save