OilfieldToolsNet/opm-upscaling
4
0
Fork 0
mirror of https://github.com/OPM/opm-upscaling.git synced 2025-02-25 18:45:23 -06:00
Code Issues Packages Projects Releases Wiki Activity

changes to try to make upscaling work with implicit solver

Browse Source
This commit is contained in:
Halvor M. Nilsen
2011-10-12 13:18:48 +02:00
parent 746e84a3ce
commit 7e3ac791ae
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dune/upscaling/SteadyStateUpscalerImplicit.hpp
View File

@@ -59,8 +59,8 @@ namespace Dune
typedef UpscalerBase<Traits> Super;
typedef typename Super::permtensor_t permtensor_t;
//typedef typename UpscalerBase<Traits>::GridInterface GridInterface;
typedef typename UpscalerBase<Traits>::GridType GridInterface;
typedef typename UpscalerBase<Traits>::GridInterface GridInterface;
typedef typename UpscalerBase<Traits>::GridType GridType;
enum { Dimension = UpscalerBase<Traits>::Dimension };
// ------- Methods -------
@@ -97,7 +97,7 @@ namespace Dune
double lastSaturationUpscaled() const;
protected:
// ------- Typedefs -------
typedef typename Traits::template TransportSolver<GridInterface, typename Super::BCs>::Type TransportSolver;
typedef typename Traits::template TransportSolver<GridType, typename Super::BCs>::Type TransportSolver;
// ------- Methods -------
template <class FlowSol>

2
dune/upscaling/SteadyStateUpscalerImplicit_impl.hpp
View File

@@ -157,7 +157,7 @@ namespace Dune
if (flow_direction == 0) {
this->flow_solver_.init(this->ginterf_, this->res_prop_, gravity, this->bcond_);
}
transport_solver_.initObj(this->ginterf_, this->res_prop_, this->bcond_);
transport_solver_.initObj(this->grid_, this->res_prop_, this->bcond_);
// Run pressure solver.
this->flow_solver_.solve(this->res_prop_, saturation, this->bcond_, src,

6
dune/upscaling/test/Makefile.am
View File

@@ -11,8 +11,8 @@
check_PROGRAMS =
noinst_PROGRAMS = \
test_array \
steadystate_test
steadystate_test \
steadystate_test_implicit
AM_CPPFLAGS += $(DUNEMPICPPFLAGS) $(BOOST_CPPFLAGS) $(SUPERLU_CPPFLAGS)
@@ -29,7 +29,7 @@ test_array_SOURCES = test_array.cpp
steadystate_test_SOURCES = steadystate_test.cpp
#steadystate_test_implicit_SOURCES = steadystate_test_implicit.cpp
steadystate_test_implicit_SOURCES = steadystate_test_implicit.cpp
#aniso_steadystate_test_SOURCES = aniso_steadystate_test.cpp