really use the new parser

in the previous commit this was #if 0'ed...
This commit is contained in:
Andreas Lauser committed 2014-02-14 17:56:08 +01:00
1 parent 7f485626a2
commit 2deeeef4e4
2 files changed
+5 -9

No files matched your search

+2 -9
View File
@@ -113,16 +113,9 @@ try
Opm::EclipseWriter outputWriter(param, share_obj(*deck), share_obj(*grid->c_grid()));
// Rock and fluid init
#if 0
std::cout << "new parser\n";
props.reset(new BlackoilPropertiesFromDeck(newParserDeck, *grid->c_grid(), param));
new_props.reset(new BlackoilPropsAdFromDeck(newParserDeck, *grid->c_grid()));
#else
std::cout << "old parser\n";
props.reset(new BlackoilPropertiesFromDeck(*deck, *grid->c_grid(), param));
new_props.reset(new BlackoilPropsAdFromDeck(*deck, *grid->c_grid()));
#endif
new_props.reset(new BlackoilPropsAdFromDeck(newParserDeck, *grid->c_grid()));
// check_well_controls = param.getDefault("check_well_controls", false);
// max_well_control_iterations = param.getDefault("max_well_control_iterations", 10);
// Rock compressibility.