|
|
|
@ -87,7 +87,7 @@ namespace RunnerIO
|
|
|
|
std::cerr << "RunnerIO::readParamsBin: header read failed\n";
|
|
|
|
std::cerr << "RunnerIO::readParamsBin: header read failed\n";
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (magic != MAGIC || (ver != 1 && ver != 2))
|
|
|
|
if (magic != MAGIC || ver != 2)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
std::cerr << "RunnerIO::readParamsBin: magic/version mismatch\n";
|
|
|
|
std::cerr << "RunnerIO::readParamsBin: magic/version mismatch\n";
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
@ -98,12 +98,7 @@ namespace RunnerIO
|
|
|
|
if (!readDouble(fs, out.wellboreC)) return false;
|
|
|
|
if (!readDouble(fs, out.wellboreC)) return false;
|
|
|
|
if (!readDouble(fs, out.phi)) return false;
|
|
|
|
if (!readDouble(fs, out.phi)) return false;
|
|
|
|
if (!readDouble(fs, out.h)) return false;
|
|
|
|
if (!readDouble(fs, out.h)) return false;
|
|
|
|
out.hasCt = false;
|
|
|
|
|
|
|
|
out.Ct = 0.0;
|
|
|
|
|
|
|
|
if (ver >= 2) {
|
|
|
|
|
|
|
|
if (!readDouble(fs, out.Ct)) return false;
|
|
|
|
if (!readDouble(fs, out.Ct)) return false;
|
|
|
|
out.hasCt = true;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!readDouble(fs, out.Cf)) return false;
|
|
|
|
if (!readDouble(fs, out.Cf)) return false;
|
|
|
|
|
|
|
|
|
|
|
|
out.sectionIndex = 0;
|
|
|
|
out.sectionIndex = 0;
|
|
|
|
|