OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #676 from pgdr/nnc-simple-fixup

Browse Source 
The getNNC API in Parser changed; remove *
This commit is contained in:
Pål Grønås Drange 2016-05-04 08:57:04 +02:00
commit e02927dbf5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/autodiff/FlowMain.hpp
View File

@ -198,7 +198,7 @@ namespace Opm
parameter::ParameterGroup param_; parameter::ParameterGroup param_;
// setupOutput() // setupOutput()
bool output_to_files_ = false; bool output_to_files_ = false;
std::string output_dir_ = std::string("output"); std::string output_dir_ = std::string(".");
// readDeckInput() // readDeckInput()
std::shared_ptr<const Deck> deck_; std::shared_ptr<const Deck> deck_;
std::shared_ptr<EclipseState> eclipse_state_; std::shared_ptr<EclipseState> eclipse_state_;
@ -339,7 +339,7 @@ namespace Opm
if (output_to_files_) { if (output_to_files_) {
// Create output directory if needed. // Create output directory if needed.
output_dir_ = output_dir_ =
param_.getDefault("output_dir", std::string("output")); param_.getDefault("output_dir", std::string("."));
boost::filesystem::path fpath(output_dir_); boost::filesystem::path fpath(output_dir_);
try { try {
create_directories(fpath); create_directories(fpath);

2
opm/autodiff/GeoProps.hpp
View File

@ -152,7 +152,7 @@ namespace Opm
// Handle NNCs // Handle NNCs
if (eclState) { if (eclState) {
nnc_ = *(eclState->getNNC()); nnc_ = eclState->getNNC();
} }
// opmfil is hardcoded to be true. i.e the pinch processor is never used // opmfil is hardcoded to be true. i.e the pinch processor is never used