Merge branch 'master' of github.com:atgeirr/opm-upscaling

This commit is contained in:
Atgeirr Flø Rasmussen 2012-11-16 00:00:29 +01:00
commit 5dc9c471f3
2 changed files with 2 additions and 4 deletions

View File

@ -11,10 +11,6 @@
//==============================================================================
#pragma once
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <dune/common/fmatrix.hh>
#include <opm/core/eclipse/EclipseGridParser.hpp>
#include <dune/grid/common/mcmgmapper.hh>

View File

@ -13,6 +13,8 @@
# include "config.h"
#endif
#include <opm/core/utility/have_boost_redef.hpp>
#include <iostream>
#include <unistd.h>
#include <dune/common/exceptions.hh> // We use exceptions