From a2246d331b61500a7a98d90466cc08541462579a Mon Sep 17 00:00:00 2001 From: Markus Blatt Date: Fri, 2 Jul 2021 14:56:19 +0200 Subject: [PATCH] Spelling fixes Gbp-Pq: Name 0005-Spelling-fixes.patch --- doc/man1/flow.1 | 4 ++-- ebos/eclgenerictracermodel.cc | 2 +- ebos/eclproblem.hh | 2 +- opm/core/props/satfunc/RelpermDiagnostics.cpp | 2 +- opm/simulators/flow/BlackoilModelEbos.hpp | 2 +- opm/simulators/linalg/FlowLinearSolverParameters.hpp | 4 ++-- opm/simulators/linalg/ParallelOverlappingILU0.hpp | 2 +- opm/simulators/linalg/bda/FPGABILU0.cpp | 2 +- opm/simulators/linalg/bda/openclKernels.cpp | 2 +- opm/simulators/wells/BlackoilWellModel.hpp | 2 +- opm/simulators/wells/BlackoilWellModelGeneric.cpp | 2 +- opm/simulators/wells/GasLiftStage2.cpp | 2 +- opm/simulators/wells/WellGroupHelpers.cpp | 2 +- opm/simulators/wells/WellInterfaceGeneric.cpp | 4 ++-- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/doc/man1/flow.1 b/doc/man1/flow.1 index fed1a1170..677d06fb8 100644 --- a/doc/man1/flow.1 +++ b/doc/man1/flow.1 @@ -130,7 +130,7 @@ List of Eclipse keywords which should be ignored. As a ':' separated string. Def The fill\-in level of the linear solver's ILU preconditioner. Default: 0 .TP \fB\-\-ilu\-redblack\fR=\fI\,BOOLEAN\/\fR -Use red\-black partioning for the ILU preconditioner. Default: false +Use red\-black partitioning for the ILU preconditioner. Default: false .TP \fB\-\-ilu\-relaxation\fR=\fI\,SCALAR\/\fR The relaxation factor of the linear solver's ILU preconditioner. Default: 0.9 @@ -184,7 +184,7 @@ Maximum number of Newton iterations before relaxed tolerances are used for the C Maximum number of iterations to determine solution the well equations. Default: 30 .TP \fB\-\-milu\-variant\fR=\fI\,STRING\/\fR -Specify which variant of the modified\-ILU preconditioner ought to be used. Possible variants are: ILU (default, plain ILU), MILU_1 (lump diagonal with dropped row entries), MILU_2 (lump diagonal with the sum of the absolute values of the dropped row entries), MILU_3 (if diagonal is positive add sum of dropped row entrires. Otherwise substract them), MILU_4 (if diagonal is positive add sum of dropped row entrires. Otherwise do nothing. Default: "ILU" +Specify which variant of the modified\-ILU preconditioner ought to be used. Possible variants are: ILU (default, plain ILU), MILU_1 (lump diagonal with dropped row entries), MILU_2 (lump diagonal with the sum of the absolute values of the dropped row entries), MILU_3 (if diagonal is positive add sum of dropped row entrires. Otherwise subtract them), MILU_4 (if diagonal is positive add sum of dropped row entrires. Otherwise do nothing. Default: "ILU" .TP \fB\-\-min\-time\-step\-based\-on\-newton\-iterations\fR=\fI\,SCALAR\/\fR The minimum time step size (in days for field and metric unit and hours for lab unit) can be reduced to based on newton iteration counts. Default: 0 diff --git a/ebos/eclgenerictracermodel.cc b/ebos/eclgenerictracermodel.cc index a57d348e8..12faa686e 100644 --- a/ebos/eclgenerictracermodel.cc +++ b/ebos/eclgenerictracermodel.cc @@ -95,7 +95,7 @@ doInit(bool enabled, size_t numGridDof, if (!enabled) { if (gridView_.comm().rank() == 0) { OpmLog::warning("Keyword TRACERS has only experimental support, and is hence ignored.\n" - "The experimental tracer model can still be used, but must be set explicitely.\n" + "The experimental tracer model can still be used, but must be set explicitly.\n" "To use tracers, set the command line option: --enable-tracer-model=true" "\n"); } diff --git a/ebos/eclproblem.hh b/ebos/eclproblem.hh index 805a112cb..40eef6a9e 100644 --- a/ebos/eclproblem.hh +++ b/ebos/eclproblem.hh @@ -2930,7 +2930,7 @@ private: dtNext = std::min(this->maxTimeStepSize_, remainingEpisodeTime/2.0); if (simulator.episodeStarts()) { - // if a well event occured, respect the limit for the maximum time step after + // if a well event occurred, respect the limit for the maximum time step after // that, too int reportStepIdx = std::max(episodeIdx, 0); const auto& events = simulator.vanguard().schedule()[reportStepIdx].events(); diff --git a/opm/core/props/satfunc/RelpermDiagnostics.cpp b/opm/core/props/satfunc/RelpermDiagnostics.cpp index b780b84a1..f3c89be56 100644 --- a/opm/core/props/satfunc/RelpermDiagnostics.cpp +++ b/opm/core/props/satfunc/RelpermDiagnostics.cpp @@ -326,7 +326,7 @@ namespace Opm{ } if (krg.front() > 1.0 || krg.back() < 0) { - const std::string msg = "In SLGOF table SATNUM = " + regionIdx + ", krg shoule be in range [0, 1]."; + const std::string msg = "In SLGOF table SATNUM = " + regionIdx + ", krg should be in range [0, 1]."; OpmLog::error(msg); } if (krg.back() != 0.0) { diff --git a/opm/simulators/flow/BlackoilModelEbos.hpp b/opm/simulators/flow/BlackoilModelEbos.hpp index 0f0ceeeee..6d6c4892f 100644 --- a/opm/simulators/flow/BlackoilModelEbos.hpp +++ b/opm/simulators/flow/BlackoilModelEbos.hpp @@ -267,7 +267,7 @@ namespace Opm { std::fill(wasSwitched_.begin(), wasSwitched_.end(), false); if (param_.update_equations_scaling_) { - std::cout << "equation scaling not suported yet" << std::endl; + std::cout << "equation scaling not supported yet" << std::endl; //updateEquationsScaling(); } report.pre_post_time += perfTimer.stop(); diff --git a/opm/simulators/linalg/FlowLinearSolverParameters.hpp b/opm/simulators/linalg/FlowLinearSolverParameters.hpp index 7fe037779..b702ed799 100644 --- a/opm/simulators/linalg/FlowLinearSolverParameters.hpp +++ b/opm/simulators/linalg/FlowLinearSolverParameters.hpp @@ -304,8 +304,8 @@ namespace Opm EWOMS_REGISTER_PARAM(TypeTag, int, LinearSolverRestart, "The number of iterations after which GMRES is restarted"); EWOMS_REGISTER_PARAM(TypeTag, int, FlowLinearSolverVerbosity, "The verbosity level of the linear solver (0: off, 2: all)"); EWOMS_REGISTER_PARAM(TypeTag, int, IluFillinLevel, "The fill-in level of the linear solver's ILU preconditioner"); - EWOMS_REGISTER_PARAM(TypeTag, std::string, MiluVariant, "Specify which variant of the modified-ILU preconditioner ought to be used. Possible variants are: ILU (default, plain ILU), MILU_1 (lump diagonal with dropped row entries), MILU_2 (lump diagonal with the sum of the absolute values of the dropped row entries), MILU_3 (if diagonal is positive add sum of dropped row entrires. Otherwise substract them), MILU_4 (if diagonal is positive add sum of dropped row entrires. Otherwise do nothing"); - EWOMS_REGISTER_PARAM(TypeTag, bool, IluRedblack, "Use red-black partioning for the ILU preconditioner"); + EWOMS_REGISTER_PARAM(TypeTag, std::string, MiluVariant, "Specify which variant of the modified-ILU preconditioner ought to be used. Possible variants are: ILU (default, plain ILU), MILU_1 (lump diagonal with dropped row entries), MILU_2 (lump diagonal with the sum of the absolute values of the dropped row entries), MILU_3 (if diagonal is positive add sum of dropped row entrires. Otherwise subtract them), MILU_4 (if diagonal is positive add sum of dropped row entrires. Otherwise do nothing"); + EWOMS_REGISTER_PARAM(TypeTag, bool, IluRedblack, "Use red-black partitioning for the ILU preconditioner"); EWOMS_REGISTER_PARAM(TypeTag, bool, IluReorderSpheres, "Whether to reorder the entries of the matrix in the red-black ILU preconditioner in spheres starting at an edge. If false the original ordering is preserved in each color. Otherwise why try to ensure D4 ordering (in a 2D structured grid, the diagonal elements are consecutive)."); EWOMS_REGISTER_PARAM(TypeTag, bool, UseGmres, "Use GMRES as the linear solver"); EWOMS_REGISTER_PARAM(TypeTag, bool, LinearSolverRequireFullSparsityPattern, "Produce the full sparsity pattern for the linear solver"); diff --git a/opm/simulators/linalg/ParallelOverlappingILU0.hpp b/opm/simulators/linalg/ParallelOverlappingILU0.hpp index 99a320369..53e4290aa 100644 --- a/opm/simulators/linalg/ParallelOverlappingILU0.hpp +++ b/opm/simulators/linalg/ParallelOverlappingILU0.hpp @@ -1058,7 +1058,7 @@ public: catch (const Dune::MatrixBlockError& error) { message = error.what(); - std::cerr<<"Exception occured on process " << rank << " during " << + std::cerr<<"Exception occurred on process " << rank << " during " << "setup of ILU0 preconditioner with message: " << message<::create_preconditioner(BlockedMatrix *mat jRowEnd = LUMat->rowPointers[j + 1]; jk = diagIndex[j] + 1; ik = ij + 1; - // substract that row scaled by the pivot from this row. + // subtract that row scaled by the pivot from this row. while (ik < iRowEnd && jk < jRowEnd) { if (LUMat->colIndices[ik] == LUMat->colIndices[jk]) { blockMultSub(LUMat->nnzValues + ik * bs * bs, pivot, LUMat->nnzValues + jk * bs * bs); diff --git a/opm/simulators/linalg/bda/openclKernels.cpp b/opm/simulators/linalg/bda/openclKernels.cpp index b21863d78..73871e1ff 100644 --- a/opm/simulators/linalg/bda/openclKernels.cpp +++ b/opm/simulators/linalg/bda/openclKernels.cpp @@ -941,7 +941,7 @@ void OpenclKernels::apply_stdwells_no_reorder(cl::Buffer& d_Cnnzs_ocl, cl::Buffe int jRowEnd = LUrows[j + 1]; int jk = diagIndex[j] + 1; int ik = ij + 1; - // substract that row scaled by the pivot from this row. + // subtract that row scaled by the pivot from this row. while (ik < iRowEnd && jk < jRowEnd) { if (LUcols[ik] == LUcols[jk]) { block_mult_sub(LUvals + ik * bs * bs, pivot + lmem_offset, LUvals + jk * bs * bs); diff --git a/opm/simulators/wells/BlackoilWellModel.hpp b/opm/simulators/wells/BlackoilWellModel.hpp index f07c1638f..657645ffc 100644 --- a/opm/simulators/wells/BlackoilWellModel.hpp +++ b/opm/simulators/wells/BlackoilWellModel.hpp @@ -244,7 +244,7 @@ namespace Opm { return wsrpt; } - // substract Binv(D)rw from r; + // subtract Binv(D)rw from r; void apply( BVector& r) const; // subtract B*inv(D)*C * x from A*x diff --git a/opm/simulators/wells/BlackoilWellModelGeneric.cpp b/opm/simulators/wells/BlackoilWellModelGeneric.cpp index c601f0e18..c43acf1bb 100644 --- a/opm/simulators/wells/BlackoilWellModelGeneric.cpp +++ b/opm/simulators/wells/BlackoilWellModelGeneric.cpp @@ -1091,7 +1091,7 @@ checkGconsaleLimits(const Group& group, double sales_rate = production_rate - injection_rate; double production_target = gconsale.sales_target + injection_rate; - // add import rate and substract consumption rate for group for gas + // add import rate and subtract consumption rate for group for gas if (schedule()[reportStepIdx].gconsump().has(group.name())) { const auto& gconsump = schedule()[reportStepIdx].gconsump().get(group.name(), summaryState_); if (phase_usage_.phase_used[BlackoilPhases::Vapour]) { diff --git a/opm/simulators/wells/GasLiftStage2.cpp b/opm/simulators/wells/GasLiftStage2.cpp index 26101dc7d..d9bbb51dd 100644 --- a/opm/simulators/wells/GasLiftStage2.cpp +++ b/opm/simulators/wells/GasLiftStage2.cpp @@ -932,7 +932,7 @@ getEcoGradients(std::vector &inc_grads, std::vector &dec_gra // Recalculate gradients (and related information, see struct GradInfo in // GasLiftSingleWell.hpp) after an ALQ increment -// has been given from the well with minumum decremental gradient (represented +// has been given from the well with minimum decremental gradient (represented // by the input argument min_dec_grad_itr) to the well with the largest // incremental gradient (represented by input argument max_inc_grad_itr). // diff --git a/opm/simulators/wells/WellGroupHelpers.cpp b/opm/simulators/wells/WellGroupHelpers.cpp index 166376f6a..f7587ae6e 100644 --- a/opm/simulators/wells/WellGroupHelpers.cpp +++ b/opm/simulators/wells/WellGroupHelpers.cpp @@ -642,7 +642,7 @@ namespace WellGroupHelpers rein[phase] = sumWellPhaseRates(false, group, schedule, wellState, reportStepIdx, phase, /*isInjector*/ false); } - // add import rate and substract consumption rate for group for gas + // add import rate and subtract consumption rate for group for gas if (schedule[reportStepIdx].gconsump().has(group.name())) { const auto& gconsump = schedule[reportStepIdx].gconsump().get(group.name(), st); if (pu.phase_used[BlackoilPhases::Vapour]) { diff --git a/opm/simulators/wells/WellInterfaceGeneric.cpp b/opm/simulators/wells/WellInterfaceGeneric.cpp index 6888bb661..04e5a0242 100644 --- a/opm/simulators/wells/WellInterfaceGeneric.cpp +++ b/opm/simulators/wells/WellInterfaceGeneric.cpp @@ -338,7 +338,7 @@ bool WellInterfaceGeneric::isVFPActive(DeferredLogger& deferred_logger) const if (vfp_properties_->getProd()->hasTable(table_id)) { return true; } else { - OPM_DEFLOG_THROW(std::runtime_error, "VFPPROD table " << std::to_string(table_id) << " is specfied," + OPM_DEFLOG_THROW(std::runtime_error, "VFPPROD table " << std::to_string(table_id) << " is specified," << " for well " << name() << ", while we could not access it during simulation", deferred_logger); } } @@ -351,7 +351,7 @@ bool WellInterfaceGeneric::isVFPActive(DeferredLogger& deferred_logger) const if (vfp_properties_->getInj()->hasTable(table_id)) { return true; } else { - OPM_DEFLOG_THROW(std::runtime_error, "VFPINJ table " << std::to_string(table_id) << " is specfied," + OPM_DEFLOG_THROW(std::runtime_error, "VFPINJ table " << std::to_string(table_id) << " is specified," << " for well " << name() << ", while we could not access it during simulation", deferred_logger); } }