Temporary commit. Transition to new ifsh interface unfinished.
This commit is contained in:
parent
e78b1580a5
commit
fd1e772b76
@ -22,6 +22,7 @@
|
|||||||
#define OPM_HYBRIDPRESSURESOLVER_HEADER_INCLUDED
|
#define OPM_HYBRIDPRESSURESOLVER_HEADER_INCLUDED
|
||||||
|
|
||||||
#include "ifsh.h"
|
#include "ifsh.h"
|
||||||
|
#include "sparse_sys.h"
|
||||||
#include "mimetic.h"
|
#include "mimetic.h"
|
||||||
#include "GridAdapter.hpp"
|
#include "GridAdapter.hpp"
|
||||||
#include <stdexcept>
|
#include <stdexcept>
|
||||||
@ -44,7 +45,7 @@ public:
|
|||||||
/// Destructor.
|
/// Destructor.
|
||||||
~HybridPressureSolver()
|
~HybridPressureSolver()
|
||||||
{
|
{
|
||||||
ifsh_destroy(data_);
|
fsh_destroy(data_);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// @brief
|
/// @brief
|
||||||
@ -216,13 +217,15 @@ public:
|
|||||||
"You must call assemble() (and solve the linear system) "
|
"You must call assemble() (and solve the linear system) "
|
||||||
"prior to calling computePressuresAndFluxes().");
|
"prior to calling computePressuresAndFluxes().");
|
||||||
}
|
}
|
||||||
|
const double* Binv = &Binv_[0];
|
||||||
|
const double* gpress = &gpress_[0];
|
||||||
int num_cells = grid_.c_grid()->number_of_cells;
|
int num_cells = grid_.c_grid()->number_of_cells;
|
||||||
int num_faces = grid_.c_grid()->number_of_faces;
|
int num_faces = grid_.c_grid()->number_of_faces;
|
||||||
cell_pressures.clear();
|
cell_pressures.clear();
|
||||||
cell_pressures.resize(num_cells, 0.0);
|
cell_pressures.resize(num_cells, 0.0);
|
||||||
face_fluxes.clear();
|
face_fluxes.clear();
|
||||||
face_fluxes.resize(num_faces, 0.0);
|
face_fluxes.resize(num_faces, 0.0);
|
||||||
ifsh_press_flux(grid_.c_grid(), data_, &cell_pressures[0], &face_fluxes[0], 0, 0);
|
ifsh_press_flux(grid_.c_grid(), Binv, gpress, data_, &cell_pressures[0], &face_fluxes[0], 0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// @brief
|
/// @brief
|
||||||
@ -273,7 +276,7 @@ private:
|
|||||||
State state_;
|
State state_;
|
||||||
|
|
||||||
// Solver data.
|
// Solver data.
|
||||||
ifsh_data* data_;
|
fsh_data* data_;
|
||||||
// Grid.
|
// Grid.
|
||||||
GridAdapter grid_;
|
GridAdapter grid_;
|
||||||
// Number of faces per cell.
|
// Number of faces per cell.
|
||||||
|
Loading…
Reference in New Issue
Block a user