Browse Source

Compiling again with port of FDEM1D Module, but not complete yet.

enhancement_3
Trevor Irons 8 years ago
parent
commit
577e2a9b68

+ 1468
- 0
Modules/FDEM1D/include/KernelEM1DSpec.h
File diff suppressed because it is too large
View File


+ 2
- 2
Modules/FDEM1D/include/kernelem1dreflbase.h View File

14
 #ifndef  KERNELEM1DREFLBASE_INC
14
 #ifndef  KERNELEM1DREFLBASE_INC
15
 #define  KERNELEM1DREFLBASE_INC
15
 #define  KERNELEM1DREFLBASE_INC
16
 
16
 
17
-#include "KernelEM1DSpec.h"
18
-//#include "kernelem1dbase.h"
17
+//#include "KernelEM1DSpec.h"
18
+#include "kernelem1dbase.h"
19
 #include "DipoleSource.h"
19
 #include "DipoleSource.h"
20
 #include "LayeredEarthEM.h"
20
 #include "LayeredEarthEM.h"
21
 
21
 

+ 3
- 1
Modules/FDEM1D/src/CMakeLists.txt View File

7
 	${CMAKE_CURRENT_SOURCE_DIR}/KernelEM1DManager.cpp
7
 	${CMAKE_CURRENT_SOURCE_DIR}/KernelEM1DManager.cpp
8
 	${CMAKE_CURRENT_SOURCE_DIR}/DipoleSource.cpp
8
 	${CMAKE_CURRENT_SOURCE_DIR}/DipoleSource.cpp
9
 	
9
 	
10
-	${CMAKE_CURRENT_SOURCE_DIR}/KernelEM1DReflSpec.cpp
10
+	${CMAKE_CURRENT_SOURCE_DIR}/KernelEM1DManager.cpp
11
 	${CMAKE_CURRENT_SOURCE_DIR}/KernelEM1DSpec.cpp
11
 	${CMAKE_CURRENT_SOURCE_DIR}/KernelEM1DSpec.cpp
12
+	${CMAKE_CURRENT_SOURCE_DIR}/KernelEM1DReflSpec.cpp
13
+
12
 
14
 
13
 	#${CMAKE_CURRENT_SOURCE_DIR}/UngroundedElectricDipole.cpp
15
 	#${CMAKE_CURRENT_SOURCE_DIR}/UngroundedElectricDipole.cpp
14
 	PARENT_SCOPE
16
 	PARENT_SCOPE

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

52
         return std::make_shared<DipoleSource> ( ctor_key() );
52
         return std::make_shared<DipoleSource> ( ctor_key() );
53
     }
53
     }
54
 
54
 
55
+    YAML::Node DipoleSource::Serialize() const {
56
+        YAML::Node node = DipoleSource::Serialize();
57
+        node.SetTag( GetName() );
58
+        /*
59
+        node["LayerConductivity"] = LayerConductivity;
60
+        node["LayerSusceptibility"] = LayerSusceptibility;
61
+        node["LayerLowFreqSusceptibility"] = LayerLowFreqSusceptibility;
62
+        node["LayerHighFreqSusceptibility"] = LayerHighFreqSusceptibility;
63
+        node["LayerTauSusceptibility"] = LayerTauSusceptibility;
64
+        node["LayerBreathSusceptibility"] = LayerBreathSusceptibility;
65
+        node["LayerPermitivity"] = LayerPermitivity;
66
+        node["LayerLowFreqPermitivity"] = LayerLowFreqPermitivity;
67
+        node["LayerHighFreqPermitivity"] = LayerHighFreqPermitivity;
68
+        node["LayerTauPermitivity"] = LayerTauPermitivity;
69
+        node["LayerBreathPermitivity"] = LayerBreathPermitivity;
70
+        */
71
+        return node;
72
+    }
55
 
73
 
56
     std::shared_ptr<DipoleSource> DipoleSource::Clone() {
74
     std::shared_ptr<DipoleSource> DipoleSource::Clone() {
57
 
75
 

Loading…
Cancel
Save