use the infrastructural code using its new locations

This commit is contained in:
Andreas Lauser
2015-04-28 11:58:21 +02:00
parent d80fed167f
commit 216508ef13
55 changed files with 274 additions and 78 deletions

View File

@@ -38,7 +38,7 @@
#include <opm/material/fluidmatrixinteractions/MaterialTraits.hpp>
#include <opm/material/heatconduction/Somerton.hpp>
#include <opm/material/binarycoefficients/Brine_CO2.hpp>
#include <opm/material/UniformTabulated2DFunction.hpp>
#include <opm/material/common/UniformTabulated2DFunction.hpp>
#include <dune/grid/yaspgrid.hh>
#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
@@ -60,7 +60,7 @@ namespace Co2Injection {
}
} // namespace Ewoms
namespace Opm {
namespace Ewoms {
namespace Properties {
NEW_TYPE_TAG(Co2InjectionBaseProblem);
@@ -165,7 +165,7 @@ SET_SCALAR_PROP(Co2InjectionBaseProblem, InitialTimeStepSize, 250);
// The default DGF file to load
SET_STRING_PROP(Co2InjectionBaseProblem, GridFile, "data/co2injection.dgf");
} // namespace Properties
} // namespace Opm
} // namespace Ewoms
namespace Ewoms {
/*!