Fix property method calls.

Cell argument can not be null for BlackoilPropertiesFromDeck class.
This commit is contained in:
Atgeirr Flø Rasmussen 2015-03-23 16:19:40 +01:00
parent a77f681999
commit 2d534f0536

View File

@ -180,11 +180,11 @@ namespace Opm
const double surfvol[2][2] = { { 1.0, 0.0 }, const double surfvol[2][2] = { { 1.0, 0.0 },
{ 0.0, 1.0 } }; { 0.0, 1.0 } };
// We do not handle multi-region PVT/EQUIL at this point. // We do not handle multi-region PVT/EQUIL at this point.
const int* cells = 0; const int cell = 0;
double A[4] = { 0.0 }; double A[4] = { 0.0 };
props_.matrix(1, &pressure, &temperature, surfvol[phase], cells, A, 0); props_.matrix(1, &pressure, &temperature, surfvol[phase], &cell, A, 0);
double rho[2] = { 0.0 }; double rho[2] = { 0.0 };
props_.density(1, A, cells, rho); props_.density(1, A, &cell, rho);
return rho[phase]; return rho[phase];
} }
}; };
@ -903,7 +903,10 @@ namespace Opm
computeSaturation(props,state); computeSaturation(props,state);
} }
else { else {
OPM_THROW(std::runtime_error, "Temporarily, we require the RS or the RV field."); state.gasoilratio() = std::vector<double>(number_of_cells, 0.0);
state.rv() = std::vector<double>(number_of_cells, 0.0);
initBlackoilSurfvolUsingRSorRV(number_of_cells, props, state);
computeSaturation(props,state);
} }
} }