diff --git a/.codespellexclude b/.codespellexclude index ebd3d082939b9a6b8f789728d88ff1b797fc7595..1606414eb39f1cb06b6b026b7687126c692283cb 100644 --- a/.codespellexclude +++ b/.codespellexclude @@ -11,3 +11,4 @@ Malcom, M.A.M.(2018).Analysis of underground excavations in argillaceous hard Stoffverhaltens von Salzgestein in Abh{\"a}ngigkeit von der Zeit und der Temperatur auf der Grundlage von Laborversuchen mit begleitenden kontinuumsmechanischen Berechnungen nach der Methode der finiten Elemente}' +- _Dupuit J. Mouvement de l’eau a travers le terrains permeables. C. R. Hebd. Seances Acad. Sci., 45:92–96, 1857._ diff --git a/.codespellrc b/.codespellrc index 31294668d42373955fa0dc113709bcc54f476451..ced58bde8895735bbea326599805da3bd08bac27 100644 --- a/.codespellrc +++ b/.codespellrc @@ -1,4 +1,4 @@ [codespell] -skip = ./.git,./Tests/Data,./ThirdParty,*.yml,*.bib,./web/content/imprint.md,./GeoLib/IO/XmlIO/OpenGeoSysSTN.xsd -ignore-words-list = ket,nd,strat,theis,ba,sur +skip = *.bib,*.css,*.pdf,*.yaml,*.yml,*/.vale,./.git,./GeoLib/IO/XmlIO/OpenGeoSysSTN.xsd,./Tests/Data,./ThirdParty,./web/content/imprint.md,./web/node_modules,./web/public/imprint/index.html,./web/resources, +ignore-words-list = ba,bu,ket,nd,pris,strat,sur,theis, exclude-file = .codespellexclude diff --git a/Applications/DataExplorer/DataView/DiagramView/DiagramList.h b/Applications/DataExplorer/DataView/DiagramView/DiagramList.h index 2044d11e111d19e18aaaea47e6091e0ab9d5144a..a95f28290298dc89552f61e09cfb3161b9c5a494 100644 --- a/Applications/DataExplorer/DataView/DiagramView/DiagramList.h +++ b/Applications/DataExplorer/DataView/DiagramView/DiagramList.h @@ -28,7 +28,7 @@ class SensorData; class DiagramList { public: - /// Constructur containing an empty list. + /// Constructor containing an empty list. DiagramList(); ~DiagramList(); diff --git a/Applications/DataExplorer/DataView/DiagramView/DiagramScene.cpp b/Applications/DataExplorer/DataView/DiagramView/DiagramScene.cpp index 195b46d43702faa336aa3d83fe3a98e5c3f9826e..b18c820bce9bf9c3b8ea669965f144fcc8098e78 100644 --- a/Applications/DataExplorer/DataView/DiagramView/DiagramScene.cpp +++ b/Applications/DataExplorer/DataView/DiagramView/DiagramScene.cpp @@ -18,8 +18,8 @@ #include <limits> // default size of a new window -const float DEFAULTX = 500.0; -const float DEFAULTY = 300.0; +static constexpr float kDefaultX = 500.0; +static constexpr float kDefaultY = 300.0; /** * Creates a new scene. Since no data points are given some default @@ -175,8 +175,8 @@ void DiagramScene::adjustScaling() { if ((_unscaledBounds.width() > 0) && (_unscaledBounds.height() > 0)) { - _scaleX = DEFAULTX / static_cast<float>(_unscaledBounds.width()); - _scaleY = DEFAULTY / static_cast<float>(_unscaledBounds.height()); + _scaleX = kDefaultX / static_cast<float>(_unscaledBounds.width()); + _scaleY = kDefaultY / static_cast<float>(_unscaledBounds.height()); } } diff --git a/Applications/DataExplorer/DataView/DiagramView/QGraphicsGrid.h b/Applications/DataExplorer/DataView/DiagramView/QGraphicsGrid.h index da4a0a82c875c9695bb101988e1a48ab1e32f643..2b3754a787197c5b0cf8881e7974d8916555c34c 100644 --- a/Applications/DataExplorer/DataView/DiagramView/QGraphicsGrid.h +++ b/Applications/DataExplorer/DataView/DiagramView/QGraphicsGrid.h @@ -18,9 +18,10 @@ #include <QPen> /** - * \brief A 2D carthesian grid as a QGraphicsItem. + * \brief A 2D cartesian grid as a QGraphicsItem. * - * A 2D carthesian grid as a QGraphicsItem. The size of the grid cells is constant but can be anisotroph. + * A 2D cartesian grid as a QGraphicsItem. The size of the grid cells is + * constant but can be anisotroph. */ class QGraphicsGrid : public QGraphicsItem { diff --git a/Applications/Utils/MeshGeoTools/VerticalSliceFromLayers.cpp b/Applications/Utils/MeshGeoTools/VerticalSliceFromLayers.cpp index b8cb096410734ecb90c63b236a22539784594f79..8d93f4dce2c991de5aef5e93b75784451cdb1a3c 100644 --- a/Applications/Utils/MeshGeoTools/VerticalSliceFromLayers.cpp +++ b/Applications/Utils/MeshGeoTools/VerticalSliceFromLayers.cpp @@ -207,7 +207,7 @@ std::pair<Eigen::Matrix3d, double> rotateGeometryToXY( /// This encapsulates a workaround: /// For unknown reasons, the GML->GEO converter will not work correctly when /// inputting the merged geometry directly. However, if the geometry is saved to -/// a file and immedeately loaded again, everything works fine. +/// a file and immediately loaded again, everything works fine. void consolidateGeometry(GeoLib::GEOObjects& geo, std::string const& output_name, std::string& merged_geo_name, diff --git a/ProcessLib/ComponentTransport/LookupTable.cpp b/ProcessLib/ComponentTransport/LookupTable.cpp index 39f64ead08978918538c8c957a8f5e592d802e31..9a53dec8ad6935438f8241e57ec7293cb9a7f1fb 100644 --- a/ProcessLib/ComponentTransport/LookupTable.cpp +++ b/ProcessLib/ComponentTransport/LookupTable.cpp @@ -64,7 +64,7 @@ void LookupTable::lookup(std::vector<GlobalVector*> const& x, EntryInput base_entry_input; for (auto const& input_field : input_fields) { - // process id and variable id are equilvalent in the case the + // process id and variable id are equivalent in the case the // staggered coupling scheme is adopted. auto const process_id = input_field.variable_id; auto const& variable_name = input_field.name; diff --git a/ProcessLib/TH2M/IntegrationPointData.h b/ProcessLib/TH2M/IntegrationPointData.h index 9b85ad46c76949a87aeacd7b600515ca802989e5..fed694cbf1a138e2097def2ff82509f225c68182 100644 --- a/ProcessLib/TH2M/IntegrationPointData.h +++ b/ProcessLib/TH2M/IntegrationPointData.h @@ -83,7 +83,7 @@ struct IntegrationPointData final // vapour pressure (water component partial gas phase pressure) double pWGR = std::numeric_limits<double>::quiet_NaN(); - // real constitutent partial densities + // real constituent partial densities double rhoCGR = std::numeric_limits<double>::quiet_NaN(); double rhoCGR_prev = std::numeric_limits<double>::quiet_NaN(); double rhoWGR = std::numeric_limits<double>::quiet_NaN(); @@ -93,7 +93,7 @@ struct IntegrationPointData final double rhoWLR = std::numeric_limits<double>::quiet_NaN(); double rhoWLR_prev = std::numeric_limits<double>::quiet_NaN(); - // real constitutent partial density derivatives + // real constituent partial density derivatives double drhoCGR_dpGR = std::numeric_limits<double>::quiet_NaN(); double drhoWGR_dpGR = std::numeric_limits<double>::quiet_NaN(); double drhoCGR_dpCap = std::numeric_limits<double>::quiet_NaN(); diff --git a/Tests/MathLib/Polynomials.h b/Tests/MathLib/Polynomials.h index 2f39d2f3b91f2e73278fe932342d3610b63ed31d..d2c17d00ae9eaafeff29603eefa54db2a27d8168 100644 --- a/Tests/MathLib/Polynomials.h +++ b/Tests/MathLib/Polynomials.h @@ -312,7 +312,7 @@ template <> struct FNonseparablePolynomial<3> final : FBase { // The number of coefficients/monomials are obtained as follows: Compute the - // number of combinations with repititions when drawing + // number of combinations with repetitions when drawing // polynomial_degree times from the set { x, y, z, 1 } explicit FNonseparablePolynomial(unsigned polynomial_degree) : FBase(binomial_coefficient(4 + polynomial_degree - 1, 4 - 1)), @@ -394,7 +394,7 @@ template <> struct FNonseparablePolynomial<2> final : FBase { // The number of coefficients/monomials are obtained as follows: Compute the - // number of combinations with repititions when drawing + // number of combinations with repetitions when drawing // polynomial_degree times from the set { x, y, 1 } explicit FNonseparablePolynomial(unsigned polynomial_degree) : FBase(binomial_coefficient(3 + polynomial_degree - 1, 3 - 1)), @@ -464,7 +464,7 @@ template <> struct FNonseparablePolynomial<1> final : FBase { // The number of coefficients/monomials are obtained as follows: Compute the - // number of combinations with repititions when drawing + // number of combinations with repetitions when drawing // polynomial_degree times from the set { x, 1 } explicit FNonseparablePolynomial(unsigned polynomial_degree) : FBase(binomial_coefficient(2 + polynomial_degree - 1, 2 - 1)), diff --git a/web/content/docs/benchmarks/thermal-two-phase-flow/TCE-diffusion/AH2010.m b/web/content/docs/benchmarks/thermal-two-phase-flow/TCE-diffusion/AH2010.m index 0b20a31b19ef7a61b85d56097aa4d4132bd77067..7848a12f7e79e80a02660746c5195f5037e1059e 100644 --- a/web/content/docs/benchmarks/thermal-two-phase-flow/TCE-diffusion/AH2010.m +++ b/web/content/docs/benchmarks/thermal-two-phase-flow/TCE-diffusion/AH2010.m @@ -15,15 +15,15 @@ z = [1 0.980568 0.961883 0.943917 0.926642 0.910031 0.89406 0.878702 0.863935 0. S_w = [0.00634606 0.00725321 0.00828275 0.00945034 0.010773 0.0122694 0.0139604 0.0158688 0.0180196 0.0204401 0.02316 0.0262117 0.02963 0.0334521 0.0377181 0.0424703 0.0477534 0.0536138 0.0601001 0.0672615 0.075148 0.0838096 0.093295 0.103651 0.11492 0.127141 0.140347 0.154563 0.169803 0.186072 0.203364 0.221657 0.240916 0.261092 0.282118 0.303916 0.326391 0.349439 0.372943 0.396778 0.420821 0.443602 0.466042 0.488095 0.509719 0.530879 0.551545 0.571695 0.591309 0.610375 0.628884 0.646829 0.664209 0.681023 0.697275 0.71297 0.728113 0.742713 0.756779 0.770321 0.78335 0.795875 0.80791 0.819465 0.830553 0.841184 0.851372 0.861126 0.870459 0.879381 0.887903 0.896036 0.903789 0.911172 0.918195 0.924865 0.931193 0.937186 0.942851 0.948197 0.953231 0.95796 0.962391 0.96653 0.970384 0.97396 0.977263 0.980301 0.983081 0.985608 0.987891 0.989937 0.991754 0.993351 0.994737 0.995925 0.996924 0.997747 0.998409 0.998925 0.99931 0.999585 0.999755 0.99984 0.999867 0.999873 0.999878 0.999884 0.999889 0.999894 0.9999 0.999905 0.99991 0.999916 0.999921 0.999926 0.999932 0.999937 0.999942 0.999947 0.999952 0.999957 0.999961 0.999965 0.99997 0.999974 0.999977 0.999981 0.999984 0.999987 0.999989 0.999991 0.999993 0.999995 0.999996 0.999997 0.999998 0.999999 0.999999 1 1 1 1 1 1 1]; depth = 1 - z; phi = 0.38; % porosity -D_a = 8.3e-6; % TCE diffusion coefficient in air -D_w = 9.1e-10; % TCE diffusion coefficient in water +D_a = 8.3e-6; % TCE diffusion coefficient in air +D_w = 9.1e-10; % TCE diffusion coefficient in water theta_a = phi * (1-S_w); % volumetric air content theta_w = phi * S_w; % volumetric water content alpha_z = 1e-3; % vertical transverse dispersivity v = 0; % seepage velocity H = 0.38; % Henry constant of TCE (non-dimensional) N_G = 101325/8.31446/298.15; % molar density of ideal gas at 25 dC -m = 0.8; % van Genuchten paramter +m = 0.8; % van Genuchten parameter k_rel_wet = sqrt(S_w).*(1-(1-S_w.^(1/m)).^m).^2; % relative permeability of wetting phase A = D_a*theta_a.^(10/3)/phi/phi + (D_w*theta_w.^(10/3)/phi/phi + alpha_z*v*k_rel_wet)/H; F = 1./A; @@ -32,7 +32,7 @@ for i=2:110 ddepth = depth(i)-depth(i-1); I(i) = I(i-1) + (F(i)+F(i-1))/2 * ddepth; end -c_rel = I./I(end); % relative TCE concentration in the gas phase +c_rel = I./I(end); % relative TCE concentration in the gas phase d2WT = depth(110) - depth; % distance to water table (+ means above) semilogx(c_rel, d2WT(1:110)); ylim([0 0.6]);