From 2deeeef4e4c0b0d713205ecdb45d58622e21e1f4 Mon Sep 17 00:00:00 2001
From: Andreas Lauser <and@poware.org>
Date: Sat, 21 Dec 2013 19:17:03 +0100
Subject: [PATCH] really use the new parser

in the previous commit this was #if 0'ed...
---
 examples/sim_fibo_ad.cpp                 | 11 ++---------
 opm/autodiff/BlackoilPropsAdFromDeck.cpp |  3 +++
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/examples/sim_fibo_ad.cpp b/examples/sim_fibo_ad.cpp
index 8c20f9a4c..34b08268e 100644
--- a/examples/sim_fibo_ad.cpp
+++ b/examples/sim_fibo_ad.cpp
@@ -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.
diff --git a/opm/autodiff/BlackoilPropsAdFromDeck.cpp b/opm/autodiff/BlackoilPropsAdFromDeck.cpp
index 5962319e7..0bc2b9d45 100644
--- a/opm/autodiff/BlackoilPropsAdFromDeck.cpp
+++ b/opm/autodiff/BlackoilPropsAdFromDeck.cpp
@@ -140,6 +140,7 @@ namespace Opm
         if (init_rock){
             rock_.init(newParserDeck, grid);
         }
+
         const int region_number = 0;
 
         phase_usage_ = phaseUsageFromDeck(newParserDeck);
@@ -179,6 +180,7 @@ namespace Opm
                 props_[phase_usage_.phase_pos[Aqua]].reset(new SinglePvtConstCompr(0.5*Opm::prefix::centi*Opm::unit::Poise));
             }
         }
+
         // Oil PVT
         if (phase_usage_.phase_used[Liquid]) {
             if (newParserDeck->hasKeyword("PVDO")) {
@@ -213,6 +215,7 @@ namespace Opm
                 OPM_THROW(std::runtime_error, "Input is missing PVDO or PVTO\n");
             }
         }
+
         // Gas PVT
         if (phase_usage_.phase_used[Vapour]) {
             if (newParserDeck->hasKeyword("PVDG")) {