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

Cleaning up debugging information.

Browse Source 
NewtonIterationBlackoilSimple.cpp
SimulatorFullyImplicitBlackoil_impl.hpp
This commit is contained in:
Kai Bao 2014-05-07 14:45:10 +02:00
parent 7bd73ac54e
commit be30504daa
2 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
opm/autodiff/NewtonIterationBlackoilSimple.cpp
View File

@ -16,15 +16,11 @@
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/>.
*/ */
#define PAEANDEBUG 1
#include <config.h> #include <config.h>
#include <opm/autodiff/NewtonIterationBlackoilSimple.hpp> #include <opm/autodiff/NewtonIterationBlackoilSimple.hpp>
#include <opm/autodiff/AutoDiffHelpers.hpp> #include <opm/autodiff/AutoDiffHelpers.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#if PAEANDEBUG
#include <fstream>
#endif
namespace Opm namespace Opm
{ {
@ -60,19 +56,6 @@ namespace Opm
= linsolver_.solve(matr.rows(), matr.nonZeros(), = linsolver_.solve(matr.rows(), matr.nonZeros(),
matr.outerIndexPtr(), matr.innerIndexPtr(), matr.valuePtr(), matr.outerIndexPtr(), matr.innerIndexPtr(), matr.valuePtr(),
total_residual.value().data(), dx.data()); total_residual.value().data(), dx.data());
#if PAEANDEBUG
std::ofstream filestream("matrix.out");
filestream << matr;
filestream.close();
std::ofstream filestream2("sol.out");
filestream2 << dx;
filestream2.close();
std::ofstream filestream3("r.out");
filestream3 << total_residual.value();
filestream3.close();
std::cout << " output the information for the last iteration " << std::endl;
// std::cin.ignore();
#endif
if (!rep.converged) { if (!rep.converged) {
OPM_THROW(std::runtime_error, OPM_THROW(std::runtime_error,
"FullyImplicitBlackoilSolver::solveJacobianSystem(): " "FullyImplicitBlackoilSolver::solveJacobianSystem(): "

12
opm/autodiff/SimulatorFullyImplicitBlackoil_impl.hpp
View File

@ -16,7 +16,6 @@
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/>.
*/ */
#define PAEANDEBUG 1
#include <opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp> #include <opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp>
#include <opm/autodiff/SimulatorFullyImplicitBlackoil.hpp> #include <opm/autodiff/SimulatorFullyImplicitBlackoil.hpp>
#include <opm/core/utility/parameters/ParameterGroup.hpp> #include <opm/core/utility/parameters/ParameterGroup.hpp>
@ -277,10 +276,6 @@ namespace Opm
outputWellStateMatlab(well_state,timer.currentStepNum(), output_dir_); outputWellStateMatlab(well_state,timer.currentStepNum(), output_dir_);
} }
// added by Paean
// std::cout << " output in simulator 1 " << std::endl;
// std::cin.ignore();
// added by Paean end
SimulatorReport sreport; SimulatorReport sreport;
@ -293,9 +288,6 @@ namespace Opm
// } // }
bool well_control_passed = !check_well_controls_; bool well_control_passed = !check_well_controls_;
#if PAEANDEBUG
std::cout << " well_control_passed " << well_control_passed << std::endl;
#endif
int well_control_iteration = 0; int well_control_iteration = 0;
do { do {
// Run solver. // Run solver.
@ -348,10 +340,6 @@ namespace Opm
outputWellStateMatlab(well_state,timer.currentStepNum(), output_dir_); outputWellStateMatlab(well_state,timer.currentStepNum(), output_dir_);
tstep_os.close(); tstep_os.close();
} }
// added by Paean
// std::cout << " output in simulator 2 " << std::endl;
// std::cin.ignore();
// added by Paean end
// advance to next timestep before reporting at this location // advance to next timestep before reporting at this location
// ++timer; // Commented out since this has temporarily moved to the main() function. // ++timer; // Commented out since this has temporarily moved to the main() function.