OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-02 12:36:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Removing some debugging output.

Browse Source
This commit is contained in:
Kai Bao 2014-05-22 20:56:22 +02:00
parent 95cd33185b
commit 5c409173b4
3 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/sim_fibo_ad.cpp
View File

@ -222,7 +222,6 @@ try
SimulatorReport episodeReport = simulator.run(simtimer, state, well_state);
++simtimer;
std::cin.ignore();
outputWriter.writeTimeStep(simtimer, state, well_state.basicWellState());
fullReport += episodeReport;

2
opm/autodiff/FullyImplicitBlackoilSolver.hpp
View File

@ -147,6 +147,7 @@ namespace Opm {
double dp_max_rel_;
double ds_max_;
double drs_max_rel_;
enum RelaxType relax_type_;
std::vector<ReservoirResidualQuant> rq_;
std::vector<PhasePresence> phaseCondition_;
@ -287,6 +288,7 @@ namespace Opm {
double dpMaxRel() const { return dp_max_rel_; }
double dsMax() const { return ds_max_; }
double drsMaxRel() const { return drs_max_rel_; }
enum RelaxType relaxType() const { return relax_type_; }
};
} // namespace Opm

37
opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp
View File

@ -232,9 +232,10 @@ namespace {
, ops_ (grid)
, wops_ (wells)
, grav_ (gravityOperator(grid_, ops_, geo_))
, dp_max_rel_ ( 1.0e9 )
, ds_max_ ( 0.2 )
, drs_max_rel_ ( 1.0e9 )
, dp_max_rel_ (1.0e9)
, ds_max_ (0.2)
, drs_max_rel_ (1.0e9)
, relax_type_ ( DAMPEN )
, rq_ (fluid.numPhases())
, phaseCondition_(AutoDiffGrid::numCells(grid))
, residual_ ( { std::vector<ADB>(fluid.numPhases(), ADB::null()),
@ -305,6 +306,7 @@ namespace {
bool isOscillate = false;
bool isStagnate = false;
const double relaxRelTol = 0.2;
const enum RelaxType relaxtype = relaxType();
while ((!converged) && (it < maxit)) {
V dx = solveJacobianSystem();
@ -315,13 +317,11 @@ namespace {
omega -= 0.1;
omega = std::max(omega, 0.5);
std::cout << " Oscillating behavior detected: Relaxation set to " << omega << std::endl;
// std::cin.ignore();
}
enum RelaxType relaxType = DAMPEN;
std::cout << " omega " << omega << std::endl;
stablizeNewton(dx, dxOld, omega, relaxType);
stablizeNewton(dx, dxOld, omega, relaxtype);
updateState(dx, x, xw);
@ -1715,21 +1715,6 @@ namespace {
int oscillatePhase = 0;
// bool oscillateWater = false;
// bool oscillateOil = false;
// bool oscillateGas = false;
// bool stagnateWater = true;
// bool stagnateOil = true;
// bool stagnateGas = true;
std::cout << " residual_history " << std::endl;
for( int i = it-2; i <=it; i++ ){
for ( int j = 0; j<5; j++ ){
std::cout << " " << residual_history[i][j];
}
std::cout << std::endl;
}
for (int phaseIdx= 0; phaseIdx < fluid_.numPhases(); ++ phaseIdx){
if (active_[phaseIdx]) {
double relChange1 = std::fabs((residual_history[it][phaseIdx] - residual_history[it - 2][phaseIdx]) /
@ -1741,25 +1726,17 @@ namespace {
double relChange3 = std::fabs((residual_history[it - 1][phaseIdx] - residual_history[it - 2][phaseIdx]) /
residual_history[it - 2][phaseIdx]);
stagnate = stagnate || (relChange3 > 1.e-3);
std::cout << " relChange1 " << relChange1 << " relChange2 " << relChange2
<< " relChange3 " << relChange3 << std::endl;
}
}
stagnate = !stagnate;
oscillate = (oscillatePhase > 1);
std::cout << " oscillate " << oscillate << " stagnate " << stagnate << std::endl;
std::cin.ignore();
}
template<class T>
void
FullyImplicitBlackoilSolver<T>::stablizeNewton( V &dx, V &dxOld, const double omega,
FullyImplicitBlackoilSolver<T>::stablizeNewton(V &dx, V &dxOld, const double omega,
const RelaxType relax_type) const {
const V tempDxOld = dxOld;
dxOld = dx;