OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixes g++-8's problems with return type deduction (ALUGrid master).

Browse Source 
Fixes the following compile error in the tests for ALUGrid master.
Tested with DUNE 2.4-2.7
```
/home/mblatt/src/dune/opm-release-master/opm-models/tests/test_quadrature.cc: In function ‘void testTetrahedron()’:
/home/mblatt/src/dune/opm-release-master/opm-models/tests/test_quadrature.cc:191:32: error: unable to deduce ‘auto*’ from ‘Dune::ALU3dGridFactory< <template-parameter-1-1> >::createGrid() [with ALUGrid = Dune::ALUGrid<3, 3, (Dune::ALUGridElementType)0, (Dune::ALUGridRefinementType)1>; Dune::ALU3dGridFactory< <template-parameter-1-1> >::GridPtrType = Dune::ToUniquePtr<Dune::ALUGrid<3, 3, (Dune::ALUGridElementType)0, (Dune::ALUGridRefinementType)1> >]()’
     auto *grid = gf.createGrid();
                                ^
/home/mblatt/src/dune/opm-release-master/opm-models/tests/test_quadrature.cc:191:32: note:   mismatched types ‘auto*’ and ‘Dune::ToUniquePtr<Dune::ALUGrid<3, 3, (Dune::ALUGridElementType)0, (Dune::ALUGridRefinementType)1> >’
/home/mblatt/src/dune/opm-release-master/opm-models/tests/test_quadrature.cc:196:12: error: type ‘<type error>’ argument given to ‘delete’, expected pointer
     delete grid;
            ^~~~
/home/mblatt/src/dune/opm-release-master/opm-models/tests/test_quadrature.cc: In function ‘void testCube()’:
/home/mblatt/src/dune/opm-release-master/opm-models/tests/test_quadrature.cc:286:32: error: unable to deduce ‘auto*’ from ‘Dune::ALU3dGridFactory< <template-parameter-1-1> >::createGrid() [with ALUGrid = Dune::ALUGrid<3, 3, (Dune::ALUGridElementType)1, (Dune::ALUGridRefinementType)1>; Dune::ALU3dGridFactory< <template-parameter-1-1> >::GridPtrType = Dune::ToUniquePtr<Dune::ALUGrid<3, 3, (Dune::ALUGridElementType)1, (Dune::ALUGridRefinementType)1> >]()’
     auto *grid = gf.createGrid();
                                ^
/home/mblatt/src/dune/opm-release-master/opm-models/tests/test_quadrature.cc:286:32: note:   mismatched types ‘auto*’ and ‘Dune::ToUniquePtr<Dune::ALUGrid<3, 3, (Dune::ALUGridElementType)1, (Dune::ALUGridRefinementType)1> >’
/home/mblatt/src/dune/opm-release-master/opm-models/tests/test_quadrature.cc:291:12: error: type ‘<type error>’ argument given to ‘delete’, expected pointer
     delete grid;
            ^~~~
```
This commit is contained in:
Markus Blatt
2019-10-24 14:41:07 +02:00
parent 42e60438f8
commit f9c4f870c3
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/models/test_quadrature.cpp
View File

@@ -188,12 +188,10 @@ void testTetrahedron()
std::vector<unsigned int> v = { 0, 1, 2, 3 }; std::vector<unsigned int> v = { 0, 1, 2, 3 };
// in Dune >= 2.6 topologyIds seem to be opaque integers. WTF!? // in Dune >= 2.6 topologyIds seem to be opaque integers. WTF!?
gf.insertElement(Dune::GeometryType(/*topologyId=*/0, dim), v); gf.insertElement(Dune::GeometryType(/*topologyId=*/0, dim), v);
auto *grid = gf.createGrid(); const auto& grid = *gf.createGrid();
// write the sub-control volumes to a VTK file. // write the sub-control volumes to a VTK file.
writeTetrahedronSubControlVolumes(*grid); writeTetrahedronSubControlVolumes(grid);
delete grid;
#endif // HAVE_DUNE_ALUGRID #endif // HAVE_DUNE_ALUGRID
} }
@@ -283,12 +281,10 @@ void testCube()
std::vector<unsigned int> v = { 0, 1, 2, 3, 4, 5, 6, 7 }; std::vector<unsigned int> v = { 0, 1, 2, 3, 4, 5, 6, 7 };
// in Dune >= 2.6 topologyIds seem to be opaque integers. WTF!? // in Dune >= 2.6 topologyIds seem to be opaque integers. WTF!?
gf.insertElement(Dune::GeometryType((1 << dim) - 1, dim), v); gf.insertElement(Dune::GeometryType((1 << dim) - 1, dim), v);
auto *grid = gf.createGrid(); const auto& grid = *gf.createGrid();
// write the sub-control volumes to a VTK file. // write the sub-control volumes to a VTK file.
writeCubeSubControlVolumes(*grid); writeCubeSubControlVolumes(grid);
delete grid;
#endif // HAVE_DUNE_ALUGRID #endif // HAVE_DUNE_ALUGRID
} }