OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix non-unit tests so that they compile again

Browse Source 
Account for header, namespace and API changes.
This commit is contained in:
Roland Kaufmann 2013-08-01 09:43:42 +02:00
parent 0e42c0e20c
commit f6bfb58d45
13 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/not-unit/bo_resprop_test.cpp
View File

@ -17,12 +17,11 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <opm/core/utility/parameters/ParameterGroup.hpp>
#include <opm/core/eclipse/EclipseGridParser.hpp>
#include <opm/core/eclipse/EclipseGridInspector.hpp>
#include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/io/eclipse/EclipseGridInspector.hpp>
#include <opm/core/props/BlackoilPropertiesFromDeck.hpp>
#include <opm/core/grid.h>

1
tests/not-unit/monotcubicinterpolator_test.cpp
View File

@ -35,6 +35,7 @@
#include "config.h"
#include <opm/core/utility/MonotCubicInterpolator.hpp>
using namespace Opm;
int main()
{

5
tests/not-unit/pvt_test.cpp
View File

@ -21,10 +21,9 @@
#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/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/io/eclipse/EclipseGridInspector.hpp>
#include <opm/core/props/BlackoilPropertiesFromDeck.hpp>
#include <opm/core/grid.h>

4
tests/not-unit/relperm_test.cpp
View File

@ -23,8 +23,8 @@
#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/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/io/eclipse/EclipseGridInspector.hpp>
#include <opm/core/props/BlackoilPropertiesFromDeck.hpp>
#include <opm/core/grid.h>

4
tests/not-unit/test_agmg.cpp
View File

@ -108,9 +108,7 @@ int main()
// Create solver for SPD system.
Opm::LinearSolverAGMG linsolve(100, 1e-9, true);
Opm::LinearSolverInterface::LinearSolverReport
rpt = linsolve.solve(A.get(), & b[0], & x[0]);
linsolve.solve(A.get(), & b[0], & x[0]);
double e = 0.0;
for (std::size_t i = 0; i < m; ++i) {

2
tests/not-unit/test_cartgrid.cpp
View File

@ -26,7 +26,7 @@
int main(void)
{
using namespace std;
struct UnstructuredGrid *g = create_grid_cart2d(2, 2);
struct UnstructuredGrid *g = create_grid_cart2d(2, 2, 1., 1.);
int i;
int k;
for (i = 0; i < g->number_of_cells; ++i) {

1
tests/not-unit/test_cfs_tpfa.c
View File

@ -7,7 +7,6 @@
#include <suitesparse/umfpack.h>
#include <opm/core/grid.h>
#include <opm/core/well.h>
#include <opm/core/linalg/sparse_sys.h>

2
tests/not-unit/test_ert.cpp
View File

@ -19,7 +19,7 @@
#include "config.h"
#include <opm/core/eclipse/EclipseGridParser.hpp>
#include <opm/core/io/eclipse/EclipseGridParser.hpp>
#include <opm/core/grid/GridManager.hpp>
#include <opm/core/grid/cart_grid.h>
#include <opm/core/grid.h>

8
tests/not-unit/test_jacsys.cpp
View File

@ -79,7 +79,7 @@ main() {
#endif
#if 0
#include <opm/core/transport/JacobianSystem.hpp>
#include <opm/core/transport/implicit/JacobianSystem.hpp>
//using namespace Opm::LinAlgSupport;
using namespace Opm::ImplicitTransportDefault;
@ -104,9 +104,9 @@ main() {
#if 1
#include <opm/core/linalg/sparse_sys.h>
#include <opm/core/transport/JacobianSystem.hpp>
#include <opm/core/transport/CSRMatrixBlockAssembler.hpp>
#include <opm/core/transport/CSRMatrixUmfpackSolver.hpp>
#include <opm/core/transport/implicit/JacobianSystem.hpp>
#include <opm/core/transport/implicit/CSRMatrixBlockAssembler.hpp>
#include <opm/core/transport/implicit/CSRMatrixUmfpackSolver.hpp>
using namespace Opm::ImplicitTransportDefault;

2
tests/not-unit/test_read_grid.c
View File

@ -16,7 +16,7 @@ main(void)
struct UnstructuredGrid *G1, *G2;
G1 = read_grid("cart_grid_2d.txt");
G2 = create_grid_cart2d(2, 2);
G2 = create_grid_cart2d(2, 2, 1., 1.);
destroy_grid(G2);
destroy_grid(G1);

4
tests/not-unit/test_read_vag.cpp
View File

@ -36,14 +36,14 @@
#include <fstream>
#include <string>
#include <cstdlib>
#include <opm/core/vag_format/vag.hpp>
#include <opm/core/io/vag/vag.hpp>
#include <opm/core/grid.h>
//#include "../config.h"
/* test reading of vag grid format */
int main(int argc, char** argv)
{
using namespace std;
using namespace OPM;
using namespace Opm;
std::string filename;
if (argc == 2) {
filename = argv[1];

2
tests/not-unit/test_readpolymer.cpp
View File

@ -14,7 +14,7 @@
#include "config.h"
#endif
#include <opm/core/eclipse/EclipseGridParser.hpp>
#include <opm/core/io/eclipse/EclipseGridParser.hpp>
// Test program for reading Eclipse Polymer keywords.

2
tests/not-unit/test_writeVtkData.cpp
View File

@ -18,7 +18,7 @@
*/
#include "config.h"
#include <opm/core/utility/writeVtkData.hpp>
#include <opm/core/io/vtk/writeVtkData.hpp>
#include <fstream>
#include <array>