Remove unused Matlab component

Author: Chrismarsh

CMakeLists.txt

@@ -25,7 +25,6 @@ option(USE_OMP "Enable OpenMP"  ON )
 option(OMP_SAFE_EXCEPTION "Enables safe exception handling from within OMP regions." ON)
 option(ENABLE_SAFE_CHECKS "Enable variable map checking. Runtime perf cost. Allows for ensuring a variable is indeed available to be lookedup." ON)
 option(BUILD_TESTS "Build all tests."  OFF ) # Makes boolean 'test' available.
-option(MATLAB "Enable Matlab linkage"  OFF )
 option(STATIC_ANLAYSIS "Enable PVS static anlaysis" OFF)
 option(USE_TCMALLOC "Use tcmalloc from gperftools " ON)
 option(USE_JEMALLOC "Use jemalloc" OFF)
@@ -255,13 +254,6 @@ if(USE_OMP)
     endif()
 endif()
 
-
-if(MATLAB)
-    #for matlab to run you need csh installed
-    find_package(Matlab REQUIRED)
-endif()
-
-
 #already makes a target
 find_package(${METEOIO} REQUIRED)
 

src/CMakeLists.txt

@@ -201,21 +201,6 @@ if(MPI_FOUND AND USE_MPI)
 	endif()
 endif()
 
-#are we linking against matlab?
-if(MATLAB)
-    set(LIBMAW_SRCS
-        libmaw/graphics.cpp
-        libmaw/matlab_engine.cpp
-		CACHE INTERNAL "" FORCE )
-
-    list( APPEND EXT_TARGETS
-            ${MATLAB_ENG_LIBRARY}
-            ${MATLAB_MX_LIBRARY})
-
-    list( APPEND HEADER_FILES
-        ${MATLAB_INCLUDE_DIR})
-
-endif()
 
 if(BUILD_WITH_CONAN)
 	# when we run make install all the RPATHs will be stripped out and set to these

src/core.cpp

@@ -613,11 +613,8 @@ void core::config_parameters(pt::ptree &value)
 void core::config_meshes( pt::ptree &value)
 {
     LOG_DEBUG << "Found meshes sections.";
-#ifdef MATLAB
-    _mesh = boost::make_shared<triangulation>(_engine);
-#else
+
     _mesh = boost::make_shared<triangulation>();
-#endif
 
     _mesh->_global = _global;
 
@@ -794,35 +791,6 @@ void core::config_meshes( pt::ptree &value)
 
 }
 
-void core::config_matlab( pt::ptree &value)
-{
-    LOG_DEBUG << "Found matlab section";
-#ifdef MATLAB
-    //loop over the list of matlab options
-    for (auto& jtr : value.get_obj())
-    {
-        const json_spirit::Pair& pair = jtr;
-        const std::string& name = pair.name_;
-        const json_spirit::Value& value = pair.value_;
-
-        if (name == "mfile_paths")
-        {
-            LOG_DEBUG << "Found " << name;
-            for (auto& ktr : value.get_obj()) //loop over all the paths
-            {
-                const json_spirit::Pair& pair = ktr;
-                //                const std::string& name = pair.name_;
-                const json_spirit::Value& value = pair.value_;
-
-
-                _engine->add_dir_to_path(value.get_str());
-
-            }
-        }
-    }
-#endif
-}
-
 void core::config_output(pt::ptree &value)
 {
     LOG_DEBUG << "Found output section";
@@ -1257,17 +1225,6 @@ void core::init(int argc, char **argv)
     LOG_DEBUG << version;
 
 
-
-#ifdef NOMATLAB
-    _engine = boost::make_shared<maw::matlab_engine>();
-
-
-    _engine->start();
-    _engine->set_working_dir();
-
-    LOG_DEBUG << "Matlab engine started";
-#endif
-
     _global = boost::make_shared<global>();
 
     // This needs to be set so that underflows in gsl math
@@ -1474,10 +1431,6 @@ void core::init(int argc, char **argv)
         LOG_DEBUG << "Optional section checkpoint not found";
     }
 
-//#ifdef NOMATLAB
-//            config_matlab(value);
-//#endif
-
     //if we are to run in point mode, we need to remove all the input and outputs that aren't associated with point mode
     // we do this so the user doesn't have to modify a lot of the config file when going between point and dist mode.
 

src/core.hpp

@@ -182,7 +182,6 @@ class core
     void config_forcing(pt::ptree& value);
     void config_module_overrides( pt::ptree& value);
     void config_parameters(pt::ptree &value);
-    void config_matlab( pt::ptree& value);
     void config_output(pt::ptree& value);
     void config_global( pt::ptree& value);
     void config_checkpoint( pt::ptree& value);
@@ -228,7 +227,7 @@ class core
     cmdl_opt config_cmdl_options(int argc, char **argv);
 
     /**
-     * Initializes the logger and Matlab engine
+     * Initializes the logger
      */
     core();
     ~core();
@@ -276,12 +275,6 @@ class core
     double radius;
     double N; // meters, radius for station search
 
-
-#ifdef MATLAB
-    //matlab engine
-    boost::shared_ptr<maw::matlab_engine> _engine;
-#endif
-
     //holds all the modules that are to be run on each mesh element
     //pair as we also need to store the make order
     std::vector< std::pair<module,size_t> > _modules;

src/exception.hpp

@@ -30,11 +30,6 @@
 
 struct exception_base: virtual std::exception, virtual boost::exception { };
 
-//matlab
-struct matlab_error: virtual exception_base {};
-struct matlab_null_return : virtual matlab_error{};
-struct matlab_engine_failure : virtual matlab_error{};
-
 // IO errors
 struct io_error: virtual exception_base { };
 struct file_read_error: virtual io_error { };