Merge pull request #1265 from GitPaean/fixing_test_wellmodel

not using std::make_unique in test_wellmodel Closes #1264
OPM · Sep 4, 2017 · 0c61f63 · 0c61f63
2 parents 77f3bda + f982fae
commit 0c61f63
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/tests/test_wellmodel.cpp b/tests/test_wellmodel.cpp
@@ -77,7 +77,7 @@ struct SetupTest {
         Opm::ParseContext parse_context;
         Opm::Parser parser;
         auto deck = parser.parseFile("TESTWELLMODEL.DATA", parse_context);
-        ecl_state = std::make_unique<const Opm::EclipseState>(deck , parse_context);
+        ecl_state.reset(new Opm::EclipseState(deck , parse_context) );
 
         // Create grid.
         const std::vector<double>& porv =
@@ -96,17 +96,17 @@ struct SetupTest {
         current_timestep = 0;
 
         // Create wells.
-        wells_manager = std::make_unique<const Opm::WellsManager> (*ecl_state,
-                                                                   current_timestep,
-                                                                   Opm::UgGridHelpers::numCells(grid),
-                                                                   Opm::UgGridHelpers::globalCell(grid),
-                                                                   Opm::UgGridHelpers::cartDims(grid),
-                                                                   Opm::UgGridHelpers::dimensions(grid),
-                                                                   Opm::UgGridHelpers::cell2Faces(grid),
-                                                                   Opm::UgGridHelpers::beginFaceCentroids(grid),
-                                                                   dummy_dynamic_list,
-                                                                   false,
-                                                                   std::unordered_set<std::string>());
+        wells_manager.reset(new Opm::WellsManager(*ecl_state,
+                                                  current_timestep,
+                                                  Opm::UgGridHelpers::numCells(grid),
+                                                  Opm::UgGridHelpers::globalCell(grid),
+                                                  Opm::UgGridHelpers::cartDims(grid),
+                                                  Opm::UgGridHelpers::dimensions(grid),
+                                                  Opm::UgGridHelpers::cell2Faces(grid),
+                                                  Opm::UgGridHelpers::beginFaceCentroids(grid),
+                                                  dummy_dynamic_list,
+                                                  false,
+                                                  std::unordered_set<std::string>() ) );
 
     };