Compiles with Lemma 0.2, not tested yet

examples/EMSchur3D.cpp

@@ -18,7 +18,7 @@
  */
 
 #include <LemmaCore>
-#include "RectilinearGridReader.h"
+//#include "RectilinearGridReader.h"
 //#include "AEMSurveyReader.h"
 #include "EMSchur3D.h"
 //#include "LayeredEarthEMReader.h"
@@ -84,19 +84,15 @@ int main( int argc, char** argv ) {
             else exit(EXIT_FAILURE);
 	    }
 
-
-    /*
     //////////////////////////////////////////////////
     // And solve
-    EM3D->SetRectilinearGrid(GridRead->GetGrid());
+    EM3D->SetRectilinearGrid( std::static_pointer_cast<RectilinearGrid>( GridRead->GetGrid() ) ); // UGLY!
     EM3D->SetLayeredEarthEM( LayEarthRead->GetLayeredEarth() );
     EM3D->SetAEMSurvey( AEMRead->GetSurvey() );
     EM3D->LoadMeshToolsConductivityModel( argv[3] );
     EM3D->SetResFileName(argv[5]);
     //EM3D->SetCSolver( Lemma::SPARSELU ); // Lemma::BiCGSTAB );
     EM3D->Solve();
-    */
-    std::cout << *EM3D;
 
     exit(EXIT_SUCCESS);
 }

include/EMSchur3DBase.h

@@ -206,7 +206,7 @@ class EMSchur3DBase : public LemmaObject {
     /** Sets the RectilinearGrid to use
      *  @param[in] Grid is a pointer to the Grid to be used.
      */
-    //void SetAEMSurvey(AEMSurvey* Survey);
+    void SetAEMSurvey( std::shared_ptr<AEMSurvey> Survey);
 
     /** Sets the prefix for results files (.log and .vtr) the source fiducial is added as well
      */
@@ -351,7 +351,7 @@ class EMSchur3DBase : public LemmaObject {
     //std::shared_ptr<RectilinearGridVTKExporter>         VTKGridExporter;
 
     /** Class containing information about the AEM survey */
-    //AEMSurvey*                      Survey;
+    std::shared_ptr<AEMSurvey>                          Survey;
 
     std::shared_ptr<LayeredEarthEM>                     LayModel;
 

src/EMSchur3DBase.cpp

@@ -1463,45 +1463,41 @@ namespace Lemma {
         return ;
     }
 
-//     //--------------------------------------------------------------------------------------
-//     //       Class:  EMSchur3DBase
-//     //      Method:  SetAEMSurvey
-//     //--------------------------------------------------------------------------------------
-//     void EMSchur3DBase::SetAEMSurvey ( AEMSurvey* SurveyIn ) {
-//         if (Survey) Survey->DetachFrom(this);
-//         Survey = SurveyIn;
-//         Survey->AttachTo(this);
-//
-//         // OK determine how many frequencies we are dealing with
-//         Omegas = 2.*PI*Survey->GetFrequencies();
-//
-//         return ;
-//     }		// -----  end of method EMSchur3DBase::SetAEMSurvey  -----// -----  end of method EMSchur3DBase::LoadMeshToolsConductivityModel  -----
+    //--------------------------------------------------------------------------------------
+    //       Class:  EMSchur3DBase
+    //      Method:  SetAEMSurvey
+    //--------------------------------------------------------------------------------------
+    void EMSchur3DBase::SetAEMSurvey ( std::shared_ptr<AEMSurvey> SurveyIn ) {
+        Survey = SurveyIn;
+        // determine how many frequencies we are dealing with
+        Omegas = 2.*PI*Survey->GetFrequencies();
+        return ;
+    }		// -----  end of method EMSchur3DBase::SetAEMSurvey  -----// -----  end of method EMSchur3DBase::LoadMeshToolsConductivityModel  -----
 
-//     //--------------------------------------------------------------------------------------
-//     //       Class:  EMSchur3DBase
-//     //      Method:  Solve
-//     //--------------------------------------------------------------------------------------
-//     void EMSchur3DBase::Solve (  ) {
-//
-//         // TODO, these should throw exceptions for a GUI to catch
-//         if (!LayModel or !Survey or !Grid or !sigma) {
-//             std::cerr << "You need to set something. EMSChur3D::Solve()";
-//             exit(EXIT_FAILURE);
-//         }
-//
-//         //BuildD(); // strangely necessary, bug, track down.
-//         Setup();
-//
-//         std::cout << "Entering parallel solve" << std::endl;
-//         #ifdef LEMMAUSEOMP
-//         #pragma omp parallel for schedule(static,1)
-//         #endif
-//         for (int isource=0; isource<Survey->GetNumberOfSources(); ++isource) {
-//             SolveSource(Survey->GetSource(isource), isource);
-//         }
-//
-//         return ;
-//     }		// -----  end of method EMSchur3DBase::Solve  -----
+    //--------------------------------------------------------------------------------------
+    //       Class:  EMSchur3DBase
+    //      Method:  Solve
+    //--------------------------------------------------------------------------------------
+    void EMSchur3DBase::Solve (  ) {
+
+        // TODO, these should throw exceptions for a GUI to catch
+        if (!LayModel or !Survey or !Grid or !sigma) {
+            std::cerr << "You need to set something. EMSChur3D::Solve()";
+            exit(EXIT_FAILURE);
+        }
+
+        //BuildD(); // strangely necessary, bug, track down.
+        Setup();
+
+        std::cout << "Entering parallel solve" << std::endl;
+        #ifdef LEMMAUSEOMP
+        #pragma omp parallel for schedule(static,1)
+        #endif
+        for (int isource=0; isource<Survey->GetNumberOfSources(); ++isource) {
+            SolveSource(Survey->GetSource(isource), isource);
+        }
+
+        return ;
+    }		// -----  end of method EMSchur3DBase::Solve  -----
 
 }		// -----  end of Lemma  name  -----