### [test,tutorial] reduced excessive line lengths, like proposed in #FS213, target line

length = 150, thanks to kristopherg

reviewed by fetzer

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@12432 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 6628437b
 ... ... @@ -512,7 +512,8 @@ public: exactSol[eIdx] = exactPressure; // output local relative error for each cell //std::cout << "local relative error for cell "<< eIdx << " is: " << (approxPressure - exactPressure)/exactPressure << std::endl; //std::cout << "local relative error for cell "<< eIdx << " is: " // << (approxPressure - exactPressure)/exactPressure << std::endl; numerator += volume*(approxPressure - exactPressure)*(approxPressure - exactPressure); denominator += volume*exactPressure*exactPressure; ... ... @@ -833,7 +834,8 @@ public: // if (std::abs(fluxDiff) > 1e-16) // { // std::cout << "faceGlobal " << faceGlobal << ": exact " << exactFlux << ", approximate " << approximateFlux << std::endl; // std::cout << "faceGlobal " << faceGlobal << ": exact " // << exactFlux << ", approximate " << approximateFlux << std::endl; // } // update mean value error ... ...
 ... ... @@ -125,11 +125,14 @@ int main(int argc, char** argv) std::cout.precision(2); std::cout << "\t error press \t error grad\t sumflux\t erflm\t\t uMin\t\t uMax\t\t time" << std::endl; std::cout << "2pfa\t " << fvResult.relativeL2Error << "\t " << fvResult.ergrad << "\t " << fvResult.sumflux << "\t " << fvResult.erflm << "\t " << fvResult.uMin << "\t " << fvResult.uMax << "\t " << fvTime << std::endl; std::cout << "mpfa-o\t " << mpfaResult.relativeL2Error << "\t " << mpfaResult.ergrad << "\t " << mpfaResult.sumflux << "\t " << mpfaResult.erflm << "\t " << mpfaResult.uMin << "\t " << mpfaResult.uMax << "\t " << mpfaTime << std::endl; std::cout << "mimetic\t " << mimeticResult.relativeL2Error << "\t " << mimeticResult.ergrad << "\t " << mimeticResult.sumflux << "\t " << mimeticResult.erflm << "\t " << mimeticResult.uMin << "\t " << mimeticResult.uMax << "\t " << mimeticTime << std::endl; << "\t " << fvResult.erflm << "\t " << fvResult.uMin << "\t " << fvResult.uMax << "\t " << fvTime << std::endl; std::cout << "mpfa-o\t " << mpfaResult.relativeL2Error << "\t " << mpfaResult.ergrad << "\t " << mpfaResult.sumflux << "\t " << mpfaResult.erflm << "\t " << mpfaResult.uMin << "\t " << mpfaResult.uMax << "\t " << mpfaTime << std::endl; std::cout << "mimetic\t " << mimeticResult.relativeL2Error << "\t " << mimeticResult.ergrad << "\t " << mimeticResult.sumflux << "\t " << mimeticResult.erflm << "\t " << mimeticResult.uMin << "\t " << mimeticResult.uMax << "\t " << mimeticTime << std::endl; ... ...
 ... ... @@ -267,7 +267,9 @@ private: Scalar xMinus = frontParams_[i+1].second * time; if (globalPos <= x && globalPos > xMinus) { analyticSolution_[index] = frontParams_[i].first - (frontParams_[i].first - frontParams_[i+1].first)/(x - xMinus) * (x - globalPos); analyticSolution_[index] = frontParams_[i].first - (frontParams_[i].first - frontParams_[i+1].first) / (x - xMinus) * (x - globalPos); break; } } ... ...
 ... ... @@ -40,7 +40,8 @@ #include #include //following includes are only needed if a global pressure formulation is chosen! Then only a total velocity can be reconstructed for the transport step //following includes are only needed if a global pressure formulation is chosen! //Then only a total velocity can be reconstructed for the transport step #include #include ... ... @@ -279,7 +280,8 @@ void dirichletAtPos(PrimaryVariables &values, const GlobalPosition& globalPos) c Scalar pRef = referencePressureAtPos(globalPos); Scalar temp = temperatureAtPos(globalPos); values[pwIdx] = (2e5 + (this->bBoxMax()[dim-1] - globalPos[dim-1]) * WettingPhase::density(temp, pRef) * this->gravity().two_norm()); values[pwIdx] = (2e5 + (this->bBoxMax()[dim-1] - globalPos[dim-1]) * WettingPhase::density(temp, pRef) * this->gravity().two_norm()); } else { ... ...
 ... ... @@ -243,13 +243,16 @@ public: // variable which determines if output should be written (initially set to false) output_ = false; // define if current run is initialization run (initially set to true, will be set to false if initialization is over) // define if current run is initialization run // (initially set to true, will be set to false if initialization is over) initializationRun_ = true; // defines if feedback from geomechanics on flow is taken into account or not (usually the coupling is switched off for the initialization run) // defines if feedback from geomechanics on flow is taken into account or not // (usually the coupling is switched off for the initialization run) coupled_ = false; // set initial episode length equal to length of initialization period this->timeManager().startNextEpisode(tInitEnd); // transfer the episode index to spatial parameters (during intialization episode hydraulic different parameters might be applied) // transfer the episode index to spatial parameters // (during intialization episode hydraulic different parameters might be applied) this->spatialParams().setEpisode(this->timeManager().episodeIndex()); } ... ... @@ -337,11 +340,14 @@ public: rockDensity = this->spatialParams().rockDensity(globalPos); // initial total stress field here assumed to be isotropic, lithostatic stress = brineDensity_ * porosity * gravity * (depthBOR_ - globalPos[dim-1]) + (1 - porosity) * rockDensity * gravity * (depthBOR_ - globalPos[dim-1]); stress = brineDensity_ * porosity * gravity * (depthBOR_ - globalPos[dim-1]) + (1 - porosity) * rockDensity * gravity * (depthBOR_ - globalPos[dim-1]); if(dim >=2) stress = brineDensity_ * porosity * gravity * (depthBOR_ - globalPos[dim-1]) + (1 - porosity) * rockDensity * gravity * (depthBOR_ - globalPos[dim-1]); stress = brineDensity_ * porosity * gravity * (depthBOR_ - globalPos[dim-1]) + (1 - porosity) * rockDensity * gravity * (depthBOR_ - globalPos[dim-1]); if(dim == 3) stress = brineDensity_ * porosity * gravity * (depthBOR_ - globalPos[dim-1]) + (1 - porosity) * rockDensity * gravity * (depthBOR_ - globalPos[dim-1]); stress = brineDensity_ * porosity * gravity * (depthBOR_ - globalPos[dim-1]) + (1 - porosity) * rockDensity * gravity * (depthBOR_ - globalPos[dim-1]); return stress; } ... ... @@ -547,7 +553,8 @@ public: * potentially solution dependent and requires some box method * specific things. * * \param values The neumann values for the conservation equations in units of \f$[ \textnormal{unit of conserved quantity} / (m^2 \cdot s )] \f$ * \param values The neumann values for the conservation equations in units of * \f$[ \textnormal{unit of conserved quantity} / (m^2 \cdot s )] \f$ * \param element The finite element * \param fvGeometry The finite-volume geometry in the box scheme * \param intersection The intersection between element and boundary ... ... @@ -596,7 +603,8 @@ public: * \brief Evaluate the source term for all phases within a given * sub-control-volume. * * \param values The source values for the conservation equations in units of \f$[ \textnormal{unit of conserved quantity} / (m^3 \cdot s )] \f$ * \param values The source values for the conservation equations in units of * \f$[ \textnormal{unit of conserved quantity} / (m^3 \cdot s )] \f$ * \param element The finite element * \param fvGeometry The finite-volume geometry in the box scheme * \param scvIdx The local vertex index ... ... @@ -619,7 +627,8 @@ public: * \brief Evaluate the source term for all phases within a given * sub-control-volume. * * \param values The source values for the conservation equations in units of \f$[ \textnormal{unit of conserved quantity} / (m^3 \cdot s )] \f$ * \param values The source values for the conservation equations in units of * \f$[ \textnormal{unit of conserved quantity} / (m^3 \cdot s )] \f$ * \param globalPos The position of the integration point of the boundary segment. * * For this method, the \a values parameter stores the rate mass ... ...
 ... ... @@ -569,8 +569,10 @@ public: // actually setting the fluxes if(onLeftBoundary_(globalPos) and this->spatialParams().inFF_(globalPos)){ priVars[conti00EqIdx + nPhaseIdx * numComponents + wCompIdx] = -molarFlux * fluidState.moleFraction(nPhaseIdx, wCompIdx); priVars[conti00EqIdx + nPhaseIdx * numComponents + nCompIdx] = -molarFlux * fluidState.moleFraction(nPhaseIdx, nCompIdx); priVars[conti00EqIdx + nPhaseIdx * numComponents + wCompIdx] = -molarFlux * fluidState.moleFraction(nPhaseIdx, wCompIdx); priVars[conti00EqIdx + nPhaseIdx * numComponents + nCompIdx] = -molarFlux * fluidState.moleFraction(nPhaseIdx, nCompIdx); // energy equations are specified mass specifically if(enableKineticEnergy){ priVars[energyEq0Idx + nPhaseIdx] = - massFluxInjectedPhase ... ... @@ -613,7 +615,8 @@ private: S[nPhaseIdx] = 1. - S[wPhaseIdx] ; } else DUNE_THROW(Dune::InvalidStateException, "You should not be here: x=" << globalPos << " y= "<< globalPos[dim-1]); DUNE_THROW(Dune::InvalidStateException, "You should not be here: x=" << globalPos << " y= "<< globalPos[dim-1]); for (int i = 0; i < numPhases - 1; ++i) priVars[S0Idx + i] = S[i]; ... ... @@ -643,9 +646,11 @@ private: if (this->spatialParams().inPM_(globalPos)){ // hydrostatic distribution for initial water pressure distribution // This should work better. Alas: it doesn't. // The same pressure distribution arises, but with initially no hydrostatics prescribed much better convergence is achieved. // The same pressure distribution arises, but with initially no hydrostatics prescribed // much better convergence is achieved. // const Scalar densityW = 998.23; // from first timestep result // p[wPhaseIdx] = pnInitial_ + densityW*(-1)*this->gravity()[dim-1]*(this->spatialParams().heightPM() - globalPos[dim-1]) - std::abs(capPress[wPhaseIdx]); // p[wPhaseIdx] = pnInitial_ + densityW*(-1)*this->gravity()[dim-1]*(this->spatialParams().heightPM() // - globalPos[dim-1]) - std::abs(capPress[wPhaseIdx]); // Therefore: use homogenous pressure in the domain and let the newton find the pressure distribution p[wPhaseIdx] = pnInitial_ - std::abs(capPress[wPhaseIdx]); ... ...
 ... ... @@ -55,7 +55,8 @@ class Ex2TutorialProblemDecoupled; namespace Properties { // create a new type tag for the problem NEW_TYPE_TAG(Ex2TutorialProblemDecoupled, INHERITS_FROM(FVPressureTwoP, FVTransportTwoP, IMPESTwoP, Ex2TutorialSpatialParamsDecoupled)); /*@\label{tutorial-decoupled:create-type-tag}@*/ NEW_TYPE_TAG(Ex2TutorialProblemDecoupled, INHERITS_FROM(FVPressureTwoP, FVTransportTwoP, IMPESTwoP, Ex2TutorialSpatialParamsDecoupled)); /*@\label{tutorial-decoupled:create-type-tag}@*/ // Set the problem property SET_PROP(Ex2TutorialProblemDecoupled, Problem) /*@\label{tutorial-decoupled:set-problem}@*/ ... ...
 ... ... @@ -56,7 +56,8 @@ class Ex5TutorialProblemDecoupled; namespace Properties { // create a new type tag for the problem NEW_TYPE_TAG(Ex5TutorialProblemDecoupled, INHERITS_FROM(FVPressureTwoP, FVTransportTwoP, IMPESTwoP, Ex5TutorialSpatialParamsDecoupled)); /*@\label{tutorial-decoupled:create-type-tag}@*/ NEW_TYPE_TAG(Ex5TutorialProblemDecoupled, INHERITS_FROM(FVPressureTwoP, FVTransportTwoP, IMPESTwoP, Ex5TutorialSpatialParamsDecoupled)); /*@\label{tutorial-decoupled:create-type-tag}@*/ // Set the problem property SET_PROP(Ex5TutorialProblemDecoupled, Problem) /*@\label{tutorial-decoupled:set-problem}@*/ ... ...
 ... ... @@ -55,7 +55,8 @@ class TutorialProblemDecoupled; namespace Properties { // create a new type tag for the problem NEW_TYPE_TAG(TutorialProblemDecoupled, INHERITS_FROM(FVPressureTwoP, FVTransportTwoP, IMPESTwoP, TutorialSpatialParamsDecoupled)); /*@\label{tutorial-decoupled:create-type-tag}@*/ NEW_TYPE_TAG(TutorialProblemDecoupled, INHERITS_FROM(FVPressureTwoP, FVTransportTwoP, IMPESTwoP, TutorialSpatialParamsDecoupled)); /*@\label{tutorial-decoupled:create-type-tag}@*/ // Set the problem property SET_PROP(TutorialProblemDecoupled, Problem) /*@\label{tutorial-decoupled:set-problem}@*/ ... ...
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!