Merge from Atgeirr.

This commit is contained in:
Bård Skaflestad 2010-11-01 13:30:49 +01:00
commit 3f8ddf9699
2 changed files with 4 additions and 5 deletions

View File

@ -288,10 +288,6 @@ private:
// Gravity contributions.
std::vector<double> gpress_;
std::vector<double> gpress_omegaweighted_;
// Total mobilities.
std::vector<double> totmob_;
// Gravity coefficients (\omega = sum_{i = 1}^{num phases}f_i \rho_i[TODO: check this]).
std::vector<double> omega_;
};

View File

@ -2,7 +2,8 @@
libopmpressuredir = $(includedir)/opm/pressure
lib_LTLIBRARIES = libopmpressure.la
lib_LTLIBRARIES = libopmpressure.la
noinst_LTLIBRARIES = libopmpressure_noinst.la
libopmpressure_HEADERS = \
blas_lapack.h \
@ -49,5 +50,7 @@ sparse_sys.c \
trans_tpfa.c \
well.c
libopmpressure_noinst_la_SOURCES = $(libopmpressure_la_SOURCES)
## include $(top_srcdir)/am/global-rules