Commit 57624c3d authored by Dmitry Bagaev's avatar Dmitry Bagaev

fix

parent cefd7d0c
......@@ -263,7 +263,6 @@ set(INMOST_INSTALL_HEADERS Source/Headers/inmost.h
Source/Headers/inmost_nonlinear.h
Source/Headers/inmost_partitioner.h
Source/Headers/inmost_solver.h
Source/Headers/inmost_solver_interface.h
Source/Headers/inmost_sparse.h
Source/Headers/inmost_xml.h
Source/Headers/inmost_variable.h
......@@ -294,7 +293,6 @@ set_property(TARGET inmost PROPERTY PUBLIC_HEADER
"${PROJECT_SOURCE_DIR}/Source/Headers/inmost_nonlinear.h"
"${PROJECT_SOURCE_DIR}/Source/Headers/inmost_partitioner.h"
"${PROJECT_SOURCE_DIR}/Source/Headers/inmost_solver.h"
"${PROJECT_SOURCE_DIR}/Source/Headers/inmost_solver_interface.h"
"${PROJECT_SOURCE_DIR}/Source/Headers/inmost_sparse.h"
"${PROJECT_SOURCE_DIR}/Source/Headers/inmost_variable.h"
"${PROJECT_SOURCE_DIR}/Source/Headers/inmost_xml.h"
......
......@@ -12,7 +12,6 @@ set(HEADER
${CMAKE_CURRENT_SOURCE_DIR}/inmost_dense.h
${CMAKE_CURRENT_SOURCE_DIR}/inmost_mesh.h
${CMAKE_CURRENT_SOURCE_DIR}/inmost_solver.h
${CMAKE_CURRENT_SOURCE_DIR}/inmost_solver_interface.h
${CMAKE_CURRENT_SOURCE_DIR}/inmost_partitioner.h
${CMAKE_CURRENT_SOURCE_DIR}/inmost_autodiff.h
${CMAKE_CURRENT_SOURCE_DIR}/inmost_expression.h
......
......@@ -6,7 +6,6 @@
#include "inmost_mesh.h"
#include "inmost_dense.h"
#include "inmost_solver.h"
#include "inmost_solver_interface.h"
#include "inmost_partitioner.h"
#include "inmost_variable.h"
#include "inmost_nonlinear.h"
......
#ifndef INMOST_SOLVER_INCLUDED
#define INMOST_SOLVER_INCLUDED
#include "inmost_solver_interface.h"
#include "inmost_common.h"
#include "inmost_sparse.h"
......@@ -12,6 +11,9 @@ namespace INMOST
#define GUARD_MPI(x) {ierr = x; if( ierr != MPI_SUCCESS ) {char str[4096]; int len; MPI_Error_string(ierr,str,&len); std::cout << #x << " not successfull: " << str << std::endl; MPI_Abort(comm,-1000);}}
#define HASH_TABLE_SIZE 2048
class SolverInterface;
class SolverParameters;
class Solver
{
private:
......
......@@ -9,7 +9,8 @@ set(SOURCE
set(HEADER
${HEADER}
${CMAKE_CURRENT_SOURCE_DIR}/SolverMaster.h)
${CMAKE_CURRENT_SOURCE_DIR}/SolverMaster.h
${CMAKE_CURRENT_SOURCE_DIR}/SolverInterface.h)
add_subdirectory(solver_inner)
add_subdirectory(solver_fcbiilu2)
......
......@@ -2,7 +2,7 @@
#define INMOST_SOLVER_MASTER
#include <inmost_solver.h>
#include <inmost_solver_interface.h>
#include <Source/Solver/SolverInterface.h>
#include "SolverMaster.h"
#include "solver_inner/solver_ilu2/SolverILU2.h"
......
#include "inmost_solver_interface.h"
#include "SolverInterface.h"
namespace INMOST {
......
#ifndef INMOST_SOLVERANI_H
#define INMOST_SOLVERANI_H
#include "inmost_solver_interface.h"
#include "Source/Solver/SolverInterface.h"
#include "solver_ani.h"
namespace INMOST {
......
#ifndef INMOST_SOLVERFCBIILU2_H
#define INMOST_SOLVERFCBIILU2_H
#include "inmost_solver_interface.h"
#include "Source/Solver/SolverInterface.h"
#include "solver_fcbiilu2.h"
namespace INMOST {
......
#ifndef INMOST_SOLVERINNER_H
#define INMOST_SOLVERINNER_H
#include "inmost_solver_interface.h"
#include "Source/Solver/SolverInterface.h"
#include "Source/Utils/Utils.h"
#include "solver_prototypes.hpp"
#include "solver_bcgsl.hpp"
......
#ifndef INMOST_SOLVERK3BIILU2_H
#define INMOST_SOLVERK3BIILU2_H
#include "inmost_solver_interface.h"
#include "Source/Solver/SolverInterface.h"
#include "solver_k3biilu2.h"
namespace INMOST {
......
#ifndef INMOST_SOLVERPETSC_H
#define INMOST_SOLVERPETSC_H
#include "inmost.h"
#include "petsc.h"
#include "solver_petsc.h"
#include "Source/Solver/SolverInterface.h"
#include "Source/Utils/Utils.h"
......
#ifndef INMOST_SOLVERSUPERLU_H
#define INMOST_SOLVERSUPERLU_H
#include "inmost_solver_interface.h"
#include "Source/Solver/SolverInterface.h"
#include "superlu/slu_ddefs.h"
namespace INMOST {
......
......@@ -7,6 +7,7 @@
#include <inmost.h>
#include "Source/Solver/SolverInterface.h"
#include "Source/Utils/Utils.h"
#if defined(USE_MPI)
......
#include <cstdlib>
#include <inmost.h>
#include <istream>
#include <string>
#include <cassert>
using namespace INMOST;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment