OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

C++ified twophase model code.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2012-01-24 16:01:15 +01:00
parent a3662637c1
commit 45d603939d
4 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -82,7 +82,7 @@ opm/core/transport/spu_implicit.c \
opm/core/transport/transport_source.c \ opm/core/transport/transport_source.c \
opm/core/transport/reorder/fluid.c \ opm/core/transport/reorder/fluid.c \
opm/core/transport/reorder/reordersequence.c \ opm/core/transport/reorder/reordersequence.c \
opm/core/transport/reorder/twophase.c \ opm/core/transport/reorder/twophase.cpp \
opm/core/transport/reorder/nlsolvers.c \ opm/core/transport/reorder/nlsolvers.c \
opm/core/transport/reorder/tarjan.c \ opm/core/transport/reorder/tarjan.c \
opm/core/transport/reorder/twophasetransport.cpp opm/core/transport/reorder/twophasetransport.cpp
@ -199,7 +199,7 @@ opm/core/transport/transport_source.h \
opm/core/transport/reorder/fluid.h \ opm/core/transport/reorder/fluid.h \
opm/core/transport/reorder/nlsolvers.h \ opm/core/transport/reorder/nlsolvers.h \
opm/core/transport/reorder/reordersequence.h \ opm/core/transport/reorder/reordersequence.h \
opm/core/transport/reorder/twophase.h \ opm/core/transport/reorder/twophase.hpp \
opm/core/transport/reorder/tarjan.h \ opm/core/transport/reorder/tarjan.h \
opm/core/transport/reorder/twophasetransport.hpp opm/core/transport/reorder/twophasetransport.hpp

14
opm/core/transport/reorder/twophase.c → opm/core/transport/reorder/twophase.cpp
View File

@ -10,7 +10,7 @@
#include "fluid.h" #include "fluid.h"
#else #else
#include <opm/core/grid.h> #include <opm/core/grid.h>
#include <opm/core/transport/reorder/twophase.h> #include <opm/core/transport/reorder/twophase.hpp>
#include <opm/core/transport/reorder/nlsolvers.h> #include <opm/core/transport/reorder/nlsolvers.h>
#include <opm/core/transport/reorder/fluid.h> #include <opm/core/transport/reorder/fluid.h>
#endif #endif
@ -46,7 +46,7 @@ init_solverdata(struct UnstructuredGrid *grid, const double *darcyflux,
const int *satnum, double dt, double *saturation) const int *satnum, double dt, double *saturation)
{ {
int i; int i;
struct SolverData *d = malloc(sizeof *d); struct SolverData *d = (struct SolverData*) malloc(sizeof *d);
if(d!=NULL) if(d!=NULL)
{ {
@ -58,8 +58,8 @@ init_solverdata(struct UnstructuredGrid *grid, const double *darcyflux,
d->dt = dt; d->dt = dt;
d->saturation = saturation; d->saturation = saturation;
d->fractionalflow = malloc(grid->number_of_cells * d->fractionalflow = (double*) malloc(grid->number_of_cells *
sizeof *d->fractionalflow); sizeof *d->fractionalflow);
if (d->fractionalflow == NULL) if (d->fractionalflow == NULL)
{ {
destroy_solverdata(d); destroy_solverdata(d);
@ -76,8 +76,8 @@ init_solverdata(struct UnstructuredGrid *grid, const double *darcyflux,
/* Solver for single-cell bvp calls root-finder in nlsolvers.c */ /* Solver for single-cell bvp calls root-finder in nlsolvers.c */
void solvecell(void *data, struct NonlinearSolverCtrl *ctrl, int cell) void solvecell(void *data, struct NonlinearSolverCtrl *ctrl, int cell)
{ {
struct SolverData *d = data; struct SolverData *d = (struct SolverData*) data;
struct Parameters prm = get_parameters(data, cell); struct Parameters prm = get_parameters(d, cell);
d->saturation[cell] = find_zero(residual, &prm, ctrl); d->saturation[cell] = find_zero(residual, &prm, ctrl);
d->fractionalflow[cell] = fluxfun(d->saturation[cell], prm.region); d->fractionalflow[cell] = fluxfun(d->saturation[cell], prm.region);
@ -101,7 +101,7 @@ void solvecell(void *data, struct NonlinearSolverCtrl *ctrl, int cell)
static double static double
residual(double s, void *data) residual(double s, void *data)
{ {
struct Parameters *p = data; struct Parameters *p = (struct Parameters*) data;
return s - p->s0 + p->dtpv*(p->outflux*fluxfun(s, p->region) + p->influx); return s - p->s0 + p->dtpv*(p->outflux*fluxfun(s, p->region) + p->influx);
} }

10
opm/core/transport/reorder/twophase.h → opm/core/transport/reorder/twophase.hpp
View File

@ -1,11 +1,8 @@
/* Copyright 2011 (c) Jostein R. Natvig <Jostein.R.Natvig at sintef.no> */ /* Copyright 2011 (c) Jostein R. Natvig <Jostein.R.Natvig at sintef.no> */
#ifndef TWOPHASE_H_INCLUDED #ifndef TWOPHASE_HPP_INCLUDED
#define TWOPHASE_H_INCLUDED #define TWOPHASE_HPP_INCLUDED
#ifdef __cplusplus
extern "C" {
#endif
struct UnstructuredGrid; struct UnstructuredGrid;
@ -34,9 +31,6 @@ init_solverdata(struct UnstructuredGrid *grid, const double *darcyflux,
const double *porevolume, const double *source, const double *porevolume, const double *source,
const int *satnum, double dt, double *saturation); const int *satnum, double dt, double *saturation);
#ifdef __cplusplus
}
#endif
#endif /* TWOPHASE_H_INCLUDED */ #endif /* TWOPHASE_H_INCLUDED */

4
opm/core/transport/reorder/twophasetransport.cpp
View File

@ -9,7 +9,7 @@
#include "reordersequence.h" #include "reordersequence.h"
#include "tarjan.h" #include "tarjan.h"
#include "nlsolvers.h" #include "nlsolvers.h"
#include "twophase.h" #include "twophase.hpp"
#include "twophasetransport.hpp" #include "twophasetransport.hpp"
#include <mex.h> #include <mex.h>
@ -25,7 +25,7 @@ extern int interrupt_signal;
#include <opm/core/transport/reorder/reordersequence.h> #include <opm/core/transport/reorder/reordersequence.h>
#include <opm/core/transport/reorder/tarjan.h> #include <opm/core/transport/reorder/tarjan.h>
#include <opm/core/transport/reorder/nlsolvers.h> #include <opm/core/transport/reorder/nlsolvers.h>
#include <opm/core/transport/reorder/twophase.h> #include <opm/core/transport/reorder/twophase.hpp>
#include <opm/core/transport/reorder/twophasetransport.hpp> #include <opm/core/transport/reorder/twophasetransport.hpp>
#define print printf #define print printf