OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-06 22:43:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'refs/pull/23/head' of github.com:OPM/ewoms

Browse Source 
* github.com:OPM/ewoms:
  adaptation works, needs revision.
  [dune-fem] using discrete function works.
  some further work on grid adaptivity
  dune.module: add dune-fem as a noptional dependency

Conflicts:
	ewoms/common/start.hh
	ewoms/io/basegridmanager.hh
	ewoms/parallel/mpihelper.hh
This commit is contained in:
Andreas Lauser 2015-08-06 11:15:48 +02:00
commit 4527aca9d3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/problems/lensproblem.hh
View File

@ -43,6 +43,8 @@
#include <dune/common/fvector.hh>
#include <dune/common/fmatrix.hh>
#include <dune/alugrid/dgf.hh>
#include <sstream>
#include <string>
#include <iostream>
@ -52,7 +54,7 @@ template <class TypeTag>
class LensProblem;
namespace Properties {
NEW_TYPE_TAG(LensBaseProblem, INHERITS_FROM(LensGridManager));
NEW_TYPE_TAG(LensBaseProblem);
// declare the properties specific for the lens problem
NEW_PROP_TAG(LensLowerLeftX);
@ -64,6 +66,7 @@ NEW_PROP_TAG(LensUpperRightZ);
// Set the problem property
SET_TYPE_PROP(LensBaseProblem, Problem, Ewoms::LensProblem<TypeTag>);
SET_TYPE_PROP(LensBaseProblem, Grid, Dune::ALUGrid<2,2,Dune::cube, Dune::nonconforming > );
// Set the wetting phase
SET_PROP(LensBaseProblem, WettingPhase)