remove more sources which are unused after removals in opm-upscaling
This commit is contained in:
Arne Morten Kvarving
parent
c3121f0a1a
commit
476a64c370
@ -49,9 +49,7 @@ list (APPEND MAIN_SOURCE_FILES
|
|||||||
opm/core/pressure/mimetic/mimetic.c
|
opm/core/pressure/mimetic/mimetic.c
|
||||||
opm/core/pressure/msmfem/dfs.c
|
opm/core/pressure/msmfem/dfs.c
|
||||||
opm/core/pressure/msmfem/partition.c
|
opm/core/pressure/msmfem/partition.c
|
||||||
opm/core/pressure/tpfa/cfs_tpfa.c
|
|
||||||
opm/core/pressure/tpfa/cfs_tpfa_residual.c
|
opm/core/pressure/tpfa/cfs_tpfa_residual.c
|
||||||
opm/core/pressure/tpfa/compr_quant.c
|
|
||||||
opm/core/pressure/tpfa/ifs_tpfa.c
|
opm/core/pressure/tpfa/ifs_tpfa.c
|
||||||
opm/core/pressure/tpfa/trans_tpfa.c
|
opm/core/pressure/tpfa/trans_tpfa.c
|
||||||
opm/core/props/BlackoilPropertiesBasic.cpp
|
opm/core/props/BlackoilPropertiesBasic.cpp
|
||||||
@ -223,9 +221,7 @@ list (APPEND PUBLIC_HEADER_FILES
|
|||||||
opm/core/pressure/msmfem/partition.h
|
opm/core/pressure/msmfem/partition.h
|
||||||
opm/core/pressure/tpfa/TransTpfa.hpp
|
opm/core/pressure/tpfa/TransTpfa.hpp
|
||||||
opm/core/pressure/tpfa/TransTpfa_impl.hpp
|
opm/core/pressure/tpfa/TransTpfa_impl.hpp
|
||||||
opm/core/pressure/tpfa/cfs_tpfa.h
|
|
||||||
opm/core/pressure/tpfa/cfs_tpfa_residual.h
|
opm/core/pressure/tpfa/cfs_tpfa_residual.h
|
||||||
opm/core/pressure/tpfa/compr_quant.h
|
|
||||||
opm/core/pressure/tpfa/compr_quant_general.h
|
opm/core/pressure/tpfa/compr_quant_general.h
|
||||||
opm/core/pressure/tpfa/compr_source.h
|
opm/core/pressure/tpfa/compr_source.h
|
||||||
opm/core/pressure/tpfa/ifs_tpfa.h
|
opm/core/pressure/tpfa/ifs_tpfa.h
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -1,128 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2010 SINTEF ICT, Applied Mathematics.
|
|
||||||
|
|
||||||
This file is part of the Open Porous Media project (OPM).
|
|
||||||
|
|
||||||
OPM is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
OPM is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with OPM. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef OPM_CFS_TPFA_HEADER_INCLUDED
|
|
||||||
#define OPM_CFS_TPFA_HEADER_INCLUDED
|
|
||||||
|
|
||||||
#include <opm/core/grid.h>
|
|
||||||
#include <opm/core/pressure/legacy_well.h>
|
|
||||||
#include <opm/core/pressure/flow_bc.h>
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
struct cfs_tpfa_impl;
|
|
||||||
struct CSRMatrix;
|
|
||||||
struct compr_quantities;
|
|
||||||
|
|
||||||
struct cfs_tpfa_data {
|
|
||||||
struct CSRMatrix *A;
|
|
||||||
double *b;
|
|
||||||
double *x;
|
|
||||||
|
|
||||||
struct cfs_tpfa_impl *pimpl;
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
struct cfs_tpfa_data *
|
|
||||||
cfs_tpfa_construct(struct UnstructuredGrid *G, well_t *W, int nphases);
|
|
||||||
|
|
||||||
void
|
|
||||||
cfs_tpfa_assemble(struct UnstructuredGrid *G,
|
|
||||||
double dt,
|
|
||||||
well_t *W,
|
|
||||||
struct FlowBoundaryConditions *bc,
|
|
||||||
const double *src,
|
|
||||||
struct compr_quantities *cq,
|
|
||||||
const double *trans,
|
|
||||||
const double *gravcap_f,
|
|
||||||
well_control_t *wctrl,
|
|
||||||
struct completion_data *wdata,
|
|
||||||
const double *cpress0,
|
|
||||||
const double *porevol,
|
|
||||||
struct cfs_tpfa_data *h);
|
|
||||||
|
|
||||||
void
|
|
||||||
cfs_tpfa_press_flux(struct UnstructuredGrid *G,
|
|
||||||
struct FlowBoundaryConditions *bc,
|
|
||||||
well_t *W,
|
|
||||||
int np,
|
|
||||||
const double *trans,
|
|
||||||
const double *pmobf,
|
|
||||||
const double *gravcap_f,
|
|
||||||
struct completion_data *wdata,
|
|
||||||
struct cfs_tpfa_data *h,
|
|
||||||
double *cpress,
|
|
||||||
double *fflux,
|
|
||||||
double *wpress,
|
|
||||||
double *wflux);
|
|
||||||
|
|
||||||
void
|
|
||||||
cfs_tpfa_fpress(struct UnstructuredGrid *G,
|
|
||||||
struct FlowBoundaryConditions *bc,
|
|
||||||
int np,
|
|
||||||
const double *htrans,
|
|
||||||
const double *pmobf,
|
|
||||||
const double *gravcap_f,
|
|
||||||
struct cfs_tpfa_data *h,
|
|
||||||
const double *cpress,
|
|
||||||
const double *fflux,
|
|
||||||
double *fpress);
|
|
||||||
|
|
||||||
void
|
|
||||||
cfs_tpfa_retrieve_masstrans(struct UnstructuredGrid *G,
|
|
||||||
int np,
|
|
||||||
struct cfs_tpfa_data *h,
|
|
||||||
double *masstrans_f);
|
|
||||||
|
|
||||||
void
|
|
||||||
cfs_tpfa_retrieve_gravtrans(struct UnstructuredGrid *G,
|
|
||||||
int np,
|
|
||||||
struct cfs_tpfa_data *h,
|
|
||||||
double *gravtrans_f);
|
|
||||||
|
|
||||||
double
|
|
||||||
cfs_tpfa_impes_maxtime(struct UnstructuredGrid *G,
|
|
||||||
struct compr_quantities *cq,
|
|
||||||
const double *trans,
|
|
||||||
const double *porevol,
|
|
||||||
struct cfs_tpfa_data *h,
|
|
||||||
const double *dpmobf,
|
|
||||||
const double *surf_dens,
|
|
||||||
const double *gravity);
|
|
||||||
|
|
||||||
void
|
|
||||||
cfs_tpfa_expl_mass_transport(struct UnstructuredGrid *G,
|
|
||||||
well_t *W,
|
|
||||||
struct completion_data *wdata,
|
|
||||||
int np,
|
|
||||||
double dt,
|
|
||||||
const double *porevol,
|
|
||||||
struct cfs_tpfa_data *h,
|
|
||||||
double *surf_vol);
|
|
||||||
|
|
||||||
void
|
|
||||||
cfs_tpfa_destroy(struct cfs_tpfa_data *h);
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* OPM_CFS_TPFA_HEADER_INCLUDED */
|
|
||||||
@ -1,82 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2010 SINTEF ICT, Applied Mathematics.
|
|
||||||
|
|
||||||
This file is part of the Open Porous Media project (OPM).
|
|
||||||
|
|
||||||
OPM is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
OPM is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with OPM. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "config.h"
|
|
||||||
#include <opm/core/pressure/tpfa/compr_quant.h>
|
|
||||||
|
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
|
||||||
/* Compute B \ (V') == zeta(cellNo) .* faceFlux2CellFlux(fflux) */
|
|
||||||
/* ---------------------------------------------------------------------- */
|
|
||||||
void
|
|
||||||
compr_flux_term(struct UnstructuredGrid *G,
|
|
||||||
const double *fflux,
|
|
||||||
const double *zeta,
|
|
||||||
double *Biv)
|
|
||||||
/* ---------------------------------------------------------------------- */
|
|
||||||
{
|
|
||||||
int c, i, f;
|
|
||||||
double s;
|
|
||||||
|
|
||||||
for (c = i = 0; c < G->number_of_cells; c++) {
|
|
||||||
for (; i < G->cell_facepos[c + 1]; i++) {
|
|
||||||
f = G->cell_faces[i];
|
|
||||||
s = 2.0*(c == G->face_cells[2*f + 0]) - 1.0;
|
|
||||||
|
|
||||||
Biv[i] = zeta[c] * s * fflux[f];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
|
||||||
/* Compute P == ct .* pv ./ dt */
|
|
||||||
/* ---------------------------------------------------------------------- */
|
|
||||||
void
|
|
||||||
compr_accum_term(size_t nc,
|
|
||||||
double dt,
|
|
||||||
const double *porevol,
|
|
||||||
const double *totcompr,
|
|
||||||
double *P)
|
|
||||||
/* ---------------------------------------------------------------------- */
|
|
||||||
{
|
|
||||||
size_t c;
|
|
||||||
|
|
||||||
for (c = 0; c < nc; c++) {
|
|
||||||
P[c] = totcompr[c] * porevol[c] / dt;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* ---------------------------------------------------------------------- */
|
|
||||||
/* Add pressure accumulation term (P*p_0) to cell sources */
|
|
||||||
/* ---------------------------------------------------------------------- */
|
|
||||||
void
|
|
||||||
compr_src_add_press_accum(size_t nc,
|
|
||||||
const double *p0,
|
|
||||||
const double *P,
|
|
||||||
double *src)
|
|
||||||
/* ---------------------------------------------------------------------- */
|
|
||||||
{
|
|
||||||
size_t c;
|
|
||||||
|
|
||||||
for (c = 0; c < nc; c++) {
|
|
||||||
src[c] += P[c] * p0[c];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,64 +0,0 @@
|
|||||||
/*
|
|
||||||
Copyright 2010 SINTEF ICT, Applied Mathematics.
|
|
||||||
|
|
||||||
This file is part of the Open Porous Media project (OPM).
|
|
||||||
|
|
||||||
OPM is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
OPM is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with OPM. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef OPM_COMPR_QUANT_HEADER_INCLUDED
|
|
||||||
#define OPM_COMPR_QUANT_HEADER_INCLUDED
|
|
||||||
|
|
||||||
#include <stddef.h>
|
|
||||||
|
|
||||||
#include <opm/core/grid.h>
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
struct compr_quantities {
|
|
||||||
int nphases; /* Number of phases/components */
|
|
||||||
|
|
||||||
double *totcompr; /* Total compressibility per cell */
|
|
||||||
double *voldiscr; /* Volume discrepancy per cell */
|
|
||||||
double *Ac; /* RB^{-1} per cell */
|
|
||||||
double *Af; /* RB^{-1} per face */
|
|
||||||
double *phasemobf; /* Phase mobility per face */
|
|
||||||
};
|
|
||||||
|
|
||||||
void
|
|
||||||
compr_flux_term(struct UnstructuredGrid *G,
|
|
||||||
const double *fflux,
|
|
||||||
const double *zeta,
|
|
||||||
double *Biv);
|
|
||||||
|
|
||||||
void
|
|
||||||
compr_accum_term(size_t nc,
|
|
||||||
double dt,
|
|
||||||
const double *porevol,
|
|
||||||
const double *totcompr,
|
|
||||||
double *P);
|
|
||||||
|
|
||||||
void
|
|
||||||
compr_src_add_press_accum(size_t nc,
|
|
||||||
const double *p0,
|
|
||||||
const double *P,
|
|
||||||
double *src);
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* OPM_COMPR_QUANT_HEADER_INCLUDED */
|
|
||||||
Loading…
Reference in New Issue
Block a user