Merge branch 'master' into ert
Conflicts: Makefile.am configure.ac examples/Makefile.am opm/core/GridManager.cpp opm/core/eclipse/EclipseGridParser.cpp opm/core/grid/cpgpreprocess/preprocess.h tests/Makefile.am
This commit is contained in:
Atgeirr Flø Rasmussen committed
commit
00bbfa06a8
119 files changed
+7557
-2902
No files matched your search
+22
-16
@@ -1,27 +1,29 @@
|
||||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir) \
|
||||
$(BOOST_CPPFLAGS) \
|
||||
$(OPM_BOOST_CPPFLAGS) \
|
||||
$(ERT_CPPFLAGS)
|
||||
|
||||
AM_LDFLAGS = $(BOOST_LDFLAGS) $(ERT_LDFLAGS)
|
||||
AM_LDFLAGS = $(OPM_BOOST_LDFLAGS) $(ERT_LDFLAGS)
|
||||
|
||||
|
||||
LDADD = $(top_builddir)/libopmcore.la
|
||||
LDADD = $(top_builddir)/lib/libopmcore.la
|
||||
|
||||
|
||||
noinst_PROGRAMS = \
|
||||
bo_resprop_test \
|
||||
monotcubicinterpolator_test \
|
||||
param_test \
|
||||
sparsetable_test \
|
||||
sparsevector_test \
|
||||
test_cartgrid \
|
||||
test_column_extract \
|
||||
test_lapack \
|
||||
test_read_vag \
|
||||
test_readpolymer \
|
||||
test_sf2p \
|
||||
test_writeVtkData \
|
||||
noinst_PROGRAMS = \
|
||||
bo_resprop_test \
|
||||
monotcubicinterpolator_test \
|
||||
param_test \
|
||||
pvt_test \
|
||||
relperm_test \
|
||||
sparsetable_test \
|
||||
sparsevector_test \
|
||||
test_cartgrid \
|
||||
test_column_extract \
|
||||
test_lapack \
|
||||
test_read_vag \
|
||||
test_readpolymer \
|
||||
test_sf2p \
|
||||
test_writeVtkData \
|
||||
unit_test
|
||||
|
||||
|
||||
@@ -32,6 +34,10 @@ monotcubicinterpolator_test_SOURCES = monotcubicinterpolator_test.cpp
|
||||
param_test_SOURCES = param_test.cpp
|
||||
param_test_LDADD = $(LDADD) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
|
||||
|
||||
pvt_test_SOURCES = pvt_test.cpp
|
||||
|
||||
relperm_test_SOURCES = relperm_test.cpp
|
||||
|
||||
sparsetable_test_SOURCES = sparsetable_test.cpp
|
||||
sparsetable_test_LDADD = $(LDADD) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
|
||||
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
#include <opm/core/eclipse/EclipseGridParser.hpp>
|
||||
#include <opm/core/eclipse/EclipseGridInspector.hpp>
|
||||
#include <opm/core/fluid/BlackoilPropertiesFromDeck.hpp>
|
||||
#include <opm/core/grid.h>
|
||||
|
||||
#include <algorithm>
|
||||
#include <iostream>
|
||||
@@ -39,14 +40,10 @@ int main(int argc, char** argv)
|
||||
// Parser.
|
||||
std::string ecl_file = param.get<std::string>("filename");
|
||||
Opm::EclipseGridParser deck(ecl_file);
|
||||
Opm::EclipseGridInspector insp(deck);
|
||||
std::tr1::array<int, 3> gs = insp.gridSize();
|
||||
int num_cells = gs[0]*gs[1]*gs[2];
|
||||
std::vector<int> global_cell(num_cells);
|
||||
for (int i = 0; i < num_cells; ++i) {
|
||||
global_cell[i] = i;
|
||||
}
|
||||
Opm::BlackoilPropertiesFromDeck props(deck, global_cell);
|
||||
UnstructuredGrid grid;
|
||||
grid.number_of_cells = 1;
|
||||
grid.global_cell = NULL;
|
||||
Opm::BlackoilPropertiesFromDeck props(deck, grid, param);
|
||||
|
||||
const int n = 1;
|
||||
double p[n] = { 150e5 };
|
||||
|
||||
@@ -0,0 +1,146 @@
|
||||
/*
|
||||
Copyright 2012 SINTEF ICT, Applied Mathematics.
|
||||
|
||||
This file is part of the Open Porous Media project (OPM).
|
||||
|
||||
OPM is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
OPM is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with OPM. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#if HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif // HAVE_CONFIG_H
|
||||
|
||||
|
||||
#include <opm/core/utility/parameters/ParameterGroup.hpp>
|
||||
#include <opm/core/eclipse/EclipseGridParser.hpp>
|
||||
#include <opm/core/eclipse/EclipseGridInspector.hpp>
|
||||
#include <opm/core/fluid/BlackoilPropertiesFromDeck.hpp>
|
||||
#include <opm/core/grid.h>
|
||||
|
||||
#include <algorithm>
|
||||
#include <iostream>
|
||||
#include <iomanip>
|
||||
#include <iterator>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
using namespace std;
|
||||
// Parameters.
|
||||
Opm::parameter::ParameterGroup param(argc, argv);
|
||||
|
||||
// Parser.
|
||||
std::string ecl_file = param.get<std::string>("deck_filename");
|
||||
std::string input_file = param.get<std::string>("input_filename");
|
||||
std::string matrix_output = param.get<std::string>("matrix_output");
|
||||
std::string rs_output = param.get<std::string>("rs_output");
|
||||
std::string b_output = param.get<std::string>("b_output");
|
||||
std::string mu_output = param.get<std::string>("mu_output");
|
||||
Opm::EclipseGridParser deck(ecl_file);
|
||||
UnstructuredGrid grid;
|
||||
grid.number_of_cells = 1;
|
||||
grid.global_cell = NULL;
|
||||
grid.dimensions = 3;
|
||||
grid.cartdims[0] = 1;
|
||||
grid.cartdims[1] = 1;
|
||||
grid.cartdims[2] = 1;
|
||||
Opm::BlackoilPropertiesFromDeck props(deck, grid, param);
|
||||
Opm::BlackoilPvtProperties pvt;
|
||||
int samples = param.getDefault("dead_tab_size", 1025);
|
||||
pvt.init(deck, samples);
|
||||
|
||||
|
||||
const int n = 1;
|
||||
std::fstream inos(input_file.c_str());
|
||||
if(!inos.good()){
|
||||
std::cout << "Could not open :" << input_file << std::endl;
|
||||
exit(3);
|
||||
}
|
||||
std::fstream aos(matrix_output.c_str(), std::fstream::out | std::fstream::trunc);
|
||||
aos << setiosflags(ios::scientific) << setprecision(12);
|
||||
if(!(aos.good())){
|
||||
std::cout << "Could not open"<< matrix_output << std::endl;
|
||||
exit(3);
|
||||
}
|
||||
std::fstream bos(b_output.c_str(), std::fstream::out | std::fstream::trunc);
|
||||
bos << setiosflags(ios::scientific) << setprecision(12);
|
||||
if(!(bos.good())){
|
||||
std::cout << "Could not open"<< b_output << std::endl;
|
||||
exit(3);
|
||||
}
|
||||
std::fstream rsos(rs_output.c_str(), std::fstream::out | std::fstream::trunc);
|
||||
rsos << setiosflags(ios::scientific) << setprecision(12);
|
||||
if(!(rsos.good())){
|
||||
std::cout << "Could not open"<< rs_output << std::endl;
|
||||
exit(3);
|
||||
}
|
||||
std::fstream muos(mu_output.c_str(), std::fstream::out | std::fstream::trunc);
|
||||
if(!(muos.good())){
|
||||
std::cout << "Could not open"<< rs_output << std::endl;
|
||||
exit(3);
|
||||
}
|
||||
|
||||
|
||||
|
||||
const int np = props.numPhases();
|
||||
const int max_np = 3;
|
||||
if (np > max_np) {
|
||||
THROW("Max #phases is 3.");
|
||||
}
|
||||
while((inos.good()) && (!inos.eof())){
|
||||
double p[n];
|
||||
double z[max_np*n];
|
||||
int cells[n] = { 0 };
|
||||
inos >> p[0];
|
||||
for(int i=0; i < np; ++i){
|
||||
inos >> z[i];
|
||||
}
|
||||
|
||||
if(inos.good()){
|
||||
double A[max_np*max_np*n];
|
||||
double dA[max_np*max_np*n];
|
||||
props.matrix(n, p, z, cells, A, dA);
|
||||
std::copy(A, A + np*np*n, std::ostream_iterator<double>(aos, " "));
|
||||
std::copy(dA, dA + np*np*n, std::ostream_iterator<double>(aos, " "));
|
||||
aos << std::endl;
|
||||
double mu[max_np];
|
||||
//double dmu[max_np];//not implemented
|
||||
props.viscosity(n, p, z, cells, mu, 0);
|
||||
std::copy(mu, mu + np*n, std::ostream_iterator<double>(muos, " "));
|
||||
//std::copy(dmu, dmu + np*n, std::ostream_iterator<double>(muos, " "));
|
||||
aos << std::endl;
|
||||
|
||||
double b[max_np];
|
||||
double dbdp[max_np];
|
||||
pvt.dBdp(n, p, z, b, dbdp);
|
||||
std::copy(b, b + np*n, std::ostream_iterator<double>(bos, " "));
|
||||
std::copy(dbdp, dbdp + np*n, std::ostream_iterator<double>(bos, " "));
|
||||
bos << std::endl;
|
||||
|
||||
double rs[max_np];
|
||||
double drs[max_np];
|
||||
//pvt.R(n, p, z, rs);
|
||||
pvt.dRdp(n, p, z, rs,drs);
|
||||
std::copy(rs, rs + np*n, std::ostream_iterator<double>(rsos, " "));
|
||||
std::copy(drs, drs + np*n, std::ostream_iterator<double>(rsos, " "));
|
||||
rsos << std::endl;
|
||||
}
|
||||
}
|
||||
if (param.anyUnused()) {
|
||||
std::cout << "-------------------- Unused parameters: --------------------\n";
|
||||
param.displayUsage();
|
||||
std::cout << "----------------------------------------------------------------" << std::endl;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,97 @@
|
||||
/*
|
||||
Copyright 2012 SINTEF ICT, Applied Mathematics.
|
||||
|
||||
This file is part of the Open Porous Media project (OPM).
|
||||
|
||||
OPM is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
OPM is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with OPM. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
|
||||
#if HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif // HAVE_CONFIG_H
|
||||
|
||||
#include <opm/core/utility/parameters/ParameterGroup.hpp>
|
||||
#include <opm/core/eclipse/EclipseGridParser.hpp>
|
||||
#include <opm/core/eclipse/EclipseGridInspector.hpp>
|
||||
#include <opm/core/fluid/BlackoilPropertiesFromDeck.hpp>
|
||||
#include <opm/core/grid.h>
|
||||
|
||||
#include <algorithm>
|
||||
#include <iostream>
|
||||
#include <iterator>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <fstream>
|
||||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
// Parameters.
|
||||
Opm::parameter::ParameterGroup param(argc, argv);
|
||||
|
||||
// Parser.
|
||||
std::string ecl_file = param.get<std::string>("deck_filename");
|
||||
std::string input_file = param.get<std::string>("input_filename");
|
||||
std::string relperm_output = param.get<std::string>("relperm_output");
|
||||
//std::string relperm_output = param.get<std::string>("relperm_outout");
|
||||
Opm::EclipseGridParser deck(ecl_file);
|
||||
UnstructuredGrid grid;
|
||||
grid.number_of_cells = 1;
|
||||
grid.global_cell = NULL;
|
||||
grid.dimensions = 3;
|
||||
grid.cartdims[0] = 1;
|
||||
grid.cartdims[1] = 1;
|
||||
grid.cartdims[2] = 1;
|
||||
Opm::BlackoilPropertiesFromDeck props(deck, grid, param);
|
||||
|
||||
std::fstream inos(input_file.c_str());//, std::fstream::in);
|
||||
if(!inos.good()){
|
||||
std::cout << "Could not open :" << input_file << std::endl;
|
||||
exit(3);
|
||||
}
|
||||
std::fstream kros(relperm_output.c_str(), std::fstream::out | std::fstream::trunc);
|
||||
if(!kros.good()){
|
||||
std::cout << "Could not open :" << input_file << std::endl;
|
||||
exit(3);
|
||||
}
|
||||
const int np = props.numPhases();
|
||||
const int max_np = 3;
|
||||
if (np > max_np) {
|
||||
THROW("Max #phases is 3.");
|
||||
}
|
||||
while((inos.good()) && (!inos.eof())){
|
||||
double s[max_np];
|
||||
for(int i=0; i < np; ++i){
|
||||
inos >> s[i];
|
||||
}
|
||||
if(inos.good()){
|
||||
double kr[max_np];
|
||||
double dkr[max_np*max_np];
|
||||
int cell[1];
|
||||
cell[0]=1;
|
||||
props.relperm(1,s, cell, kr, dkr);
|
||||
std::copy(s, s + np, std::ostream_iterator<double>(kros, " "));
|
||||
kros << " ";
|
||||
std::copy(kr, kr + np, std::ostream_iterator<double>(kros, " "));
|
||||
kros << " ";
|
||||
std::copy(dkr, dkr + np*np, std::ostream_iterator<double>(kros, " "));
|
||||
kros << "\n";
|
||||
}
|
||||
}
|
||||
if (param.anyUnused()) {
|
||||
std::cout << "-------------------- Unused parameters: --------------------\n";
|
||||
param.displayUsage();
|
||||
std::cout << "----------------------------------------------------------------" << std::endl;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user