From d27d40a544563db66de045a847cde5d9720b1d54 Mon Sep 17 00:00:00 2001
From: Thomas Fetzer <thomas.fetzer@iws.uni-stuttgart.de>
Date: Thu, 27 Nov 2014 17:58:42 +0000
Subject: [PATCH] [comments] removed german comments/words
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@13822 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
.../decoupled/2p/impes/gridadaptionindicator2p.hh | 8 ++++----
.../2p/impes/gridadaptionindicator2plocal.hh | 14 +++++++-------
.../2p/impes/gridadaptionindicator2plocalflux.hh | 2 +-
dumux/implicit/3p/3plocalresidual.hh | 2 +-
dumux/implicit/3p3c/3p3clocalresidual.hh | 2 +-
test/implicit/mpnc/combustionproblem1c.hh | 4 ++--
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/dumux/decoupled/2p/impes/gridadaptionindicator2p.hh b/dumux/decoupled/2p/impes/gridadaptionindicator2p.hh
index f5811ae1b5..22e9dd7b40 100644
--- a/dumux/decoupled/2p/impes/gridadaptionindicator2p.hh
+++ b/dumux/decoupled/2p/impes/gridadaptionindicator2p.hh
@@ -82,12 +82,12 @@ public:
ElementIterator eEndIt = problem_.gridView().template end<0>();
// 1) calculate Indicator -> min, maxvalues
- // Schleife über alle Leaf-Elemente
+ // loop over all leaf-elements
for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt;
++eIt)
{
- // Bestimme maximale und minimale Sättigung
- // Index des aktuellen Leaf-Elements
+ // calculate minimum and maximum saturation
+ // index of the current leaf-elements
int globalIdxI = problem_.variables().index(*eIt);
Scalar satI = 0.0;
@@ -104,7 +104,7 @@ public:
globalMin = std::min(satI, globalMin);
globalMax = std::max(satI, globalMax);
- // Berechne Verfeinerungsindikator an allen Zellen
+ // calculate refinement indicator in all cells
IntersectionIterator isItend = problem_.gridView().iend(*eIt);
for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isItend; ++isIt)
{
diff --git a/dumux/decoupled/2p/impes/gridadaptionindicator2plocal.hh b/dumux/decoupled/2p/impes/gridadaptionindicator2plocal.hh
index 2c331744d6..da28a92614 100644
--- a/dumux/decoupled/2p/impes/gridadaptionindicator2plocal.hh
+++ b/dumux/decoupled/2p/impes/gridadaptionindicator2plocal.hh
@@ -85,12 +85,12 @@ public:
ElementIterator eEndIt = problem_.gridView().template end<0>();
// 1) calculate Indicator -> min, maxvalues
- // Schleife über alle Leaf-Elemente
+ // loop over all leaf-elements
for (ElementIterator eIt = problem_.gridView().template begin<0>(); eIt != eEndIt;
++eIt)
{
- // Bestimme maximale und minimale Sättigung
- // Index des aktuellen Leaf-Elements
+ // calculate minimum and maximum saturation
+ // index of the current leaf-elements
int globalIdxI = problem_.variables().index(*eIt);
if (refineAtSource_)
@@ -126,7 +126,7 @@ public:
globalMin = std::min(satI, globalMin);
globalMax = std::max(satI, globalMax);
- // Berechne Verfeinerungsindikator an allen Zellen
+ // calculate refinement indicator in all cells
IntersectionIterator isItend = problem_.gridView().iend(*eIt);
for (IntersectionIterator isIt = problem_.gridView().ibegin(*eIt); isIt != isItend; ++isIt)
{
@@ -136,7 +136,7 @@ public:
}
const typename IntersectionIterator::Intersection &intersection = *isIt;
- // Steige aus, falls es sich nicht um einen Nachbarn handelt
+ // exit, if it is not a neighbor
if (isIt->boundary())
{
BoundaryTypes bcTypes;
@@ -177,11 +177,11 @@ public:
}
else
{
- // Greife auf Nachbarn zu
+ // get element pointer from neighbor
ElementPointer outside = intersection.outside();
int globalIdxJ = problem_.variables().index(*outside);
- // Jede Intersection nur von einer Seite betrachten
+ // treat each intersection only from one side
if (eIt->level() > outside->level()
|| (eIt->level() == outside->level() && globalIdxI < globalIdxJ))
{
diff --git a/dumux/decoupled/2p/impes/gridadaptionindicator2plocalflux.hh b/dumux/decoupled/2p/impes/gridadaptionindicator2plocalflux.hh
index 4919606b6e..f51fed4524 100644
--- a/dumux/decoupled/2p/impes/gridadaptionindicator2plocalflux.hh
+++ b/dumux/decoupled/2p/impes/gridadaptionindicator2plocalflux.hh
@@ -253,7 +253,7 @@ public:
}
const typename IntersectionIterator::Intersection &intersection = *isIt;
- // Steige aus, falls es sich nicht um einen Nachbarn handelt
+ // exit, if it is not a neighbor
if (isIt->boundary())
{
BoundaryTypes bcTypes;
diff --git a/dumux/implicit/3p/3plocalresidual.hh b/dumux/implicit/3p/3plocalresidual.hh
index 4497a650f8..a53b5f5046 100644
--- a/dumux/implicit/3p/3plocalresidual.hh
+++ b/dumux/implicit/3p/3plocalresidual.hh
@@ -138,7 +138,7 @@ public:
const VolumeVariables &dn = this->curVolVars_(fluxVars.downstreamIdx(phaseIdx));
// add advective flux of current phase
- // if alpha > 0 und alpha < 1 then both upstream and downstream
+ // if alpha > 0 and alpha < 1 then both upstream and downstream
// nodes need their contribution
// if alpha == 1 (which is mostly the case) then, the downstream
// node is not evaluated
diff --git a/dumux/implicit/3p3c/3p3clocalresidual.hh b/dumux/implicit/3p3c/3p3clocalresidual.hh
index 93c59dc6b3..3826c01a01 100644
--- a/dumux/implicit/3p3c/3p3clocalresidual.hh
+++ b/dumux/implicit/3p3c/3p3clocalresidual.hh
@@ -157,7 +157,7 @@ public:
{
// add advective flux of current component in current
// phase
- // if alpha > 0 und alpha < 1 then both upstream and downstream
+ // if alpha > 0 and alpha < 1 then both upstream and downstream
// nodes need their contribution
// if alpha == 1 (which is mostly the case) then, the downstream
// node is not evaluated
diff --git a/test/implicit/mpnc/combustionproblem1c.hh b/test/implicit/mpnc/combustionproblem1c.hh
index 0035f1b6a3..5021e25345 100644
--- a/test/implicit/mpnc/combustionproblem1c.hh
+++ b/test/implicit/mpnc/combustionproblem1c.hh
@@ -342,8 +342,8 @@ public:
// Calculate storage terms of the individual phases
for (int phaseIdx = 0; phaseIdx < numEnergyEqs; ++phaseIdx) {
PrimaryVariables phaseStorage;
- /* wieviel Erhaltungsgröße im System ist (in Einheit der Bilanzgleichung)
- * Aufssummierte Storage term für das ganze System.
+ /* how much of the conserved quantity is in the system (in units of the balance eq.)
+ * summed up storage term over the whole system
*/
this->model().globalPhaseStorage(phaseStorage, phaseIdx);
--
GitLab