OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-08-19 02:24:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PR/ewoms-can-use-dune-fem' into HEAD

Browse Source
This commit is contained in:
Robert Kloefkorn
2015-08-06 12:42:54 +02:00
parent ff9e5ba4cf 501db847cd
commit 565c10683d
65 changed files with 132 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/co2injection_flash_ecfv.cpp
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
examples/co2injection_flash_ni_ecfv.cpp
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
examples/co2injection_flash_ni_vcfv.cpp
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
examples/co2injection_flash_vcfv.cpp
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
examples/co2injection_immiscible_ecfv.cpp
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
examples/co2injection_immiscible_ni_ecfv.cpp
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
examples/co2injection_immiscible_ni_vcfv.cpp
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
examples/co2injection_immiscible_vcfv.cpp
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
examples/co2injection_ncp_ecfv.cpp
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
examples/co2injection_ncp_ni_ecfv.cpp
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
examples/co2injection_ncp_ni_vcfv.cpp
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
examples/co2injection_ncp_vcfv.cpp
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
examples/co2injection_pvs_ecfv.cpp
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2009-2013 by Andreas Lauser
examples/co2injection_pvs_ni_ecfv.cpp
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
examples/co2injection_pvs_ni_vcfv.cpp
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
examples/co2injection_pvs_vcfv.cpp
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2009-2013 by Andreas Lauser
examples/cuvette_pvs.cpp
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
examples/diffusion_flash.cpp
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
examples/diffusion_ncp.cpp
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
examples/diffusion_pvs.cpp
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
examples/fracture_discretefracture.cpp
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
examples/groundwater_immiscible.cpp
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
examples/infiltration_pvs.cpp
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
examples/lens_richards_ecfv.cpp
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2008-2013 by Andreas Lauser
examples/lens_richards_vcfv.cpp
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2008-2013 by Andreas Lauser
examples/obstacle_immiscible.cpp
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2011-2013 by Andreas Lauser
examples/obstacle_ncp.cpp
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2011-2013 by Andreas Lauser
examples/obstacle_pvs.cpp
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2011-2013 by Andreas Lauser
examples/outflow_pvs.cpp
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2008-2013 by Andreas Lauser
examples/problems/co2injectionflash.hh
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2011-2013 by Andreas Lauser
examples/problems/co2injectionproblem.hh
+4 -2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2008-2013 by Andreas Lauser
@@ -52,15 +54,15 @@
#include <string>
namespace Ewoms {
//! \cond SKIP_THIS
template <class TypeTag>
class Co2InjectionProblem;
namespace Co2Injection {
#include <opm/material/components/co2tables.inc>
}
} // namespace Ewoms
//! \endcond
namespace Ewoms {
namespace Properties {
NEW_TYPE_TAG(Co2InjectionBaseProblem);
examples/problems/cuvetteproblem.hh
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2008-2013 by Andreas Lauser
Copyright (C) 2012 by Holger Class
examples/problems/diffusionproblem.hh
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2009-2013 by Andreas Lauser
examples/problems/fingergridmanager.hh
+2 -1
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
@@ -23,7 +25,6 @@
#ifndef EWOMS_FINGER_GRID_MANAGER_HH
#define EWOMS_FINGER_GRID_MANAGER_HH
#include <ewoms/parallel/mpihelper.hh>
#include <ewoms/io/basegridmanager.hh>
#include <ewoms/common/propertysystem.hh>
#include <ewoms/common/parametersystem.hh>
examples/problems/fingerproblem.hh
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2008-2013 by Andreas Lauser
examples/problems/fractureproblem.hh
+2 -1
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2008-2013 by Andreas Lauser
@@ -24,7 +26,6 @@
#ifndef EWOMS_FRACTURE_PROBLEM_HH
#define EWOMS_FRACTURE_PROBLEM_HH
#include <ewoms/parallel/mpihelper.hh>
#include <ewoms/models/discretefracture/discretefracturemodel.hh>
#if HAVE_DUNE_ALUGRID
examples/problems/groundwaterproblem.hh
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2008-2013 by Andreas Lauser
examples/problems/infiltrationproblem.hh
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2008-2013 by Andreas Lauser
examples/problems/lensgridmanager.hh
+2 -1
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
@@ -23,7 +25,6 @@
#ifndef EWOMS_LENS_GRID_MANAGER_HH
#define EWOMS_LENS_GRID_MANAGER_HH
#include <ewoms/parallel/mpihelper.hh>
#include <ewoms/io/basegridmanager.hh>
#include <ewoms/common/propertysystem.hh>
#include <ewoms/common/parametersystem.hh>
examples/problems/lensproblem.hh
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2008-2013 by Andreas Lauser
examples/problems/navierstokestestproblem.hh
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
Copyright (C) 2012 by Klaus Mosthaf
examples/problems/obstacleproblem.hh
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2008-2013 by Andreas Lauser
examples/problems/outflowproblem.hh
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2008-2013 by Andreas Lauser
examples/problems/powerinjectionproblem.hh
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2008-2013 by Andreas Lauser
Copyright (C) 2012 by Klaus Mosthaf
examples/problems/reservoirproblem.hh
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2009-2013 by Andreas Lauser
Copyright (C) 2010 by Melanie Darcis
examples/problems/richardslensproblem.hh
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2008-2013 by Andreas Lauser
examples/problems/stokes2ctestproblem.hh
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2009-2013 by Andreas Lauser
examples/problems/stokesnitestproblem.hh
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2011-2013 by Andreas Lauser
examples/problems/stokestestproblem.hh
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
Copyright (C) 2012 by Klaus Mosthaf
examples/problems/waterairproblem.hh
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2008-2013 by Andreas Lauser
examples/tutorial1.cpp
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2009-2013 by Andreas Lauser
examples/tutorial1problem.hh
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2009-2013 by Andreas Lauser
Copyright (C) 2010 by Benjamin Faigle
examples/waterair_pvs_ni.cpp
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2009-2013 by Andreas Lauser
tests/finger_immiscible.cc
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
tests/lens_immiscible_ecfv.cc
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
tests/lens_immiscible_vcfv.cc
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
tests/models/test_propertysystem.cpp
+2
View File
@@ -1,5 +1,7 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*****************************************************************************
* Copyright (C) 2010-2012 by Andreas Lauser *
* *
tests/models/test_quadrature.cpp
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2009-2013 by Andreas Lauser
tests/powerinjection_darcy.cc
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
tests/powerinjection_forchheimer.cc
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
tests/reservoir_blackoil.cc
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
tests/test_navierstokes.cc
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
tests/test_stokes.cc
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser
tests/test_stokes2c.cc
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012 by Andreas Lauser
tests/test_stokesni.cc
+2
View File
@@ -1,3 +1,5 @@
// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// vi: set et ts=4 sw=4 sts=4:
/*
Copyright (C) 2012-2013 by Andreas Lauser