OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EclipseWriter: some minor white space changes

Browse Source
This commit is contained in:
Andreas Lauser 2014-07-14 13:53:27 +02:00
parent c6d3994722
commit bbd05ec67f
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
opm/core/io/eclipse/EclipseWriter.cpp
View File

@ -17,7 +17,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>. along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "config.h" #include "config.h"
#include "EclipseWriter.hpp" #include "EclipseWriter.hpp"
@ -172,8 +172,8 @@ void extractFromStripedData(std::vector<double> &data,
int ertPhaseMask(const PhaseUsage uses) int ertPhaseMask(const PhaseUsage uses)
{ {
return (uses.phase_used[BlackoilPhases::Liquid] ? ECL_OIL_PHASE : 0) return (uses.phase_used[BlackoilPhases::Liquid] ? ECL_OIL_PHASE : 0)
| (uses.phase_used[BlackoilPhases::Aqua] ? ECL_WATER_PHASE : 0) | (uses.phase_used[BlackoilPhases::Aqua] ? ECL_WATER_PHASE : 0)
| (uses.phase_used[BlackoilPhases::Vapour] ? ECL_GAS_PHASE : 0); | (uses.phase_used[BlackoilPhases::Vapour] ? ECL_GAS_PHASE : 0);
} }
/** /**
@ -190,13 +190,13 @@ public:
/// Initialization from double-precision array. /// Initialization from double-precision array.
Keyword(const std::string& name, Keyword(const std::string& name,
const std::vector<double>& data) const std::vector<double>& data)
: ertHandle_(0) : ertHandle_(0)
{ set(name, data); } { set(name, data); }
/// Initialization from double-precision array. /// Initialization from double-precision array.
Keyword(const std::string& name, Keyword(const std::string& name,
const std::vector<int>& data) const std::vector<int>& data)
: ertHandle_(0) : ertHandle_(0)
{ set(name, data); } { set(name, data); }
@ -498,8 +498,8 @@ public:
* Save the grid in an .EGRID file. * Save the grid in an .EGRID file.
*/ */
void write(const std::string& outputDir, void write(const std::string& outputDir,
const std::string& baseName, const std::string& baseName,
int reportStepIdx) int reportStepIdx)
{ {
FileName fileNameHandle(outputDir, FileName fileNameHandle(outputDir,
baseName, baseName,
@ -797,7 +797,7 @@ public:
{ } { }
virtual double update(const SimulatorTimer& /*timer*/, virtual double update(const SimulatorTimer& /*timer*/,
const WellState& wellState) const WellState& wellState)
{ {
return bhp(wellState); return bhp(wellState);
} }
@ -909,17 +909,17 @@ void EclipseWriter::writeInit(const SimulatorTimer &timer)
if (deck_->hasKeyword("PERMX")) { if (deck_->hasKeyword("PERMX")) {
auto data = EclipseWriterDetails::getAllSiDoubles(deck_->getKeyword("PERMX")); auto data = EclipseWriterDetails::getAllSiDoubles(deck_->getKeyword("PERMX"));
EclipseWriterDetails::convertUnit(data, EclipseWriterDetails::toMilliDarcy); EclipseWriterDetails::convertUnit(data, EclipseWriterDetails::toMilliDarcy);
fortio.writeKeyword ("PERMX", data); fortio.writeKeyword("PERMX", data);
} }
if (deck_->hasKeyword("PERMY")) { if (deck_->hasKeyword("PERMY")) {
auto data = EclipseWriterDetails::getAllSiDoubles(deck_->getKeyword("PERMY")); auto data = EclipseWriterDetails::getAllSiDoubles(deck_->getKeyword("PERMY"));
EclipseWriterDetails::convertUnit(data, EclipseWriterDetails::toMilliDarcy); EclipseWriterDetails::convertUnit(data, EclipseWriterDetails::toMilliDarcy);
fortio.writeKeyword ("PERMY", data); fortio.writeKeyword("PERMY", data);
} }
if (deck_->hasKeyword("PERMZ")) { if (deck_->hasKeyword("PERMZ")) {
auto data = EclipseWriterDetails::getAllSiDoubles(deck_->getKeyword("PERMZ")); auto data = EclipseWriterDetails::getAllSiDoubles(deck_->getKeyword("PERMZ"));
EclipseWriterDetails::convertUnit(data, EclipseWriterDetails::toMilliDarcy); EclipseWriterDetails::convertUnit(data, EclipseWriterDetails::toMilliDarcy);
fortio.writeKeyword ("PERMZ", data); fortio.writeKeyword("PERMZ", data);
} }
/* Create summary object (could not do it at construction time, /* Create summary object (could not do it at construction time,