Remove unused code branch.

This commit is contained in:
Atgeirr Flø Rasmussen
2022-06-30 10:20:18 +02:00
parent 657f4f5b8e
commit 66a1c46413

View File

@@ -587,7 +587,7 @@ namespace Opm {
ebosSimulator_.model().invalidateAndUpdateIntensiveQuantities(/*timeIdx=*/0); ebosSimulator_.model().invalidateAndUpdateIntensiveQuantities(/*timeIdx=*/0);
} }
void updateIntensiveQuantity(const Problem& problem, void updateIntensiveQuantity(const Problem& problem,
SolutionVector& solution, SolutionVector& solution,
const BVector& dx, const BVector& dx,
@@ -595,35 +595,18 @@ namespace Opm {
{ {
auto& model = ebosSimulator_.model(); auto& model = ebosSimulator_.model();
auto& ebosNewtonMethod = model.newtonMethod(); auto& ebosNewtonMethod = model.newtonMethod();
if(false){ ebosNewtonMethod.update_(/*nextSolution*/solution,
if (!std::isfinite(dx.one_norm())) /*curSolution=*/solution,
throw NumericalIssue("Non-finite update!"); /*update=*/dx,
/*resid=*/dx); // the update routines of the black
size_t numGridDof = model.numGridDof(); // oil model do not care about the
for (unsigned dofIdx = 0; dofIdx < numGridDof; ++dofIdx) { // residual
ebosNewtonMethod.updatePrimaryVariables_(dofIdx, model.invalidateAndUpdateIntensiveQuantitiesSimple(problem,
solution[dofIdx], solution,
solution[dofIdx], /*timeIdx*/0);
dx[dofIdx],
dx[dofIdx]);
model.invalidateAndUpdateIntensiveSingleQuantitiesSimple(problem,
solution[dofIdx],
dofIdx,
/*timeIdx*/0);
}
}else{
ebosNewtonMethod.update_(/*nextSolution*/solution,
/*curSolution=*/solution,
/*update=*/dx,
/*resid=*/dx); // the update routines of the black
// oil model do not care about the
// residual
model.invalidateAndUpdateIntensiveQuantitiesSimple(problem,
solution,
/*timeIdx*/0);
}
} }
/// Apply an update to the primary variables. /// Apply an update to the primary variables.
void updateSolution(const BVector& dx) void updateSolution(const BVector& dx)
{ {