From 00c09ba776986b3aaf869a0e82a9e8541799f49c Mon Sep 17 00:00:00 2001 From: Thomas Fetzer Date: Thu, 22 Dec 2016 09:01:41 +0100 Subject: [PATCH 1/4] [doc][material] Honor Raoult's law with his correct name --- dumux/material/fluidsystems/2pliquidvapor.hh | 4 ++-- dumux/material/fluidsystems/brineair.hh | 4 ++-- dumux/material/fluidsystems/brineco2.hh | 2 +- dumux/material/fluidsystems/h2oair.hh | 4 ++-- dumux/material/fluidsystems/h2oairmesitylene.hh | 4 ++-- dumux/material/fluidsystems/h2oairxylene.hh | 4 ++-- dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh | 4 ++-- dumux/material/fluidsystems/h2on2.hh | 4 ++-- dumux/material/fluidsystems/h2on2o2.hh | 4 ++-- dumux/material/fluidsystems/purewatersimple.hh | 4 ++-- dumux/material/fluidsystems/spe5.hh | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dumux/material/fluidsystems/2pliquidvapor.hh b/dumux/material/fluidsystems/2pliquidvapor.hh index 9fa41e1a75..e230ab88ff 100644 --- a/dumux/material/fluidsystems/2pliquidvapor.hh +++ b/dumux/material/fluidsystems/2pliquidvapor.hh @@ -110,7 +110,7 @@ public: * We define an ideal mixture as a fluid phase where the fugacity * coefficients of all components times the pressure of the phase * are indepent on the fluid composition. This assumtion is true - * if Henry's law and Rault's law apply. If you are unsure what + * if Henry's law and Raoult's law apply. If you are unsure what * this function should return, it is safe to return false. The * only damage done will be (slightly) increased computation times * in some cases. @@ -120,7 +120,7 @@ public: static bool isIdealMixture(int phaseIdx) { assert(0 <= phaseIdx && phaseIdx < numPhases); - // we assume Henry's and Rault's laws for the water phase and + // we assume Henry's and Raoult's laws for the water phase and // and no interaction between gas molecules of different // components, so all phases are ideal mixtures! return true; diff --git a/dumux/material/fluidsystems/brineair.hh b/dumux/material/fluidsystems/brineair.hh index 0a4f35a380..d3292a2d04 100644 --- a/dumux/material/fluidsystems/brineair.hh +++ b/dumux/material/fluidsystems/brineair.hh @@ -156,7 +156,7 @@ public: * We define an ideal mixture as a fluid phase where the fugacity * coefficients of all components times the pressure of the phase * are independent on the fluid composition. This assumption is true - * if Henry's law and Rault's law apply. If you are unsure what + * if Henry's law and Raoult's law apply. If you are unsure what * this function should return, it is safe to return false. The * only damage done will be (slightly) increased computation times * in some cases. @@ -166,7 +166,7 @@ public: static bool isIdealMixture(int phaseIdx) { assert(0 <= phaseIdx && phaseIdx < numPhases); - // we assume Henry's and Rault's laws for the water phase and + // we assume Henry's and Raoult's laws for the water phase and // and no interaction between gas molecules of different // components, so all phases are ideal mixtures! diff --git a/dumux/material/fluidsystems/brineco2.hh b/dumux/material/fluidsystems/brineco2.hh index 0dfa1eca70..7fec08a33a 100644 --- a/dumux/material/fluidsystems/brineco2.hh +++ b/dumux/material/fluidsystems/brineco2.hh @@ -125,7 +125,7 @@ public: * We define an ideal mixture as a fluid phase where the fugacity * coefficients of all components times the pressure of the phase * are independent on the fluid composition. This assumption is true - * if Henry's law and Rault's law apply. If you are unsure what + * if Henry's law and Raoult's law apply. If you are unsure what * this function should return, it is safe to return false. The * only damage done will be (slightly) increased computation times * in some cases. diff --git a/dumux/material/fluidsystems/h2oair.hh b/dumux/material/fluidsystems/h2oair.hh index 6c596a0ee6..c1b88ddbe0 100644 --- a/dumux/material/fluidsystems/h2oair.hh +++ b/dumux/material/fluidsystems/h2oair.hh @@ -157,7 +157,7 @@ public: * We define an ideal mixture as a fluid phase where the fugacity * coefficients of all components times the pressure of the phase * are independent on the fluid composition. This assumption is true - * if Henry's law and Rault's law apply. If you are unsure what + * if Henry's law and Raoult's law apply. If you are unsure what * this function should return, it is safe to return false. The * only damage done will be (slightly) increased computation times * in some cases. @@ -167,7 +167,7 @@ public: static bool isIdealMixture(int phaseIdx) { assert(0 <= phaseIdx && phaseIdx < numPhases); - // we assume Henry's and Rault's laws for the water phase and + // we assume Henry's and Raoult's laws for the water phase and // and no interaction between gas molecules of different // components, so all phases are ideal mixtures! return true; diff --git a/dumux/material/fluidsystems/h2oairmesitylene.hh b/dumux/material/fluidsystems/h2oairmesitylene.hh index 3f0e014c9a..82ba42a3e2 100644 --- a/dumux/material/fluidsystems/h2oairmesitylene.hh +++ b/dumux/material/fluidsystems/h2oairmesitylene.hh @@ -145,7 +145,7 @@ public: * We define an ideal mixture as a fluid phase where the fugacity * coefficients of all components times the pressure of the phase * are independent on the fluid composition. This assumption is true - * if Henry's law and Rault's law apply. If you are unsure what + * if Henry's law and Raoult's law apply. If you are unsure what * this function should return, it is safe to return false. The * only damage done will be (slightly) increased computation times * in some cases. @@ -155,7 +155,7 @@ public: static bool isIdealMixture(int phaseIdx) { assert(0 <= phaseIdx && phaseIdx < numPhases); - // we assume Henry's and Rault's laws for the water phase and + // we assume Henry's and Raoult's laws for the water phase and // and no interaction between gas molecules of different // components, so all phases are ideal mixtures! return true; diff --git a/dumux/material/fluidsystems/h2oairxylene.hh b/dumux/material/fluidsystems/h2oairxylene.hh index 99c97e49ca..c05bfdf95c 100644 --- a/dumux/material/fluidsystems/h2oairxylene.hh +++ b/dumux/material/fluidsystems/h2oairxylene.hh @@ -141,7 +141,7 @@ public: * We define an ideal mixture as a fluid phase where the fugacity * coefficients of all components times the pressure of the phase * are independent on the fluid composition. This assumption is true - * if Henry's law and Rault's law apply. If you are unsure what + * if Henry's law and Raoult's law apply. If you are unsure what * this function should return, it is safe to return false. The * only damage done will be (slightly) increased computation times * in some cases. @@ -151,7 +151,7 @@ public: static bool isIdealMixture(int phaseIdx) { assert(0 <= phaseIdx && phaseIdx < numPhases); - // we assume Henry's and Rault's laws for the water phase and + // we assume Henry's and Raoult's laws for the water phase and // and no interaction between gas molecules of different // components, so all phases are ideal mixtures! return true; diff --git a/dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh b/dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh index d6c4aa67de..2642916770 100644 --- a/dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh +++ b/dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh @@ -137,7 +137,7 @@ public: * We define an ideal mixture as a fluid phase where the fugacity * coefficients of all components times the pressure of the phase * are indepent on the fluid composition. This assumtion is true - * if Henry's law and Rault's law apply. If you are unsure what + * if Henry's law and Raoult's law apply. If you are unsure what * this function should return, it is safe to return false. The * only damage done will be (slightly) increased computation times * in some cases. @@ -147,7 +147,7 @@ public: static bool isIdealMixture(int phaseIdx) { assert(0 <= phaseIdx && phaseIdx < numPhases); - // we assume Henry's and Rault's laws for the water phase and + // we assume Henry's and Raoult's laws for the water phase and // and no interaction between gas molecules of different // components, so all phases are ideal mixtures! return true; diff --git a/dumux/material/fluidsystems/h2on2.hh b/dumux/material/fluidsystems/h2on2.hh index 5c5c8ba7c4..50976ea8f9 100644 --- a/dumux/material/fluidsystems/h2on2.hh +++ b/dumux/material/fluidsystems/h2on2.hh @@ -125,7 +125,7 @@ public: * We define an ideal mixture as a fluid phase where the fugacity * coefficients of all components times the pressure of the phase * are independent on the fluid composition. This assumption is true - * if Henry's law and Rault's law apply. If you are unsure what + * if Henry's law and Raoult's law apply. If you are unsure what * this function should return, it is safe to return false. The * only damage done will be (slightly) increased computation times * in some cases. @@ -135,7 +135,7 @@ public: static bool isIdealMixture(int phaseIdx) { assert(0 <= phaseIdx && phaseIdx < numPhases); - // we assume Henry's and Rault's laws for the water phase and + // we assume Henry's and Raoult's laws for the water phase and // and no interaction between gas molecules of different // components, so all phases are ideal mixtures! return true; diff --git a/dumux/material/fluidsystems/h2on2o2.hh b/dumux/material/fluidsystems/h2on2o2.hh index 4f3ad35b54..08fdd13d80 100644 --- a/dumux/material/fluidsystems/h2on2o2.hh +++ b/dumux/material/fluidsystems/h2on2o2.hh @@ -137,7 +137,7 @@ public: * We define an ideal mixture as a fluid phase where the fugacity * coefficients of all components times the pressure of the phase * are independent on the fluid composition. This assumption is true - * if Henry's law and Rault's law apply. If you are unsure what + * if Henry's law and Raoult's law apply. If you are unsure what * this function should return, it is safe to return false. The * only damage done will be (slightly) increased computation times * in some cases. @@ -147,7 +147,7 @@ public: static bool isIdealMixture(int phaseIdx) { assert(0 <= phaseIdx && phaseIdx < numPhases); - // we assume Henry's and Rault's laws for the water phase and + // we assume Henry's and Raoult's laws for the water phase and // and no interaction between gas molecules of different // components, so all phases are ideal mixtures! return true; diff --git a/dumux/material/fluidsystems/purewatersimple.hh b/dumux/material/fluidsystems/purewatersimple.hh index 09366f6724..fef356f2d2 100644 --- a/dumux/material/fluidsystems/purewatersimple.hh +++ b/dumux/material/fluidsystems/purewatersimple.hh @@ -126,7 +126,7 @@ public: * We define an ideal mixture as a fluid phase where the fugacity * coefficients of all components times the pressure of the phase * are independent on the fluid composition. This assumption is true - * if Henry's law and Rault's law apply. If you are unsure what + * if Henry's law and Raoult's law apply. If you are unsure what * this function should return, it is safe to return false. The * only damage done will be (slightly) increased computation times * in some cases. @@ -136,7 +136,7 @@ public: static bool isIdealMixture(int phaseIdx) { assert(0 <= phaseIdx && phaseIdx < numPhases); - // we assume Henry's and Rault's laws for the water phase and + // we assume Henry's and Raoult's laws for the water phase and // and no interaction between gas molecules of different // components, so all phases are ideal mixtures! return true; diff --git a/dumux/material/fluidsystems/spe5.hh b/dumux/material/fluidsystems/spe5.hh index e793ea5acf..496d49727a 100644 --- a/dumux/material/fluidsystems/spe5.hh +++ b/dumux/material/fluidsystems/spe5.hh @@ -125,7 +125,7 @@ public: * We define an ideal mixture as a fluid phase where the fugacity * coefficients of all components times the pressure of the phase * are independent on the fluid composition. This assumption is true - * if Henry's law and Rault's law apply. If you are unsure what + * if Henry's law and Raoult's law apply. If you are unsure what * this function should return, it is safe to return false. The * only damage done will be (slightly) increased computation times * in some cases. -- GitLab From 8280d2f79b54a645177546ea3e1cf32ade3cc191 Mon Sep 17 00:00:00 2001 From: Thomas Fetzer Date: Thu, 22 Dec 2016 09:01:56 +0100 Subject: [PATCH 2/4] [doc][material] Fix some typos --- dumux/material/fluidsystems/2pimmiscible.hh | 2 +- dumux/material/fluidsystems/2pliquidvapor.hh | 2 +- dumux/material/fluidsystems/brineco2.hh | 2 +- dumux/material/fluidsystems/h2oair.hh | 4 ++-- dumux/material/fluidsystems/h2oairmesitylene.hh | 4 ++-- dumux/material/fluidsystems/h2oairxylene.hh | 4 ++-- dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dumux/material/fluidsystems/2pimmiscible.hh b/dumux/material/fluidsystems/2pimmiscible.hh index efdd1bdb80..49eb242469 100644 --- a/dumux/material/fluidsystems/2pimmiscible.hh +++ b/dumux/material/fluidsystems/2pimmiscible.hh @@ -444,7 +444,7 @@ public: } // end namespace FluidSystems #ifdef DUMUX_PROPERTIES_HH -// forward defintions of the property tags +// forward definitions of the property tags namespace Properties { NEW_PROP_TAG(Scalar); NEW_PROP_TAG(WettingPhase); diff --git a/dumux/material/fluidsystems/2pliquidvapor.hh b/dumux/material/fluidsystems/2pliquidvapor.hh index e230ab88ff..eccfc792e6 100644 --- a/dumux/material/fluidsystems/2pliquidvapor.hh +++ b/dumux/material/fluidsystems/2pliquidvapor.hh @@ -555,7 +555,7 @@ public: } // end namespace FluidSystems #ifdef DUMUX_PROPERTIES_HH -// forward defintions of the property tags +// forward definitions of the property tags namespace Properties { NEW_PROP_TAG(Scalar); NEW_PROP_TAG(Components); diff --git a/dumux/material/fluidsystems/brineco2.hh b/dumux/material/fluidsystems/brineco2.hh index 7fec08a33a..9ccc5362ac 100644 --- a/dumux/material/fluidsystems/brineco2.hh +++ b/dumux/material/fluidsystems/brineco2.hh @@ -689,7 +689,7 @@ private: #ifdef DUMUX_PROPERTIES_HH -// forward defintions of the property tags +// forward definitions of the property tags namespace Properties { NEW_PROP_TAG(Scalar); diff --git a/dumux/material/fluidsystems/h2oair.hh b/dumux/material/fluidsystems/h2oair.hh index c1b88ddbe0..daeb4d0f4e 100644 --- a/dumux/material/fluidsystems/h2oair.hh +++ b/dumux/material/fluidsystems/h2oair.hh @@ -637,7 +637,7 @@ public: * Chapter 2.1.13 Innere Energie, Wäremekapazität, Enthalpie \cite A3:class:2001
* * Formula (2.42): - * the specifiv enthalpy of a gasphase result from the sum of (enthalpies*mass fraction) of the components + * the specific enthalpy of a gasphase result from the sum of (enthalpies*mass fraction) of the components * * \todo This system neglects the contribution of gas-molecules in the liquid phase. * This contribution is probably not big. Somebody would have to find out the enthalpy of solution for this system. ... @@ -772,7 +772,7 @@ public: } // end namespace FluidSystems #ifdef DUMUX_PROPERTIES_HH -// forward defintions of the property tags +// forward definitions of the property tags namespace Properties { NEW_PROP_TAG(Scalar); NEW_PROP_TAG(Components); diff --git a/dumux/material/fluidsystems/h2oairmesitylene.hh b/dumux/material/fluidsystems/h2oairmesitylene.hh index 82ba42a3e2..83082a156d 100644 --- a/dumux/material/fluidsystems/h2oairmesitylene.hh +++ b/dumux/material/fluidsystems/h2oairmesitylene.hh @@ -456,7 +456,7 @@ public: // for the NAPL phase, we assume currently that nothing is // dissolved. this means that the affinity of the NAPL // component to the NAPL phase is much higher than for the - // other components, i.e. the fugacity cofficient is much + // other components, i.e. the fugacity coefficient is much // smaller. if (phaseIdx == nPhaseIdx) { Scalar phiNapl = NAPL::vaporPressure(T)/p; @@ -579,7 +579,7 @@ private: } // end namespace FluidSystems #ifdef DUMUX_PROPERTIES_HH -// forward defintions of the property tags +// forward definitions of the property tags namespace Properties { NEW_PROP_TAG(Scalar); NEW_PROP_TAG(Components); diff --git a/dumux/material/fluidsystems/h2oairxylene.hh b/dumux/material/fluidsystems/h2oairxylene.hh index c05bfdf95c..bfa947c48d 100644 --- a/dumux/material/fluidsystems/h2oairxylene.hh +++ b/dumux/material/fluidsystems/h2oairxylene.hh @@ -455,7 +455,7 @@ public: // for the NAPL phase, we assume currently that nothing is // dissolved. this means that the affinity of the NAPL // component to the NAPL phase is much higher than for the - // other components, i.e. the fugacity cofficient is much + // other components, i.e. the fugacity coefficient is much // smaller. if (phaseIdx == nPhaseIdx) { Scalar phiNapl = NAPL::vaporPressure(T)/p; @@ -578,7 +578,7 @@ private: } // end namespace FluidSystems #ifdef DUMUX_PROPERTIES_HH -// forward defintions of the property tags +// forward definitions of the property tags namespace Properties { NEW_PROP_TAG(Scalar); NEW_PROP_TAG(Components); diff --git a/dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh b/dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh index 2642916770..701b72e398 100644 --- a/dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh +++ b/dumux/material/fluidsystems/h2oheavyoilfluidsystem.hh @@ -444,7 +444,7 @@ private: } // end namespace FluidSystems #ifdef DUMUX_PROPERTIES_HH -// forward defintions of the property tags +// forward definitions of the property tags namespace Properties { NEW_PROP_TAG(Scalar); NEW_PROP_TAG(Components); -- GitLab From f8e5db8c46624f761d46fe422665f0220da88f8a Mon Sep 17 00:00:00 2001 From: Thomas Fetzer Date: Wed, 20 Apr 2016 10:31:26 +0200 Subject: [PATCH 3/4] [implicit] Fix typos in the model description --- dumux/implicit/model.hh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dumux/implicit/model.hh b/dumux/implicit/model.hh index 40b2d0cec6..6d2558ea35 100644 --- a/dumux/implicit/model.hh +++ b/dumux/implicit/model.hh @@ -865,7 +865,7 @@ protected: { return problem_().gridView(); } /*! - * \brief Reference to the local residal object + * \brief Reference to the local residual object */ LocalResidual &localResidual_() { return localJacobian_.localResidual(); } @@ -996,7 +996,7 @@ protected: mutable std::vector prevHints_; // the problem we want to solve. defines the constitutive - // relations, matxerial laws, etc. + // relations, material laws, etc. Problem *problemPtr_; // calculates the local jacobian matrix for a given element -- GitLab From 561c7b8f5b062ffdb17370efa4cc5f83130e1984 Mon Sep 17 00:00:00 2001 From: Thomas Fetzer Date: Wed, 20 Jan 2016 09:53:45 +0100 Subject: [PATCH 4/4] [2p,2p2c,2pdfm,2pnc] Update information regarding the Formulation property --- dumux/porousmediumflow/2p/implicit/model.hh | 2 +- dumux/porousmediumflow/2p2c/implicit/model.hh | 2 +- dumux/porousmediumflow/2pdfm/implicit/model.hh | 2 +- dumux/porousmediumflow/2pnc/implicit/indices.hh | 1 - dumux/porousmediumflow/2pnc/implicit/model.hh | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dumux/porousmediumflow/2p/implicit/model.hh b/dumux/porousmediumflow/2p/implicit/model.hh index 5ea13e7547..a24b30ddaf 100644 --- a/dumux/porousmediumflow/2p/implicit/model.hh +++ b/dumux/porousmediumflow/2p/implicit/model.hh @@ -65,7 +65,7 @@ namespace Dumux * choosing either \f\$p_w\f\$ and \f\$S_n\f\$ or \f\$p_n\f\$ and \f\$S_w\f\$ * as primary variables. The formulation which ought to be used can be * specified by setting the Formulation property to either - * TwoPCommonIndices::pWsN or TwoPCommonIndices::pNsW. By + * TwoPFormulation::pwsn or TwoPFormulation::pnsw. By * default, the model uses \f\$p_w\f\$ and \f\$S_n\f\$. */ template diff --git a/dumux/porousmediumflow/2p2c/implicit/model.hh b/dumux/porousmediumflow/2p2c/implicit/model.hh index 3a1701f3e0..3a01803085 100644 --- a/dumux/porousmediumflow/2p2c/implicit/model.hh +++ b/dumux/porousmediumflow/2p2c/implicit/model.hh @@ -71,7 +71,7 @@ namespace Dumux * The used primary variables are, like in the two-phase model, either \f\$p_w\f\$ and \f\$S_n\f\$ * or \f\$p_n\f\$ and \f\$S_w\f\$. The formulation which ought to be used can be * specified by setting the Formulation property to either - * TwoPTwoCIndices::pWsN or TwoPTwoCIndices::pNsW. By + * TwoPTwoCFormulation::pwsn or TwoPTwoCFormulation::pnsw. By * default, the model uses \f\$p_w\f\$ and \f\$S_n\f\$. * Moreover, the second primary variable depends on the phase state, since a * primary variable switch is included. The phase state is stored for all nodes diff --git a/dumux/porousmediumflow/2pdfm/implicit/model.hh b/dumux/porousmediumflow/2pdfm/implicit/model.hh index d9117b879a..5c2e1cc0ed 100644 --- a/dumux/porousmediumflow/2pdfm/implicit/model.hh +++ b/dumux/porousmediumflow/2pdfm/implicit/model.hh @@ -64,7 +64,7 @@ namespace Dumux * choosing either \f\$p_w\f\$ and \f\$S_n\f\$ or \f\$p_n\f\$ and \f\$S_w\f\$ * as primary variables. The formulation which ought to be used can be * specified by setting the Formulation property to either - * TwoPCommonIndices::pWsN or TwoPCommonIndices::pNsW. By + * TwoPFormulation::pwsn or TwoPFormulation::pnsw. By * default, the model uses \f\$p_w\f\$ and \f\$S_n\f\$. */ template diff --git a/dumux/porousmediumflow/2pnc/implicit/indices.hh b/dumux/porousmediumflow/2pnc/implicit/indices.hh index 97422f1513..d46e2e1452 100644 --- a/dumux/porousmediumflow/2pnc/implicit/indices.hh +++ b/dumux/porousmediumflow/2pnc/implicit/indices.hh @@ -31,7 +31,6 @@ namespace Dumux * \ingroup TwoPNCModel * \ingroup ImplicitIndices * \brief Enumerates the formulations which the two-phase n-component model accepts. - * */ struct TwoPNCFormulation { diff --git a/dumux/porousmediumflow/2pnc/implicit/model.hh b/dumux/porousmediumflow/2pnc/implicit/model.hh index be59030ed2..e891340643 100644 --- a/dumux/porousmediumflow/2pnc/implicit/model.hh +++ b/dumux/porousmediumflow/2pnc/implicit/model.hh @@ -79,7 +79,7 @@ namespace Dumux * The used primary variables are, like in the two-phase model, either \f\$p_w\f\$ and \f\$S_n\f\$ * or \f\$p_n\f\$ and \f\$S_w\f\$. The formulation which ought to be used can be * specified by setting the Formulation property to either - * TwoPTwoCIndices::pWsN or TwoPTwoCIndices::pNsW. By + * TwoPTwoCIndices::pwsn or TwoPTwoCIndices::pnsw. By * default, the model uses \f\$p_w\f\$ and \f\$S_n\f\$. * * Moreover, the second primary variable depends on the phase state, since a -- GitLab