Timing and comparison work.

Modules/FDEM1D/examples/CMakeLists.txt

@@ -26,6 +26,10 @@ add_executable( Hantenna Hantenna.cpp  )
 target_link_libraries(  Hantenna  "lemmacore" "fdem1d")
 set_property(TARGET Hantenna PROPERTY CXX_STANDARD 14)
 
+add_executable( Eantenna Eantenna.cpp  )
+target_link_libraries(  Eantenna  "lemmacore" "fdem1d")
+set_property(TARGET Eantenna PROPERTY CXX_STANDARD 14)
+
 add_executable( DipoleSource DipoleSource.cpp  )
 target_link_libraries(  DipoleSource  "lemmacore" "fdem1d")
 set_property(TARGET DipoleSource PROPERTY CXX_STANDARD 14)
@@ -37,6 +41,7 @@ INSTALL_TARGETS( "/share/FDEM1D/"
 	EMDipEarth1D
     CircularLoop
 	Hantenna
+	Eantenna
 	DipoleSource
 )
 

Modules/FDEM1D/examples/EMDipEarth1D.cpp

@@ -45,7 +45,7 @@ int main() {
 		dipole->SetFrequency(0, 4400.1000);
 		//dipole->SetPhase(0);
 		//dipole->SetLocation( (VectorXr(3) << 49, 49, -1e-4).finished() );
-		dipole->SetLocation( 0, 0, -1e-4  );
+		dipole->SetLocation( 49, 49, -1e-4  );
 
 
 	// Define model
@@ -74,7 +74,7 @@ int main() {
 		int ir = 0;
 		for (int iz=0; iz<nz; ++iz) {
 			loc << ox, oy, depth;
-            std::cout << "Receiver location " << loc.transpose() << std::endl;
+            //std::cout << "Receiver location " << loc.transpose() << std::endl;
 			receivers->SetLocation(ir, loc);
 			depth += dz;
 			++ ir;
@@ -93,6 +93,8 @@ int main() {
 //         //for
 // 	    receivers->SetLocation(0, ox, oy, depth);
 
+    std::cout << "Dipole location " << dipole->GetLocation( ).transpose() << "\n";
+    std::cout << "Receiver location " << receivers->GetLocation(0).transpose() << "\n";
 
 	std::cout << "C++\n";
 	EmEarth->MakeCalc3();

Modules/FDEM1D/examples/Hantenna.cpp

@@ -197,14 +197,14 @@ const char *buildString = __DATE__ ", " __TIME__;
     //hreal << *earth << std::endl;
 
     hreal << "// Right hand coordinate system, z is positive down\n";
-    hreal << "// x[m]\ty[m]\tz[m]\tHx[A/m]\tHy[A/m]\tHz[A/m]\n";
+    hreal << "// x[m]\ty[m]\tz[m]\tRe(Hx[A/m])\tRe(Hy[A/m])\tRe(Hz[A/m])\tIm(Hx)\tIm(Hy)\tIm(Hz)\n";
     hreal.precision(8);
     int i=0;
 	for (int iz=0; iz<nz; ++iz) {
 	for (int iy=0; iy<ny; ++iy) {
 	for (int ix=0; ix<nx; ++ix) {
         hreal << receivers->GetLocation(i).transpose() << "\t";
- 		//hreal << receivers->GetHfield(0, i).transpose() << "\n"; ( complex, notation )
+ 		//hreal << receivers->GetHfield(0, i).transpose() << "\n"; // ( complex, notation )
  		hreal << receivers->GetHfield(0, i).transpose().real() << "\t";
  		hreal << receivers->GetHfield(0, i).transpose().imag() << "\n";
         ++i;

Modules/FDEM1D/examples/plottimings.py

@@ -65,5 +65,8 @@ leg = plt.legend()
 deSpine(plt.gca())
 fixLeg(leg)
 
+plt.gca().set_xlabel("OMP_NUM_THREADS")
+plt.gca().set_ylabel("execution time (s)")
+
 plt.savefig("timings.png")
 plt.show()

Modules/FDEM1D/testing/BenchKiHa.h

@@ -59,15 +59,15 @@ public:
 		dipole->SetLocation( 0, 0, -1e-4  );
 
 	    // Define model
-	    VectorXcr sigma(2);
-		sigma << 0., 1e-3;//, .1;//, .01, .001;
-	    VectorXr  thick(1);
-		thick << 10;//, 10, 10;
+	    VectorXcr sigma(8);
+		sigma << 0., 1e-2, .1, .01, .001, .1, .05, .2;
+	    VectorXr  thick(6);
+		thick << 10, 10, 10, 10, 10;
 
 	    earth = LayeredEarthEM::NewSP();
-        earth->SetNumberOfLayers(2);
+        earth->SetNumberOfLayers(8);
 		earth->SetLayerConductivity(sigma);
-		//earth->SetLayerThickness(thick);
+		earth->SetLayerThickness(thick);
 
 	    receivers = FieldPoints::NewSP();
 		Vector3r loc;