From 6b750441bda7bcab732e25620878a7955678f93f Mon Sep 17 00:00:00 2001
From: Benjamin Faigle <benjamin.faigle@posteo.de>
Date: Tue, 1 Feb 2011 12:04:39 +0000
Subject: [PATCH] removed potentials from dec2p2c because it is not used and
access to the vectro incredibly slow for large domains
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@5146 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/decoupled/2p2c/fvpressure2p2c.hh | 13 -------------
dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh | 13 -------------
dumux/decoupled/2p2c/variableclass2p2c.hh | 5 ++++-
3 files changed, 4 insertions(+), 27 deletions(-)
diff --git a/dumux/decoupled/2p2c/fvpressure2p2c.hh b/dumux/decoupled/2p2c/fvpressure2p2c.hh
index 3239d00815..9bd3c5ba50 100644
--- a/dumux/decoupled/2p2c/fvpressure2p2c.hh
+++ b/dumux/decoupled/2p2c/fvpressure2p2c.hh
@@ -652,10 +652,6 @@ void FVPressure2P2C<TypeTag>::assemble(bool first)
potentialW += densityW * (unitDistVec * gravity);
potentialNW += densityNW * (unitDistVec * gravity);
- //store potentials for further calculations (velocity, saturation, ...)
- problem_.variables().potentialWetting(globalIdxI, isIndex) = potentialW;
- problem_.variables().potentialNonwetting(globalIdxI, isIndex) = potentialNW;
-
// initialize convenience shortcuts
Scalar lambdaW, lambdaN;
Scalar dV_w(0.), dV_n(0.); // dV_a = \sum_k \rho_a * dv/dC^k * X^k_a
@@ -883,10 +879,6 @@ void FVPressure2P2C<TypeTag>::assemble(bool first)
}
potentialW += densityW * (unitDistVec * gravity);
potentialNW += densityNW * (unitDistVec * gravity);
-
- //store potential gradients for further calculations
- problem_.variables().potentialWetting(globalIdxI, isIndex) = potentialW;
- problem_.variables().potentialNonwetting(globalIdxI, isIndex) = potentialNW;
} //end !first
//do the upwinding of the mobility depending on the phase potentials
@@ -960,11 +952,6 @@ void FVPressure2P2C<TypeTag>::assemble(bool first)
}
f_[globalIdxI] -= (J[wPhaseIdx] + J[nPhaseIdx]) * faceArea;
-
- //Assumes that the phases flow in the same direction at the neumann boundary, which is the direction of the total flux!!!
- //needed to determine the upwind direction in the saturation equation
- problem_.variables().potentialWetting(globalIdxI, isIndex) = J[wPhaseIdx];
- problem_.variables().potentialNonwetting(globalIdxI, isIndex) = J[nPhaseIdx];
}
}
} // end all intersections
diff --git a/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh b/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh
index d3042d9228..9addc165e8 100644
--- a/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh
+++ b/dumux/decoupled/2p2c/fvpressure2p2cmultiphysics.hh
@@ -669,10 +669,6 @@ void FVPressure2P2CMultiPhysics<TypeTag>::assemble(bool first)
potentialW += densityW * (unitDistVec * gravity);
potentialNW += densityNW * (unitDistVec * gravity);
- //store potentials for further calculations (velocity, saturation, ...)
- problem_.variables().potentialWetting(globalIdxI, isIndex) = potentialW;
- problem_.variables().potentialNonwetting(globalIdxI, isIndex) = potentialNW;
-
// initialize convenience shortcuts
Scalar lambdaW, lambdaN;
Scalar dV_w(0.), dV_n(0.); // dV_a = \sum_k \rho_a * dv/dC^k * X^k_a
@@ -917,10 +913,6 @@ void FVPressure2P2CMultiPhysics<TypeTag>::assemble(bool first)
potentialW += densityW * (unitDistVec * gravity);
potentialNW += densityNW * (unitDistVec * gravity);
- //store potential gradients for further calculations
- problem_.variables().potentialWetting(globalIdxI, isIndex) = potentialW;
- problem_.variables().potentialNonwetting(globalIdxI, isIndex) = potentialNW;
-
//do the upwinding of the mobility depending on the phase potentials
Scalar lambdaW, lambdaNW;
Scalar dV_w, dV_n; // gV_a weglassen, da dV/dc am Rand ortsunabhängig angenommen -> am rand nicht bestimmbar -> nur Randintegral ohne Gebietsintegral
@@ -1024,11 +1016,6 @@ void FVPressure2P2CMultiPhysics<TypeTag>::assemble(bool first)
}
f_[globalIdxI] -= (J[wPhaseIdx] + J[nPhaseIdx]) * faceArea;
-
- //Assumes that the phases flow in the same direction at the neumann boundary, which is the direction of the total flux!!!
- //needed to determine the upwind direction in the saturation equation
- problem_.variables().potentialWetting(globalIdxI, isIndex) = J[wPhaseIdx];
- problem_.variables().potentialNonwetting(globalIdxI, isIndex) = J[nPhaseIdx];
}
/*************************************************/
}
diff --git a/dumux/decoupled/2p2c/variableclass2p2c.hh b/dumux/decoupled/2p2c/variableclass2p2c.hh
index ee2f0894de..dcad9fb154 100644
--- a/dumux/decoupled/2p2c/variableclass2p2c.hh
+++ b/dumux/decoupled/2p2c/variableclass2p2c.hh
@@ -218,7 +218,10 @@ public:
ScalarSolutionType *saturation = writer.template createField<Scalar, 1> (size_);
*pressure = this->pressure();
*saturation = saturation_;
- writer.addCellData(pressure, "pressure");
+ if (GET_PROP_VALUE(TypeTag, PTAG(PressureFormulation)) == GET_PROP_TYPE(TypeTag, PTAG(TwoPIndices))::pressureW)
+ writer.addCellData(pressure, "pressure w-phase");
+ else
+ writer.addCellData(pressure, "pressure nw-phase");
writer.addCellData(saturation, "water saturation");
if(GET_PROP_VALUE(TypeTag, PTAG(EnableCapillarity)))
{
--
GitLab