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

Merge pull request #2072 from alfbr/new-line

Browse Source 
Added newline where natural.
This commit is contained in:
Joakim Hove 2020-11-02 16:40:13 +01:00 committed by GitHub
commit 30bbee6e69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/opm/parser/eclipse/EclipseState/EclipseState.cpp
View File

@ -232,7 +232,7 @@ namespace Opm {
void EclipseState::setMULTFLT(const DeckSection& section) { void EclipseState::setMULTFLT(const DeckSection& section) {
for (size_t index=0; index < section.count("MULTFLT"); index++) { for (size_t index=0; index < section.count("MULTFLT"); index++) {
const auto& faultsKeyword = section.getKeyword("MULTFLT" , index); const auto& faultsKeyword = section.getKeyword("MULTFLT" , index);
OpmLog::info(OpmInputError::format("Applying {keyword} in {file} line {line}", faultsKeyword.location())); OpmLog::info(OpmInputError::format("\nApplying {keyword} in {file} line {line}", faultsKeyword.location()));
InfoLogger logger("MULTFLT",3); InfoLogger logger("MULTFLT",3);
for (auto iter = faultsKeyword.begin(); iter != faultsKeyword.end(); ++iter) { for (auto iter = faultsKeyword.begin(); iter != faultsKeyword.end(); ++iter) {
const auto& faultRecord = *iter; const auto& faultRecord = *iter;

14
src/opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp
View File

@ -328,7 +328,7 @@ EclipseGrid::EclipseGrid(const Deck& deck, const int * actnum)
} }
void EclipseGrid::initGridFromEGridFile(Opm::EclIO::EclFile& egridfile, std::string fileName){ void EclipseGrid::initGridFromEGridFile(Opm::EclIO::EclFile& egridfile, std::string fileName){
OpmLog::info(fmt::format("Creating grid from: {} ", fileName)); OpmLog::info(fmt::format("\nCreating grid from: {} ", fileName));
if (!egridfile.hasKey("GRIDHEAD")) { if (!egridfile.hasKey("GRIDHEAD")) {
throw std::invalid_argument("file: " + fileName + " is not a valid egrid file, GRIDHEAD not found"); throw std::invalid_argument("file: " + fileName + " is not a valid egrid file, GRIDHEAD not found");
@ -513,7 +513,7 @@ EclipseGrid::EclipseGrid(const Deck& deck, const int * actnum)
} }
void EclipseGrid::initDVDEPTHZGrid(const Deck& deck) { void EclipseGrid::initDVDEPTHZGrid(const Deck& deck) {
OpmLog::info("Creating grid from keywords DXV, DYV, DZV and DEPTHZ"); OpmLog::info(fmt::format("\nCreating grid from keywords DXV, DYV, DZV and DEPTHZ"));
const std::vector<double>& DXV = deck.getKeyword<ParserKeywords::DXV>().getSIDoubleData(); const std::vector<double>& DXV = deck.getKeyword<ParserKeywords::DXV>().getSIDoubleData();
const std::vector<double>& DYV = deck.getKeyword<ParserKeywords::DYV>().getSIDoubleData(); const std::vector<double>& DYV = deck.getKeyword<ParserKeywords::DYV>().getSIDoubleData();
const std::vector<double>& DZV = deck.getKeyword<ParserKeywords::DZV>().getSIDoubleData(); const std::vector<double>& DZV = deck.getKeyword<ParserKeywords::DZV>().getSIDoubleData();
@ -535,7 +535,7 @@ EclipseGrid::EclipseGrid(const Deck& deck, const int * actnum)
} }
void EclipseGrid::initDTOPSGrid(const Deck& deck) { void EclipseGrid::initDTOPSGrid(const Deck& deck) {
OpmLog::info("Creating grid from keywords DX, DY, DZ and TOPS"); OpmLog::info(fmt::format("\nCreating grid from keywords DX, DY, DZ and TOPS"));
std::vector<double> DX = EclipseGrid::createDVector( this->getNXYZ(), 0 , "DX" , "DXV" , deck); std::vector<double> DX = EclipseGrid::createDVector( this->getNXYZ(), 0 , "DX" , "DXV" , deck);
std::vector<double> DY = EclipseGrid::createDVector( this->getNXYZ(), 1 , "DY" , "DYV" , deck); std::vector<double> DY = EclipseGrid::createDVector( this->getNXYZ(), 1 , "DY" , "DYV" , deck);
@ -953,7 +953,7 @@ EclipseGrid::EclipseGrid(const Deck& deck, const int * actnum)
const std::vector<double>& dthetav = deck.getKeyword<ParserKeywords::DTHETAV>().getSIDoubleData(); const std::vector<double>& dthetav = deck.getKeyword<ParserKeywords::DTHETAV>().getSIDoubleData();
const std::vector<double>& dzv = deck.getKeyword<ParserKeywords::DZV>().getSIDoubleData(); const std::vector<double>& dzv = deck.getKeyword<ParserKeywords::DZV>().getSIDoubleData();
const std::vector<double>& tops = deck.getKeyword<ParserKeywords::TOPS>().getSIDoubleData(); const std::vector<double>& tops = deck.getKeyword<ParserKeywords::TOPS>().getSIDoubleData();
OpmLog::info("Creating cylindrical grid from keywords DRV, DTHETAV, DZV and TOPS"); OpmLog::info(fmt::format("\nCreating cylindrical grid from keywords DRV, DTHETAV, DZV and TOPS"));
if (drv.size() != this->getNX()) if (drv.size() != this->getNX())
throw std::invalid_argument("DRV keyword should have exactly " + std::to_string( this->getNX() ) + " elements"); throw std::invalid_argument("DRV keyword should have exactly " + std::to_string( this->getNX() ) + " elements");
@ -1084,16 +1084,16 @@ EclipseGrid::EclipseGrid(const Deck& deck, const int * actnum)
std::vector<int> actnumVector; std::vector<int> actnumVector;
if (deck.hasKeyword<ParserKeywords::ACTNUM>()) { if (deck.hasKeyword<ParserKeywords::ACTNUM>()) {
const auto& actnumKeyword = deck.getKeyword<ParserKeywords::ACTNUM>(); const auto& actnumKeyword = deck.getKeyword<ParserKeywords::ACTNUM>();
actnumVector = actnumKeyword.getIntData(); actnumVector = actnumKeyword.getIntData();
if (actnumVector.size() != this->getCartesianSize()) if (actnumVector.size() != this->getCartesianSize())
throw std::invalid_argument("ACTNUM vector has wrong size"); throw std::invalid_argument("ACTNUM vector has wrong size");
actnum = actnumVector.data(); actnum = actnumVector.data();
OpmLog::info("Creating cornerpoint grid from keywords ZCORN, COORD and ACTNUM"); OpmLog::info(fmt::format("\nCreating cornerpoint grid from keywords ZCORN, COORD and ACTNUM"));
} else } else
OpmLog::info("Creating cornerpoint grid from keywords ZCORN and COORD"); OpmLog::info(fmt::format("\nCreating cornerpoint grid from keywords ZCORN and COORD"));
initCornerPointGrid( coord , zcorn, actnum, nullptr ); initCornerPointGrid( coord , zcorn, actnum, nullptr );
} }

2
src/opm/parser/eclipse/EclipseState/Grid/FaultCollection.cpp
View File

@ -49,7 +49,7 @@ namespace Opm {
for (auto keyword_iter = faultKeywords.begin(); keyword_iter != faultKeywords.end(); ++keyword_iter) { for (auto keyword_iter = faultKeywords.begin(); keyword_iter != faultKeywords.end(); ++keyword_iter) {
const auto& faultsKeyword = *keyword_iter; const auto& faultsKeyword = *keyword_iter;
OpmLog::info(OpmInputError::format("Loading faults from {keyword} in {file} line {line}", faultsKeyword->location())); OpmLog::info(OpmInputError::format("\nLoading faults from {keyword} in {file} line {line}", faultsKeyword->location()));
for (auto iter = faultsKeyword->begin(); iter != faultsKeyword->end(); ++iter) { for (auto iter = faultsKeyword->begin(); iter != faultsKeyword->end(); ++iter) {
const auto& faultRecord = *iter; const auto& faultRecord = *iter;

2
src/opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp
View File

@ -389,7 +389,7 @@ private:
const auto& schedule_keyword = section.getKeyword<ParserKeywords::SCHEDULE>(); const auto& schedule_keyword = section.getKeyword<ParserKeywords::SCHEDULE>();
const auto& location = schedule_keyword.location(); const auto& location = schedule_keyword.location();
current_file = location.filename; current_file = location.filename;
logger.info(fmt::format("Processing dynamic information from\n{} line {}", current_file, location.lineno)); logger.info(fmt::format("\nProcessing dynamic information from\n{} line {}", current_file, location.lineno));
if (restart_skip) if (restart_skip)
logger.info(fmt::format("This is a restarted run - skipping until report step {} at {}", time_map.restart_offset(), Schedule::formatDate(time_map.restart_time()))); logger.info(fmt::format("This is a restarted run - skipping until report step {} at {}", time_map.restart_offset(), Schedule::formatDate(time_map.restart_time())));

2
src/opm/parser/eclipse/EclipseState/Schedule/VFPProdTable.cpp
View File

@ -413,7 +413,7 @@ void VFPProdTable::check(const DeckKeyword& keyword, const double table_scaling_
const auto& location = keyword.location(); const auto& location = keyword.location();
OpmLog::warning(fmt::format("VFP table {0} has BHP versus THP not increasing in keyword VFPPROD.\n" OpmLog::warning(fmt::format("VFP table {0} has BHP versus THP not increasing in keyword VFPPROD.\n"
"In {1} line {2}\n" "In {1} line {2}\n"
"This may cause convergence issues due to switching between BHP and THP control.", "This may cause convergence issues due to switching between BHP and THP control.\n",
m_table_num, m_table_num,
location.filename, location.filename,
location.lineno)); location.lineno));

2
src/opm/parser/eclipse/EclipseState/TracerConfig.cpp
View File

@ -51,7 +51,7 @@ TracerConfig::TracerConfig(const UnitSystem& unit_system, const Deck& deck)
using TR = ParserKeywords::TRACER; using TR = ParserKeywords::TRACER;
if (deck.hasKeyword<TR>()) { if (deck.hasKeyword<TR>()) {
const auto& keyword = deck.getKeyword<TR>(); const auto& keyword = deck.getKeyword<TR>();
OpmLog::info( keyword.location().format("Initializing tracers from {keyword} in {file} line {line}") ); OpmLog::info( keyword.location().format("\nInitializing tracers from {keyword} in {file} line {line}") );
InfoLogger logger("Tracer tables", 3); InfoLogger logger("Tracer tables", 3);
for (const auto& record : keyword) { for (const auto& record : keyword) {
const auto& name = record.getItem<TR::NAME>().get<std::string>(0); const auto& name = record.getItem<TR::NAME>().get<std::string>(0);