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

continued restructuring.

Browse Source
This commit is contained in:
Bernd Flemisch 2010-06-24 06:28:17 +00:00 committed by Andreas Lauser
parent 627ed018e4
commit 024955b520
5 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
examples/Makefile.am
View File

@ -2,8 +2,7 @@
NORMALTESTS = tutorial_decoupled tutorial_coupled NORMALTESTS = tutorial_decoupled tutorial_coupled
EXTRA_DIST=CMakeLists.txt results/*/*/*.vtu EXTRA_DIST=CMakeLists.txt results/*/*/*.vtu
noinst_HEADERS= tutorial_soilproperties_decoupled.hh \ noinst_HEADERS= tutorialspatialparameters_decoupled.hh tutorialproblem_decoupled.hh tutorialspatialparameters_coupled.hh tutorialproblem_coupled.hh
tutorialproblem_decoupled.hh
# list of tests to run # list of tests to run
#TESTS = $(NORMALTESTS) #TESTS = $(NORMALTESTS)
@ -12,12 +11,12 @@ noinst_HEADERS= tutorial_soilproperties_decoupled.hh \
bin_PROGRAMS = $(NORMALTESTS) bin_PROGRAMS = $(NORMALTESTS)
tutorial_decoupleddir = $(datadir)/dumux/tutorial tutorial_decoupleddir = $(datadir)/dumux/tutorial
tutorial_decoupled_HEADERS = tutorial_soilproperties_decoupled.hh \ tutorial_decoupled_HEADERS = tutorialspatialparameters_decoupled.hh \
tutorialproblem_decoupled.hh tutorialproblem_decoupled.hh
tutorial_decoupled_SOURCES = tutorial_decoupled.cc tutorial_decoupled_SOURCES = tutorial_decoupled.cc
tutorial_decoupled_DATA = $(tutorial_decoupled_SOURCES) tutorial_decoupled_DATA = $(tutorial_decoupled_SOURCES)
tutorial_coupleddir = $(datadir)/dumux/tutorial tutorial_coupleddir = $(datadir)/dumux/tutorial
tutorial_coupled_HEADERS = tutorialsoil_coupled.hh \ tutorial_coupled_HEADERS = tutorialspatialparameters_coupled.hh \
tutorialproblem_coupled.hh tutorialproblem_coupled.hh
tutorial_coupled_SOURCES = tutorial_coupled.cc tutorial_coupled_SOURCES = tutorial_coupled.cc
tutorial_coupled_DATA = $(tutorial_coupled_SOURCES) tutorial_coupled_DATA = $(tutorial_coupled_SOURCES)

2
examples/tutorialproblem_coupled.hh
View File

@ -18,7 +18,7 @@
#define DUMUX_TUTORIALPROBLEM_COUPLED_HH #define DUMUX_TUTORIALPROBLEM_COUPLED_HH
// fluid properties // fluid properties
#include <dumux/new_material/fluidsystems/h2o_n2_system.hh> #include <dumux/material/fluidsystems/h2o_n2_system.hh>
// the numerical model // the numerical model
#include <dumux/boxmodels/2p/2pboxmodel.hh> #include <dumux/boxmodels/2p/2pboxmodel.hh>

6
examples/tutorialproblem_decoupled.hh
View File

@ -25,9 +25,9 @@
#include <dune/grid/yaspgrid.hh> #include <dune/grid/yaspgrid.hh>
#include <dune/grid/sgrid.hh> #include <dune/grid/sgrid.hh>
#include <dumux/new_material/components/h2o.hh> #include <dumux/material/components/h2o.hh>
#include <dumux/new_material/components/oil.hh> #include <dumux/material/components/oil.hh>
#include <dumux/new_material/fluidsystems/liquidphase.hh> #include <dumux/material/fluidsystems/liquidphase.hh>
#include <dumux/decoupled/2p/impes/impesproblem2p.hh> #include <dumux/decoupled/2p/impes/impesproblem2p.hh>
#include <dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh> #include <dumux/decoupled/2p/diffusion/fv/fvvelocity2p.hh>

6
examples/tutorialspatialparameters_coupled.hh
View File

@ -17,11 +17,11 @@
#define TUTORIALSPATIALPARAMETERS_COUPLED_HH #define TUTORIALSPATIALPARAMETERS_COUPLED_HH
// include parent spatialparameters // include parent spatialparameters
#include <dumux/new_material/spatialparameters/boxspatialparameters.hh> #include <dumux/material/spatialparameters/boxspatialparameters.hh>
// include material laws // include material laws
#include <dumux/new_material/fluidmatrixinteractions/2p/linearmaterial.hh> /*@\label{tutorial-coupled:rawLawInclude}@*/ #include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh> /*@\label{tutorial-coupled:rawLawInclude}@*/
#include <dumux/new_material/fluidmatrixinteractions/2p/efftoabslaw.hh> #include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
namespace Dumux namespace Dumux
{ {

6
examples/tutorialspatialparameters_decoupled.hh
View File

@ -17,9 +17,9 @@
#define TUTORIALSPATIALPARAMETERS_DECOUPLED_HH #define TUTORIALSPATIALPARAMETERS_DECOUPLED_HH
//#include <dumux/new_material/fluidmatrixinteractions/2p/linearmaterial.hh> //#include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
#include <dumux/new_material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh> #include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
#include <dumux/new_material/fluidmatrixinteractions/2p/efftoabslaw.hh> #include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
namespace Dumux namespace Dumux
{ {