Merge branch 'cleanup_configuuration_mesh' into 'master'

Refactoring of Configuration::mesh() where a default implementation is usually good enough.

See merge request !5

common/configuration.cpp

@@ -3,11 +3,36 @@
 //GmshFWI Library
 
 #include "configuration.h"
+#include <gmsh.h>
+
+namespace gmodel = gmsh::model;
+namespace factory = gmsh::model::geo;
 
 using namespace gmshfem;
 using namespace gmshfem::common;
 using namespace gmshfem::domain;
 
+void ConfigurationInterface::mesh() const
+{
+  msg::print << "Generate meshes" << msg::endl;
+  gmsh::option::setNumber("General.Terminal", 1);
+
+  gmodel::add(_name);
+  if (!_remesh)
+  {
+    gmsh::open(_name + ".msh");
+    return;
+  }
+
+  wave_mesh();
+  data_mesh();
+
+  factory::synchronize();
+  gmodel::mesh::generate();
+
+  gmsh::write(_name + ".msh");
+}
+
 bool ConfigurationInterface::recIsValid(unsigned int shot,unsigned int rec) const
 {
   if( !(shot<_ns) && !(rec<nr(shot)) )

common/configuration.h

@@ -51,7 +51,7 @@ public:
     };
     virtual ~ConfigurationInterface() {delete _parametrization;};
 
-    virtual void mesh() const = 0;
+    virtual void mesh() const;
     virtual double area() const = 0;
     virtual double data_area() const {return gmshfem::post::integrate(1._d_sf,_data_omega,"Gauss0");};
     virtual double datapoint_area() const = 0;

specific/configuration/circular_acquisition.cpp

@@ -264,26 +264,7 @@ namespace circular_acquisition
         }
     }
 
-    void Configuration::mesh() const
-    {
-        msg::print << "Generate meshes" << msg::endl;
-        gmsh::option::setNumber("General.Terminal", 1);
-
-        gmodel::add(_name);
-        if(!_remesh)
-        {
-          gmsh::open(_name+".msh");
-          return;
-        }
 
-        wave_mesh();
-        data_mesh();
-
-        factory::synchronize();
-        gmodel::mesh::generate();
-
-        gmsh::write(_name+".msh");
-    }
     void Configuration::wave_mesh() const
     {
         int p0 = factory::addPoint(0., 0., 0., _h);

specific/configuration/layeredvolume_acquisition.cpp

@@ -477,26 +477,6 @@ namespace layeredvolume_acquisition
         }
     }
 
-    void Configuration::mesh() const
-    {
-        msg::print << "Generate meshes" << msg::endl;
-        gmsh::option::setNumber("General.Terminal", 1);
-
-        gmodel::add(_name);
-        if(!_remesh)
-        {
-          gmsh::open(_name+".msh");
-          return;
-        }
-
-        wave_mesh();
-        data_mesh();
-
-        factory::synchronize();
-        gmodel::mesh::generate();
-
-        gmsh::write(_name+".msh");
-    }
     void Configuration::wave_mesh() const
     {
         std::vector<int> pl1(_layercoord1.size());

specific/configuration/surface_acquisition.cpp

@@ -265,24 +265,7 @@ namespace surface_acquisition
         }
     }
 
-    void Configuration::mesh() const
-    {
-        msg::print << "Generate meshes" << msg::endl;
-        gmsh::option::setNumber("General.Terminal", 1);
-        gmodel::add(_name);
-        if(!_remesh)
-        {
-          gmsh::open(_name+".msh");
-          return;
-        }
-        wave_mesh();
-        data_mesh();
     
-        factory::synchronize();
-        gmodel::mesh::generate();
-
-        gmsh::write(_name+".msh");
-    }
     void Configuration::wave_mesh() const
     {
         double Le0 = (_L - _Ler)/2.;

specific/configuration/volume_acquisition.cpp

@@ -341,26 +341,6 @@ namespace volume_acquisition
         }
     }
 
-    void Configuration::mesh() const
-    {
-        msg::print << "Generate meshes" << msg::endl;
-        gmsh::option::setNumber("General.Terminal", 1);
-
-        gmodel::add(_name);
-        if(!_remesh)
-        {
-          gmsh::open(_name+".msh");
-          return;
-        }
-
-        wave_mesh();
-        data_mesh();
-
-        factory::synchronize();
-        gmodel::mesh::generate();
-
-        gmsh::write(_name+".msh");
-    }
     void Configuration::wave_mesh() const
     {
         int pb1 = factory::addPoint(0., 0., 0., _h);