From 2864654d0d17b05ef6e660349644654692d4b7f8 Mon Sep 17 00:00:00 2001 From: Dmitri Naumov <github@naumov.de> Date: Sun, 28 Feb 2021 18:47:47 +0100 Subject: [PATCH] Fix spelling mistakes. --- .../ApplicationsLib/LinearSolverLibrarySetup.h | 2 +- Applications/CLI/ogs.cpp | 2 +- Applications/DataExplorer/Base/RecentFiles.h | 2 +- Applications/DataExplorer/Base/modeltest.cpp | 2 +- .../DataExplorer/DataView/DiagramView/DiagramScene.cpp | 2 +- .../DataExplorer/DataView/MeshLayerEditDialog.cpp | 4 ++-- Applications/DataExplorer/DataView/RasterDataToMesh.ui | 2 +- .../DataExplorer/VtkVis/VtkCompositeGeoObjectFilter.h | 2 +- Applications/DataExplorer/VtkVis/VtkVisPipeline.cpp | 6 +++--- .../DataExplorer/VtkVis/VtkVisPipelineView.cpp | 4 ++-- Applications/DataExplorer/VtkVis/VtkVisTabWidget.h | 2 +- Applications/DataHolderLib/FemCondition.h | 2 +- Applications/FileIO/AsciiRasterInterface.h | 2 +- Applications/FileIO/CsvInterface.h | 2 +- Applications/FileIO/Gmsh/GMSHPolygonTree.cpp | 2 +- Applications/FileIO/GocadIO/GocadAsciiReader.cpp | 4 ++-- Applications/FileIO/GocadIO/GocadEnums.cpp | 4 ++-- Applications/FileIO/Legacy/OGSIOVer4.cpp | 8 ++++---- Applications/FileIO/SWMM/SWMMInterface.cpp | 2 +- Applications/FileIO/SWMM/SWMMInterface.h | 4 ++-- Applications/Utils/FileConverter/ConvertSHPToGLI.cpp | 2 +- Applications/Utils/MeshEdit/AddFaultToVoxelGrid.cpp | 2 +- Applications/Utils/MeshEdit/AddLayer.cpp | 2 +- .../MeshEdit/ResetPropertiesInPolygonalRegion.cpp | 2 +- .../Utils/MeshGeoTools/IntegrateBoreholesIntoMesh.cpp | 2 +- .../computeSurfaceNodeIDsInPolygonalRegion.cpp | 2 +- Applications/Utils/MeshGeoTools/identifySubdomains.cpp | 2 +- .../ModelPreparation/PartitionMesh/PartitionMesh.cpp | 2 +- .../Utils/PostProcessing/Raster2PointCloud.cpp | 4 ++-- Applications/Utils/PostProcessing/postLIE.cpp | 2 +- BaseLib/ConfigTree.h | 4 ++-- BaseLib/Histogram.h | 2 +- BaseLib/IO/XmlIO/Qt/XMLQtInterface.h | 2 +- BaseLib/StringTools.h | 6 +++--- CHANGELOG.md | 8 ++++---- CMakeLists.txt | 2 +- .../material/porous_medium/porous_medium/a_id.md | 2 +- .../Ehlers/damage_properties/t_alpha_d.md | 2 +- .../kinetic_reactant/t_chemical_formula.md | 2 +- .../kinetic_reactants/kinetic_reactant/t_fix_amount.md | 2 +- .../rates/rate/expression/i_expression.md | 2 +- .../prj/linear_solvers/linear_solver/t_name.md | 2 +- .../process_variable/t_initial_condition.md | 2 +- .../c_BuildingPowerCurveConstantFlow.md | 2 +- .../FixedPowerConstantFlow/t_power.md | 2 +- .../pipes/t_distance_between_pipes.md | 2 +- .../CompareJacobians/t_jacobian_assembler.md | 2 +- .../jacobian_assembler/CompareJacobians/t_log_file.md | 2 +- .../i_search_length_algorithm.md | 2 +- .../ProjectFile/prj/search_length_algorithm/t_type.md | 2 +- .../ProjectFile/prj/time_loop/output/t_prefix.md | 4 ++-- .../ProjectFile/prj/time_loop/output/t_suffix.md | 4 ++-- .../EmbeddedFracturePermeability/t_initial_aperture.md | 2 +- GeoLib/AnalyticalGeometry.h | 2 +- GeoLib/GEOObjects.h | 2 +- GeoLib/IO/TINInterface.h | 2 +- GeoLib/IO/XmlIO/Qt/XmlGmlInterface.h | 2 +- GeoLib/IO/XmlIO/Qt/XmlStnInterface.h | 2 +- GeoLib/LineSegment.h | 2 +- GeoLib/OctTree-impl.h | 2 +- GeoLib/OctTree.h | 4 ++-- GeoLib/PointVec.h | 2 +- MaterialLib/Adsorption/DensityNunez.cpp | 4 ++-- .../Fluid/Viscosity/TemperatureDependentViscosity.h | 2 +- MaterialLib/FractureModels/LogPenalty.h | 2 +- MaterialLib/MPL/Properties/Exponential.h | 2 +- MaterialLib/PorousMedium/Permeability/Permeability.h | 2 +- MaterialLib/SolidModels/MFront/CreateMFront.cpp | 2 +- MaterialLib/SolidModels/MFront/ModCamClay_ShearTest.py | 2 +- MaterialLib/SolidModels/MFront/ModCamClay_TriaxTest.py | 2 +- MathLib/GeometricBasics.cpp | 2 +- MathLib/LinAlg/Eigen/EigenMapTools.h | 10 +++++----- MathLib/LinAlg/Eigen/EigenOption.h | 2 +- MathLib/LinAlg/EigenLis/EigenLisLinearSolver.cpp | 2 +- MathLib/LinAlg/Lis/LisMatrix.h | 2 +- MathLib/LinAlg/PETSc/PETScLinearSolver.h | 2 +- MathLib/LinAlg/PETSc/PETScMatrix.h | 4 ++-- MathLib/LinAlg/PETSc/PETScVector.cpp | 2 +- MathLib/LinAlg/PETSc/PETScVector.h | 8 ++++---- MathLib/ODE/CVodeSolver.cpp | 2 +- MathLib/ODE/FunctionHandles.h | 2 +- MathLib/ODE/ODESolver.h | 2 +- MeshGeoToolsLib/GeoMapper.h | 2 +- MeshGeoToolsLib/HeuristicSearchLength.h | 2 +- MeshGeoToolsLib/MeshEditing/ResetMeshElementProperty.h | 2 +- MeshGeoToolsLib/MeshNodeSearcher.cpp | 2 +- MeshLib/Elements/Element.h | 4 ++-- MeshLib/IO/MPI_IO/NodePartitionedMeshReader.cpp | 2 +- MeshLib/IO/MPI_IO/NodePartitionedMeshReader.h | 10 +++++----- MeshLib/IO/XDMF/Xdmf3Writer.h | 2 +- MeshLib/IO/writeMeshToFile.cpp | 2 +- MeshLib/MeshEditing/MeshRevision.h | 4 ++-- MeshLib/MeshQuality/MeshValidation.cpp | 2 +- MeshLib/NodePartitionedMesh.h | 4 ++-- MeshLib/Properties-impl.h | 2 +- MeshLib/Vtk/VtkMappedMeshSource.h | 2 +- NumLib/DOF/LocalToGlobalIndexMap.cpp | 4 ++-- NumLib/DOF/LocalToGlobalIndexMap.h | 2 +- NumLib/DOF/MatrixProviderUser.h | 2 +- NumLib/DOF/MeshComponentMap.cpp | 2 +- .../LocalLinearLeastSquaresExtrapolator.cpp | 4 ++-- NumLib/NewtonRaphson.h | 2 +- NumLib/ODESolver/NonlinearSolver.cpp | 4 ++-- .../Python/PythonBoundaryCondition.cpp | 2 +- .../Python/PythonBoundaryConditionLocalAssembler.h | 2 +- ProcessLib/CentralDifferencesJacobianAssembler.cpp | 2 +- ProcessLib/HeatTransportBHE/BHE/BHECommon.h | 2 +- ProcessLib/HeatTransportBHE/BHE/BHE_1P.h | 6 +++--- ProcessLib/HeatTransportBHE/BHE/BHE_1U.h | 8 ++++---- ProcessLib/HeatTransportBHE/BHE/BHE_2U.h | 4 ++-- ProcessLib/HeatTransportBHE/BHE/BHE_CXA.h | 2 +- ProcessLib/HeatTransportBHE/BHE/BHE_CXC.h | 2 +- .../HeatTransportBHE/CreateHeatTransportBHEProcess.cpp | 2 +- .../HeatTransportBHE/HeatTransportBHEProcess.cpp | 6 +++--- ProcessLib/LIE/Common/LevelSetFunction.h | 4 ++-- ProcessLib/LIE/Common/MeshUtils.cpp | 6 +++--- ProcessLib/LIE/Common/Utils.h | 2 +- .../LIE/HydroMechanics/HydroMechanicsProcess.cpp | 2 +- .../LocalAssembler/LocalDataInitializer.h | 2 +- .../RichardsComponentTransportProcess.h | 2 +- .../RichardsMechanics/RichardsMechanicsFEM-impl.h | 2 +- ProcessLib/SmallDeformation/Tests.cmake | 2 +- .../Python/PythonSourceTermLocalAssembler.h | 2 +- ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h | 2 +- Tests/AutoCheckTools.h | 2 +- .../Parabolic/LiquidFlow/AxiSymTheis/axisym_theis.gml | 2 +- .../Parabolic/LiquidFlow/AxiSymTheis/axisym_theis.prj | 2 +- Tests/GeoLib/TestAABB.cpp | 6 +++--- Tests/MaterialLib/MFront.cpp | 6 +++--- Tests/MathLib/TestGaussLegendreIntegration.cpp | 2 +- Tests/MathLib/TestGlobalMatrixInterface.cpp | 2 +- Tests/MeshLib/TestFindElementsWithinRadius.cpp | 2 +- .../RichardsMechanics/MicroporosityComputation.cpp | 2 +- Tests/testrunner.cpp | 2 +- Tests/xdmfdiff/xdmfdiff.cpp | 6 +++--- scripts/cmake/CMakeSetup.cmake | 2 +- scripts/cmake/conan/conan.cmake | 2 +- scripts/cmake/jedbrown/CorrectWindowsPaths.cmake | 2 +- scripts/cmake/jedbrown/FindPETSc.cmake | 2 +- scripts/cmake/jedbrown/FindPackageMultipass.cmake | 2 +- scripts/cmake/jedbrown/ResolveCompilerPaths.cmake | 2 +- scripts/doc/linked-xml-file.py | 4 ++-- scripts/test/clang_sanitizer_blacklist.txt | 2 +- .../bgr_verification_examples/heatconduction.md | 2 +- .../bgr_verification_examples/hydromechanics.md | 2 +- .../bgr_verification_examples/liquid_flow.md | 2 +- .../benchmarks/bgr_verification_examples/mechanics.md | 2 +- .../bgr_verification_examples/thermomechanics.md | 2 +- .../CreepAfterExcavation.md | 2 +- .../benchmarks/creepbgra/BGRaVerificationExamples.md | 2 +- .../docs/benchmarks/elliptic/poisson_equation.md | 2 +- .../docs/benchmarks/heat-transport-bhe/3D_2U_BHE.md | 8 ++++---- .../benchmarks/heat-transport-bhe/3D_3BHEs_array.md | 2 +- .../benchmarks/heat-transport-bhe/3D_Beier_sandbox.md | 2 +- .../heat-transport-bhe/3D_coaxial_deep_BHE.md | 2 +- .../heatconduction/heatconduction-line_source_term.md | 4 ++-- web/content/docs/benchmarks/hydro-component/vdbc.md | 2 +- .../benchmarks/hydro-thermal/constant-viscosity.md | 2 +- ...eterogeneous-source-term-and-boundary-conditions.md | 2 +- web/content/docs/benchmarks/phase-field/pf_perc.md | 2 +- .../python-bc/hertz-contact/hertz-contact.md | 2 +- .../KineticReactant2.md | 2 +- .../benchmarks/reactive-transport/wetland/Wetland.md | 2 +- .../docs/devguide/advanced/configuration-options.md | 2 +- web/content/docs/devguide/advanced/python-env.md | 2 +- .../devguide/development-workflows/development-ides.md | 2 +- web/content/docs/tools/fileio/Mesh2Raster/index.md | 2 +- .../docs/tools/getting-started/first_steps/index.md | 2 +- .../tools/getting-started/video-tutorial/mesh_basin.py | 4 ++-- .../meshing-submeshes/identifySubdomains/index.md | 6 +++--- .../docs/tools/meshing-submeshes/submeshes/index.md | 4 ++-- .../model-preparation/add-element-quality/index.md | 2 +- .../index.md | 2 +- .../workflows/create-a-simple-parallel-model/index.md | 2 +- .../Heat_Transport_BHE.md | 8 ++++---- .../Heat_Transport_BHE_PipelineNetwork.md | 6 +++--- web/content/releases/6.2.0.md | 2 +- web/content/releases/6.2.1.md | 2 +- web/content/releases/6.2.2.md | 2 +- 179 files changed, 249 insertions(+), 249 deletions(-) diff --git a/Applications/ApplicationsLib/LinearSolverLibrarySetup.h b/Applications/ApplicationsLib/LinearSolverLibrarySetup.h index 7500430da98..85b94c75d29 100644 --- a/Applications/ApplicationsLib/LinearSolverLibrarySetup.h +++ b/Applications/ApplicationsLib/LinearSolverLibrarySetup.h @@ -12,7 +12,7 @@ /// The LinearSolverLibrarySetup takes care of proper initialization and /// shutting down of an external linear solver library. The concrete /// implementation is chosen by the build system. -/// An object of this class must be created at the begining of the scope where +/// An object of this class must be created at the beginning of the scope where /// it is used. When the scope closes (or the object is destroyed explicitly) /// library shutting down functions are automatically called. /// The default implementation is empty providing polymorphic behaviour when diff --git a/Applications/CLI/ogs.cpp b/Applications/CLI/ogs.cpp index 38b260fc3c0..72a5c732cfa 100644 --- a/Applications/CLI/ogs.cpp +++ b/Applications/CLI/ogs.cpp @@ -128,7 +128,7 @@ int main(int argc, char* argv[]) spdlog::set_pattern("%^%l:%$ %v"); spdlog::set_error_handler([](const std::string& msg) { std::cerr << "spdlog error: " << msg << std::endl; - OGS_FATAL("spdlog logger error occured."); + OGS_FATAL("spdlog logger error occurred."); }); INFO("This is OpenGeoSys-6 version {:s}.", diff --git a/Applications/DataExplorer/Base/RecentFiles.h b/Applications/DataExplorer/Base/RecentFiles.h index b217a9be17c..59e114b078b 100644 --- a/Applications/DataExplorer/Base/RecentFiles.h +++ b/Applications/DataExplorer/Base/RecentFiles.h @@ -21,7 +21,7 @@ class QString; /** - * The RecentFiles class provides functionality to store informations about + * The RecentFiles class provides functionality to store information about * recently used files (e.g. loaded or saved files). * Example Usage: * \code RecentFiles* recentFiles = new RecentFiles(this, SLOT(openRecentFile()), "recentFileList", "OpenGeoSys"); diff --git a/Applications/DataExplorer/Base/modeltest.cpp b/Applications/DataExplorer/Base/modeltest.cpp index 261b85199f4..45ba447084a 100644 --- a/Applications/DataExplorer/Base/modeltest.cpp +++ b/Applications/DataExplorer/Base/modeltest.cpp @@ -230,7 +230,7 @@ void ModelTest::index() */ void ModelTest::parent() { - // Make sure the model wont crash and will return an invalid QModelIndex + // Make sure the model won't crash and will return an invalid QModelIndex // when asked for the parent of an invalid index. Q_ASSERT(model->parent(QModelIndex()) == QModelIndex()); diff --git a/Applications/DataExplorer/DataView/DiagramView/DiagramScene.cpp b/Applications/DataExplorer/DataView/DiagramView/DiagramScene.cpp index 3cd33a16342..6bb8776674c 100644 --- a/Applications/DataExplorer/DataView/DiagramView/DiagramScene.cpp +++ b/Applications/DataExplorer/DataView/DiagramView/DiagramScene.cpp @@ -365,7 +365,7 @@ void DiagramScene::setDiagramBoundaries(DiagramList* list) } /** - * Updates the scene at the start and everytime new data points + * Updates the scene at the start and every time new data points * are added. Specifically, objects on the scene are assigned * their position in the new coordinate system and are resized * if necessary. diff --git a/Applications/DataExplorer/DataView/MeshLayerEditDialog.cpp b/Applications/DataExplorer/DataView/MeshLayerEditDialog.cpp index 4603e606c6d..1d33c8b0c34 100644 --- a/Applications/DataExplorer/DataView/MeshLayerEditDialog.cpp +++ b/Applications/DataExplorer/DataView/MeshLayerEditDialog.cpp @@ -289,7 +289,7 @@ void MeshLayerEditDialog::accept() if (this->_edits.isEmpty()) { OGSError::box( - "Please specifiy the number and\n type of layers and press 'Next'"); + "Please specify the number and\n type of layers and press 'Next'"); return; } @@ -315,7 +315,7 @@ void MeshLayerEditDialog::accept() if (!all_paths_set) { - OGSError::box("Please specifiy raster files for all layers."); + OGSError::box("Please specify raster files for all layers."); return; } diff --git a/Applications/DataExplorer/DataView/RasterDataToMesh.ui b/Applications/DataExplorer/DataView/RasterDataToMesh.ui index 1c352f09d96..b7aa03d1d56 100644 --- a/Applications/DataExplorer/DataView/RasterDataToMesh.ui +++ b/Applications/DataExplorer/DataView/RasterDataToMesh.ui @@ -29,7 +29,7 @@ <item row="2" column="0"> <widget class="QLabel" name="arrayTargetLabel"> <property name="text"> - <string>Crate array on</string> + <string>Create array on</string> </property> </widget> </item> diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeGeoObjectFilter.h b/Applications/DataExplorer/VtkVis/VtkCompositeGeoObjectFilter.h index 393d6a7adac..e516e3d96b3 100644 --- a/Applications/DataExplorer/VtkVis/VtkCompositeGeoObjectFilter.h +++ b/Applications/DataExplorer/VtkVis/VtkCompositeGeoObjectFilter.h @@ -19,7 +19,7 @@ class vtkThreshold; -/// @brief Hightlights a single GeoObject +/// @brief Highlights a single GeoObject class VtkCompositeGeoObjectFilter : public VtkCompositeFilter { public: diff --git a/Applications/DataExplorer/VtkVis/VtkVisPipeline.cpp b/Applications/DataExplorer/VtkVis/VtkVisPipeline.cpp index 87dec8e2fa6..afce826c140 100644 --- a/Applications/DataExplorer/VtkVis/VtkVisPipeline.cpp +++ b/Applications/DataExplorer/VtkVis/VtkVisPipeline.cpp @@ -591,10 +591,10 @@ void VtkVisPipeline::highlightMeshComponent(vtkUnstructuredGridAlgorithm const*c filter = VtkFilterFactory::CreateCompositeFilter( "VtkCompositeNodeSelectionFilter", parentItem->transformFilter()); - std::vector<unsigned> indeces(1); - indeces[0] = index; + std::vector<unsigned> indices(1); + indices[0] = index; static_cast<VtkCompositeNodeSelectionFilter*>(filter) - ->setSelectionArray(indeces); + ->setSelectionArray(indices); } VtkVisPointSetItem* item = new VtkVisPointSetItem(filter, parentItem, itemData); diff --git a/Applications/DataExplorer/VtkVis/VtkVisPipelineView.cpp b/Applications/DataExplorer/VtkVis/VtkVisPipelineView.cpp index 66400d79003..8a057b3ca06 100644 --- a/Applications/DataExplorer/VtkVis/VtkVisPipelineView.cpp +++ b/Applications/DataExplorer/VtkVis/VtkVisPipelineView.cpp @@ -64,8 +64,8 @@ void VtkVisPipelineView::setModel(QAbstractItemModel* model) { QTreeView::setModel(model); - // Move Visisble checkbox to the left. - // This is done here because at constructor time there arent any sections. + // Move Visible checkbox to the left. + // This is done here because at constructor time there aren't any sections. this->header()->moveSection(1, 0); } diff --git a/Applications/DataExplorer/VtkVis/VtkVisTabWidget.h b/Applications/DataExplorer/VtkVis/VtkVisTabWidget.h index 14f1a1e75ca..8437ffe5d07 100644 --- a/Applications/DataExplorer/VtkVis/VtkVisTabWidget.h +++ b/Applications/DataExplorer/VtkVis/VtkVisTabWidget.h @@ -33,7 +33,7 @@ public: explicit VtkVisTabWidget(QWidget* parent = nullptr); protected slots: - /// Updates the property panels to show informations on the given VtkVisPipelineItem. + /// Updates the property panels to show information on the given VtkVisPipelineItem. void setActiveItem(VtkVisPipelineItem* item); void on_arrayResetPushButton_clicked(); diff --git a/Applications/DataHolderLib/FemCondition.h b/Applications/DataHolderLib/FemCondition.h index afce5fd7003..8505919898b 100644 --- a/Applications/DataHolderLib/FemCondition.h +++ b/Applications/DataHolderLib/FemCondition.h @@ -46,7 +46,7 @@ public: /// Returns the name of the associated process variable std::string const getProcessVarName() const { return _process_var.name; } - /// Returns the numerical order of the process vairable + /// Returns the numerical order of the process variable ProcessVariable const& getProcessVar() const { return _process_var; } /// Returns the name of the parameter associated with the condition diff --git a/Applications/FileIO/AsciiRasterInterface.h b/Applications/FileIO/AsciiRasterInterface.h index b69fc57476e..31e53f1a503 100644 --- a/Applications/FileIO/AsciiRasterInterface.h +++ b/Applications/FileIO/AsciiRasterInterface.h @@ -29,7 +29,7 @@ namespace FileIO */ class AsciiRasterInterface { public: - /// Reads raster file by detecting type based on extension and then calling the apropriate method + /// Reads raster file by detecting type based on extension and then calling the appropriate method static GeoLib::Raster* readRaster(std::string const& fname); /// Reads an ArcGis ASC raster file diff --git a/Applications/FileIO/CsvInterface.h b/Applications/FileIO/CsvInterface.h index 3a27c978f89..c38b5b2dfeb 100644 --- a/Applications/FileIO/CsvInterface.h +++ b/Applications/FileIO/CsvInterface.h @@ -42,7 +42,7 @@ namespace FileIO class CsvInterface : public BaseLib::IO::Writer { public: - /// Contructor (only needed for writing files) + /// Constructor (only needed for writing files) CsvInterface(); /// Returns the number of vectors currently staged for writing. diff --git a/Applications/FileIO/Gmsh/GMSHPolygonTree.cpp b/Applications/FileIO/Gmsh/GMSHPolygonTree.cpp index 773ab1d9997..910e36cbf4f 100644 --- a/Applications/FileIO/Gmsh/GMSHPolygonTree.cpp +++ b/Applications/FileIO/Gmsh/GMSHPolygonTree.cpp @@ -218,7 +218,7 @@ void GMSHPolygonTree::checkIntersectionsSegmentExistingPolylines( // modify polyline ply->insertPoint(ply_segment_number+1, pnt_id); } else { // case: point exists already in geometry - // check if point is not alread in polyline p + // check if point is not already in polyline p std::size_t const k(seg_it_p.getSegmentNumber()); if (p->getPointID(k) != pnt_id && p->getPointID(k+1) != pnt_id) { p->insertPoint(k+1, pnt_id); diff --git a/Applications/FileIO/GocadIO/GocadAsciiReader.cpp b/Applications/FileIO/GocadIO/GocadAsciiReader.cpp index b484608fc51..b11c61e17d8 100644 --- a/Applications/FileIO/GocadIO/GocadAsciiReader.cpp +++ b/Applications/FileIO/GocadIO/GocadAsciiReader.cpp @@ -157,13 +157,13 @@ bool parsePropertyClass(std::ifstream& in) } /// Checks if the current line starts with one of the allowed keywords -std::string propertyCheck(std::string const& strng) +std::string propertyCheck(std::string const& string) { std::array<std::string, 7> const property_keywords = { {"PROPERTY_CLASSES", "PROP_LEGAL_RANGES", "NO_DATA_VALUES", "PROPERTY_KINDS", "PROPERTY_SUBCLASSES", "UNITS", "ESIZES"}}; - std::string const str = BaseLib::splitString(strng)[0]; + std::string const str = BaseLib::splitString(string)[0]; auto res = std::find(property_keywords.begin(), property_keywords.end(), str); if (res != property_keywords.end()) diff --git a/Applications/FileIO/GocadIO/GocadEnums.cpp b/Applications/FileIO/GocadIO/GocadEnums.cpp index a636d191c69..0e08e91fde6 100644 --- a/Applications/FileIO/GocadIO/GocadEnums.cpp +++ b/Applications/FileIO/GocadIO/GocadEnums.cpp @@ -17,7 +17,7 @@ std::string dataType2String(DataType const t) { if (t == DataType::UNDEFINED) { - return "[Undefinied Type]"; + return "[Undefined Type]"; } if (t == DataType::VSET) { @@ -42,7 +42,7 @@ std::string dataType2ShortString(DataType const t) { if (t == DataType::UNDEFINED) { - return "[undefinied]"; + return "[undefined]"; } if (t == DataType::VSET) { diff --git a/Applications/FileIO/Legacy/OGSIOVer4.cpp b/Applications/FileIO/Legacy/OGSIOVer4.cpp index 3eac115591d..a0e43eb71a9 100644 --- a/Applications/FileIO/Legacy/OGSIOVer4.cpp +++ b/Applications/FileIO/Legacy/OGSIOVer4.cpp @@ -42,7 +42,7 @@ namespace FileIO namespace Legacy { /************************************************************************** - GeoLib- Funktion: readPoints + GeoLib- Function: readPoints Aufgabe: Lesen der GLI Points und schreiben in einen Vector 08/2005 CC Implementation 01/2010 TF big modifications @@ -146,7 +146,7 @@ void readPolylinePointVector(const std::string &fname, /************************************************************************** GeoLib-Method: Read Task: Read polyline data from file - Programing: + Programming: 03/2004 CC Implementation 09/2004 OK file path for PLY files 07/2005 CC PLY id @@ -293,11 +293,11 @@ std::string readPolylines(std::istream &in, std::vector<GeoLib::Polyline*>* ply_ /************************************************************************** GeoLib-Method: readSurface Task: Read surface data from input stream - Programing: + Programming: 03/2004 OK Implementation 05/2005 OK EPSILON 09/2005 CC file_path_base - 01/2010 TF signatur modification, reimplementation + 01/2010 TF signature modification, reimplementation **************************************************************************/ /** read a single Surface */ std::string readSurface(std::istream& in, diff --git a/Applications/FileIO/SWMM/SWMMInterface.cpp b/Applications/FileIO/SWMM/SWMMInterface.cpp index 21492f6a4c0..094ae5f1140 100644 --- a/Applications/FileIO/SWMM/SWMMInterface.cpp +++ b/Applications/FileIO/SWMM/SWMMInterface.cpp @@ -462,7 +462,7 @@ bool SwmmInterface::convertSwmmInputToGeometry(std::string const& inp_file_name, { if (lines->size() != line_names.size()) { - ERR ("Lengt of line vector and line name vector do not match."); + ERR ("Length of line vector and line name vector do not match."); geo_objects.removePointVec(geo_name); for (auto ply : *lines) delete ply; diff --git a/Applications/FileIO/SWMM/SWMMInterface.h b/Applications/FileIO/SWMM/SWMMInterface.h index 0cea6b8adb6..bbd15854098 100644 --- a/Applications/FileIO/SWMM/SWMMInterface.h +++ b/Applications/FileIO/SWMM/SWMMInterface.h @@ -77,7 +77,7 @@ public: /// Get all the object names for a given object type std::vector<std::string> getNames(SwmmObject obj_type) const; - /// Returns the Name for the indexed object of the given type (or an empty string if an error occured). + /// Returns the Name for the indexed object of the given type (or an empty string if an error occurred). std::string getName(SwmmObject obj_type, std::size_t idx) const; /// Returns the number of objects of the given type. @@ -150,7 +150,7 @@ private: /// Reads pollutant names and parameters bool readPollutants(std::ifstream &in); - /// Returns the name of an array (or an empty string if errors occured) + /// Returns the name of an array (or an empty string if errors occurred) std::string getArrayName(SwmmObject obj_type, std::size_t var_idx, std::size_t n_pollutants) const; /// Reads the location of external rain gauge time series files. diff --git a/Applications/Utils/FileConverter/ConvertSHPToGLI.cpp b/Applications/Utils/FileConverter/ConvertSHPToGLI.cpp index a58a1b886c0..0e62c30a187 100644 --- a/Applications/Utils/FileConverter/ConvertSHPToGLI.cpp +++ b/Applications/Utils/FileConverter/ConvertSHPToGLI.cpp @@ -184,7 +184,7 @@ int main (int argc, char* argv[]) if ( ((shape_type - 3) % 10 == 0 || (shape_type - 5) % 10 == 0)) { ERR("Shape file contains {:d} polylines.", number_of_elements); - ERR("This programm only handles only files containing points."); + ERR("This programme only handles only files containing points."); SHPClose(hSHP); return EXIT_SUCCESS; } diff --git a/Applications/Utils/MeshEdit/AddFaultToVoxelGrid.cpp b/Applications/Utils/MeshEdit/AddFaultToVoxelGrid.cpp index 9e1cb2b663f..7b560f6b9cb 100644 --- a/Applications/Utils/MeshEdit/AddFaultToVoxelGrid.cpp +++ b/Applications/Utils/MeshEdit/AddFaultToVoxelGrid.cpp @@ -197,7 +197,7 @@ int main(int argc, char* argv[]) "instance created with Layers2Grid or Vtu2Grid) that are intersected " "by a triangulated 2D mesh representing a fault or some other " "significant structure. The material group for those intersected " - "elements can be explicitely specified, otherwise the largest existing " + "elements can be explicitly specified, otherwise the largest existing " "MaterialID will be increased by one.\n\n" "OpenGeoSys-6 software, version " + GitInfoLib::GitInfo::ogs_version + diff --git a/Applications/Utils/MeshEdit/AddLayer.cpp b/Applications/Utils/MeshEdit/AddLayer.cpp index 453d64c479c..e5d01b42933 100644 --- a/Applications/Utils/MeshEdit/AddLayer.cpp +++ b/Applications/Utils/MeshEdit/AddLayer.cpp @@ -56,7 +56,7 @@ int main (int argc, char* argv[]) TCLAP::SwitchArg copy_material_ids_arg( "", "copy-material-ids", "Copy the existing material distribution of the layer which is to be " - "extented. If the switch isn't given a new material id will be " + "extended. If the switch isn't given a new material id will be " "created.", false); cmd.add(copy_material_ids_arg); diff --git a/Applications/Utils/MeshEdit/ResetPropertiesInPolygonalRegion.cpp b/Applications/Utils/MeshEdit/ResetPropertiesInPolygonalRegion.cpp index 820e57ee149..75159e58d94 100644 --- a/Applications/Utils/MeshEdit/ResetPropertiesInPolygonalRegion.cpp +++ b/Applications/Utils/MeshEdit/ResetPropertiesInPolygonalRegion.cpp @@ -73,7 +73,7 @@ int main(int argc, char* argv[]) cmd.add(property_name_arg); TCLAP::ValueArg<int> restrict_arg( "r", "restrict-to-MaterialID", - "Restrict reseting the property to the material id", false, -1, + "Restrict resetting the property to the material id", false, -1, "MaterialID"); cmd.add(restrict_arg); TCLAP::ValueArg<std::string> mesh_in( diff --git a/Applications/Utils/MeshGeoTools/IntegrateBoreholesIntoMesh.cpp b/Applications/Utils/MeshGeoTools/IntegrateBoreholesIntoMesh.cpp index c7cdf94cae0..572b9746ed1 100644 --- a/Applications/Utils/MeshGeoTools/IntegrateBoreholesIntoMesh.cpp +++ b/Applications/Utils/MeshGeoTools/IntegrateBoreholesIntoMesh.cpp @@ -78,7 +78,7 @@ int main(int argc, char* argv[]) "via line elements. Each borehole (i.e. all points at a given " "(x,y)-location but at different depths) is assigned a unique material " "ID. Vertical limits of boreholes can be specified via Material IDs " - "and/or elevation. Point not matchin any mesh nodes or located outside " + "and/or elevation. Point not matching any mesh nodes or located outside " "the mesh are ignored.\n\n" "OpenGeoSys-6 software, version " + GitInfoLib::GitInfo::ogs_version + diff --git a/Applications/Utils/MeshGeoTools/computeSurfaceNodeIDsInPolygonalRegion.cpp b/Applications/Utils/MeshGeoTools/computeSurfaceNodeIDsInPolygonalRegion.cpp index 31ff690f2a3..cbb08d44a62 100644 --- a/Applications/Utils/MeshGeoTools/computeSurfaceNodeIDsInPolygonalRegion.cpp +++ b/Applications/Utils/MeshGeoTools/computeSurfaceNodeIDsInPolygonalRegion.cpp @@ -160,7 +160,7 @@ int main (int argc, char* argv[]) id_and_area_fname += std::to_string(j) + ".txt"; csv_fname += std::to_string(j) + ".csv"; INFO( - "Polygonal part of surface '{:s}' contains %{ul} nodes. Writting to" + "Polygonal part of surface '{:s}' contains %{ul} nodes. Writing to" " files '{:s}' and '{:s}'.", polygon_name, ids_and_areas.size(), diff --git a/Applications/Utils/MeshGeoTools/identifySubdomains.cpp b/Applications/Utils/MeshGeoTools/identifySubdomains.cpp index 0a7aa402b64..3e7823242fd 100644 --- a/Applications/Utils/MeshGeoTools/identifySubdomains.cpp +++ b/Applications/Utils/MeshGeoTools/identifySubdomains.cpp @@ -44,7 +44,7 @@ int main(int argc, char* argv[]) TCLAP::CmdLine cmd( "Checks if the subdomain meshes are part of the bulk mesh and writes " "the 'bulk_node_ids' and the 'bulk_element_ids' in each of them. The " - "documentation is avaliable at " + "documentation is available at " "https://www.opengeosys.org/docs/tools/meshing-submeshes/" "identifysubdomains/.\n\n" "OpenGeoSys-6 software, version " + diff --git a/Applications/Utils/ModelPreparation/PartitionMesh/PartitionMesh.cpp b/Applications/Utils/ModelPreparation/PartitionMesh/PartitionMesh.cpp index 6d30dc3048d..5ede41a5158 100644 --- a/Applications/Utils/ModelPreparation/PartitionMesh/PartitionMesh.cpp +++ b/Applications/Utils/ModelPreparation/PartitionMesh/PartitionMesh.cpp @@ -106,7 +106,7 @@ int main(int argc, char* argv[]) spdlog::set_pattern("%^%l:%$ %v"); spdlog::set_error_handler([](const std::string& msg) { std::cerr << "spdlog error: " << msg << std::endl; - OGS_FATAL("spdlog logger error occured."); + OGS_FATAL("spdlog logger error occurred."); }); BaseLib::RunTime run_timer; diff --git a/Applications/Utils/PostProcessing/Raster2PointCloud.cpp b/Applications/Utils/PostProcessing/Raster2PointCloud.cpp index 9fcdd29f9d3..af3238f38e2 100644 --- a/Applications/Utils/PostProcessing/Raster2PointCloud.cpp +++ b/Applications/Utils/PostProcessing/Raster2PointCloud.cpp @@ -66,14 +66,14 @@ int main(int argc, char *argv[]) TCLAP::ValueArg<std::string> output_arg( "o", "output", "Path to output polydata files (*.vtp). Specifying 'file.vtp' will " - "make the programm write a series of files called 'file0.vtp', " + "make the programme write a series of files called 'file0.vtp', " "'file1.vtp', etc.", true, "", "output file name"); cmd.add(output_arg); TCLAP::ValueArg<std::string> input_arg( "i", "input", "Path to input raster files (*.asc). Specifying 'file.asc' will make " - "the programm look for a series of files called 'file0.asc', " + "the programme look for a series of files called 'file0.asc', " "'file1.asc', etc.", true, "", "input file name"); cmd.add(input_arg); diff --git a/Applications/Utils/PostProcessing/postLIE.cpp b/Applications/Utils/PostProcessing/postLIE.cpp index 4436534c31c..1425f83a377 100644 --- a/Applications/Utils/PostProcessing/postLIE.cpp +++ b/Applications/Utils/PostProcessing/postLIE.cpp @@ -143,7 +143,7 @@ int main(int argc, char* argv[]) TCLAP::SwitchArg nooverwrite_arg( "", "no-overwrite", - "don't overwirte existing post processed VTU files"); + "don't overwrite existing post processed VTU files"); cmd.add(nooverwrite_arg); cmd.parse(argc, argv); diff --git a/BaseLib/ConfigTree.h b/BaseLib/ConfigTree.h index 4394a85d5be..8b763d53c58 100644 --- a/BaseLib/ConfigTree.h +++ b/BaseLib/ConfigTree.h @@ -30,7 +30,7 @@ class ConfigTree; /*! Check if \c conf has been read entirely and invalidate it. * - * This method can savely be called on \c nullptr's. + * This method can safely be called on \c nullptr's. * * \see ConfigTree::checkAndInvalidate() */ @@ -50,7 +50,7 @@ template<typename Iterator> class Range; * Features. This class: * * makes sure that every configuration setting in a Property Tree is read * exactly once. If some settings is not read (e.g. due to a typo), a warning message - * is generated. The message contains a hint where it occured. + * is generated. The message contains a hint where it occurred. * * enforces a naming scheme of settings: letters a-z, numbers 0-9, underscore * * provides some functionality to read lists of values using range-based for loops. * * has rather long method names that are easily greppable from the source code. So a list diff --git a/BaseLib/Histogram.h b/BaseLib/Histogram.h index 36ba483b559..88e7972a999 100644 --- a/BaseLib/Histogram.h +++ b/BaseLib/Histogram.h @@ -70,7 +70,7 @@ public: /** Updates histogram using sorted \c _data vector. * * Start histogram creation with first element. Then find first element in - * the next histogram bin. Number of elments in the bin is the difference + * the next histogram bin. Number of elements in the bin is the difference * between these two iterators. * \verbatim [0.1, 0.2, ..., 0.7 , ..., 0.7+binWidth = 0.9, 1.0 , ..., last] diff --git a/BaseLib/IO/XmlIO/Qt/XMLQtInterface.h b/BaseLib/IO/XmlIO/Qt/XMLQtInterface.h index 0941b39a4a1..5a9d4843a4a 100644 --- a/BaseLib/IO/XmlIO/Qt/XMLQtInterface.h +++ b/BaseLib/IO/XmlIO/Qt/XMLQtInterface.h @@ -31,7 +31,7 @@ public: explicit XMLQtInterface(QString schemaFile = ""); virtual ~XMLQtInterface() = default; - /// Reads the file. In an overriden function in the child class be sure to call + /// Reads the file. In an overridden function in the child class be sure to call /// XMLQtInterface::readFile(fileName). virtual int readFile(const QString &fileName); diff --git a/BaseLib/StringTools.h b/BaseLib/StringTools.h index 7bac96b352b..bd8b95d38ef 100644 --- a/BaseLib/StringTools.h +++ b/BaseLib/StringTools.h @@ -24,15 +24,15 @@ namespace BaseLib { * Splits a string into a vector of strings. This method only works for string * separation recognised by the std::stringstream iterator such as ' ' or * '\\t'. - * \param str String to be splitted + * \param str String to be split * \return Vector of strings */ std::vector<std::string> splitString(std::string const& str); /** * Splits a string into a list of strings. - * \param str String to be splitted - * \param delim Character indicating that the string should be splitted + * \param str String to be split + * \param delim Character indicating that the string should be split * \return List of strings */ std::list<std::string> splitString(const std::string &str, char delim); diff --git a/CHANGELOG.md b/CHANGELOG.md index d9f12e44570..757a3a9640d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -90,7 +90,7 @@ New features: test. [#1528](https://github.com/ufz/ogs/pull/1528) ### Fixes: - - Fix LocalToGlobalIndexMap with mutliple variables and with multiple componets. [#1433](https://github.com/ufz/ogs/pull/1433) [#1440](https://github.com/ufz/ogs/pull/1440) + - Fix LocalToGlobalIndexMap with multiple variables and with multiple components. [#1433](https://github.com/ufz/ogs/pull/1433) [#1440](https://github.com/ufz/ogs/pull/1440) - Fix PropertyVector<T*> for multi-component case. [#1441](https://github.com/ufz/ogs/pull/1441) - Fix checking IDs of nonlinear nodes. [#1495](https://github.com/ufz/ogs/pull/1495) - Fix incorrect use of getNumberOfBaseNodes(). [#1515](https://github.com/ufz/ogs/pull/1515) @@ -161,7 +161,7 @@ New feature: to the install and package targets instead of running after each executable gets build. [#1458](https://github.com/ufz/ogs/pull/1458) - Increase minimum clang compiler version to 3.5 in course of updating travis - build enviroment to Ubuntu LTS 14.04. [#1448](https://github.com/ufz/ogs/pull/1448) + build environment to Ubuntu LTS 14.04. [#1448](https://github.com/ufz/ogs/pull/1448) - Added a script that generates crosslinked Doxygen pages out of ctest input files [#1348](https://github.com/ufz/ogs/pull/1348) @@ -207,7 +207,7 @@ New feature: - Added material properties for zeolite adsorption and Calcium oxide/hydroxide reactions. [#1178](https://github.com/ufz/ogs/pull/1178) - Transferred the TES process, a monolithically coupled THC model for simulating - thermochemical energy storag devices, from OGS5. [#1181](https://github.com/ufz/ogs/pull/1181) + thermochemical energy storage devices, from OGS5. [#1181](https://github.com/ufz/ogs/pull/1181) - Introduced a general scheme for documenting OGS6 input file settings. #978 - Added copy constructor for the class Surface, minor improvements in GeoLib. [#1237](https://github.com/ufz/ogs/pull/1237) - Added classes GeoLib::LineSegment and GeoLib::Polyline::SegmentIterator. [#1139](https://github.com/ufz/ogs/pull/1139) @@ -246,7 +246,7 @@ New feature: - Fixing several small issues with NetCDF import [#1169](https://github.com/ufz/ogs/pull/1169) - Restructure Applications related modules - Move DataHolderLib and FileIO under Applications [#1279](https://github.com/ufz/ogs/pull/1279) - - Remove calling std::abort within libraries. Exeptions are thrown instead. [#1245](https://github.com/ufz/ogs/pull/1245) + - Remove calling std::abort within libraries. Exceptions are thrown instead. [#1245](https://github.com/ufz/ogs/pull/1245) - Fix finding Boost with BOOST_ROOT CMake argument [#1287](https://github.com/ufz/ogs/pull/1287) - Fix linking of Sundials CVODE library [#1197](https://github.com/ufz/ogs/pull/1197) - Fixed issue where geometry names would be missing after merging geometries [#1295](https://github.com/ufz/ogs/pull/1295) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c02dcc9429..be9b0275d0a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,7 +72,7 @@ if(OGS_USE_PETSC) set(OGS_USE_MPI ON CACHE BOOL "Use MPI" FORCE) endif() option(OGS_USE_CVODE "Use the Sundials CVODE module?" OFF) -option(OGS_BUILD_UTILS "Should the utilities programms be built?" ON) +option(OGS_BUILD_UTILS "Should the utilities programs be built?" ON) # ---- CMake includes ---- include(GitSetup) diff --git a/Documentation/ProjectFile/material/porous_medium/porous_medium/a_id.md b/Documentation/ProjectFile/material/porous_medium/porous_medium/a_id.md index 15139e4fbcf..50e3c42aa26 100644 --- a/Documentation/ProjectFile/material/porous_medium/porous_medium/a_id.md +++ b/Documentation/ProjectFile/material/porous_medium/porous_medium/a_id.md @@ -1,3 +1,3 @@ The 'id' attribute maps the porous medium property to the mesh elements assigned to the same 'MaterialIDs' id, where 'MaterialIDs' property vector stored as a -property withinn the mesh. +property within the mesh. diff --git a/Documentation/ProjectFile/material/solid/constitutive_relation/Ehlers/damage_properties/t_alpha_d.md b/Documentation/ProjectFile/material/solid/constitutive_relation/Ehlers/damage_properties/t_alpha_d.md index 71a3b1b4637..c71749c4cf7 100644 --- a/Documentation/ProjectFile/material/solid/constitutive_relation/Ehlers/damage_properties/t_alpha_d.md +++ b/Documentation/ProjectFile/material/solid/constitutive_relation/Ehlers/damage_properties/t_alpha_d.md @@ -1,2 +1,2 @@ -alpha_d (>0) is a meterial parameter controlling the softening rate in the +alpha_d (>0) is a material parameter controlling the softening rate in the post-peak response. diff --git a/Documentation/ProjectFile/prj/chemical_system/kinetic_reactants/kinetic_reactant/t_chemical_formula.md b/Documentation/ProjectFile/prj/chemical_system/kinetic_reactants/kinetic_reactant/t_chemical_formula.md index 3e303680fb5..deba0890877 100644 --- a/Documentation/ProjectFile/prj/chemical_system/kinetic_reactants/kinetic_reactant/t_chemical_formula.md +++ b/Documentation/ProjectFile/prj/chemical_system/kinetic_reactants/kinetic_reactant/t_chemical_formula.md @@ -1 +1 @@ -An optional tag to define a list of chemical formulas followed by corresponding stoichiometric coeffients, e.g., KAlMg3Si3O10(OH)2 0.8 KFe3AlSi3O10(OH)2 0.2. It means that consuming one mole of the custom kinetic reactant leaves 0.8 mole KAlMg3Si3O10(OH)2 and 0.2 mole KFe3AlSi3O10(OH)2 dissolved. +An optional tag to define a list of chemical formulas followed by corresponding stoichiometric coefficients, e.g., KAlMg3Si3O10(OH)2 0.8 KFe3AlSi3O10(OH)2 0.2. It means that consuming one mole of the custom kinetic reactant leaves 0.8 mole KAlMg3Si3O10(OH)2 and 0.2 mole KFe3AlSi3O10(OH)2 dissolved. diff --git a/Documentation/ProjectFile/prj/chemical_system/kinetic_reactants/kinetic_reactant/t_fix_amount.md b/Documentation/ProjectFile/prj/chemical_system/kinetic_reactants/kinetic_reactant/t_fix_amount.md index ab0b43cd99f..e5489151776 100644 --- a/Documentation/ProjectFile/prj/chemical_system/kinetic_reactants/kinetic_reactant/t_fix_amount.md +++ b/Documentation/ProjectFile/prj/chemical_system/kinetic_reactants/kinetic_reactant/t_fix_amount.md @@ -1,4 +1,4 @@ specify if the amount of the kinetic reactant should be fixed to the initial amount during the simulation. Possible values: *true* (fixed); *false* (not fixed); default is *false*. -Fixing the amount of a kinetic reactant may be desireable when the kinetic reactant is used to represents a reaction rate that transfers mass between other reactants. +Fixing the amount of a kinetic reactant may be desirable when the kinetic reactant is used to represents a reaction rate that transfers mass between other reactants. Note: fix_amount can only be used if a chemical_formula has been defined! diff --git a/Documentation/ProjectFile/prj/chemical_system/rates/rate/expression/i_expression.md b/Documentation/ProjectFile/prj/chemical_system/rates/rate/expression/i_expression.md index e1eec150b21..1f5f7148534 100644 --- a/Documentation/ProjectFile/prj/chemical_system/rates/rate/expression/i_expression.md +++ b/Documentation/ProjectFile/prj/chemical_system/rates/rate/expression/i_expression.md @@ -1 +1 @@ -define a rate expression which consists of a number of BASIC language statments. +define a rate expression which consists of a number of BASIC language statements. diff --git a/Documentation/ProjectFile/prj/linear_solvers/linear_solver/t_name.md b/Documentation/ProjectFile/prj/linear_solvers/linear_solver/t_name.md index fe6b18dc8b3..7df3ddeb1ab 100644 --- a/Documentation/ProjectFile/prj/linear_solvers/linear_solver/t_name.md +++ b/Documentation/ProjectFile/prj/linear_solvers/linear_solver/t_name.md @@ -1,3 +1,3 @@ Name of the linear solver. -Used, e.g., to reference it in the nonlinear solver configuation. +Used, e.g., to reference it in the nonlinear solver configuration. diff --git a/Documentation/ProjectFile/prj/process_variables/process_variable/t_initial_condition.md b/Documentation/ProjectFile/prj/process_variables/process_variable/t_initial_condition.md index 8ccd0a964f8..439b46812b9 100644 --- a/Documentation/ProjectFile/prj/process_variables/process_variable/t_initial_condition.md +++ b/Documentation/ProjectFile/prj/process_variables/process_variable/t_initial_condition.md @@ -3,5 +3,5 @@ Initial condition for the process variable. This setting references a \ref ogs_file_param__prj__parameters__parameter "parameter" by name. The initial values of the process variable are read from the given initial -condition, i.e., in the very first assembly the values for this process varaible +condition, i.e., in the very first assembly the values for this process variable are those given in the IC. diff --git a/Documentation/ProjectFile/prj/processes/process/HEAT_TRANSPORT_BHE/borehole_heat_exchangers/borehole_heat_exchanger/flow_and_temperature_control/BuildingPowerCurveConstantFlow/c_BuildingPowerCurveConstantFlow.md b/Documentation/ProjectFile/prj/processes/process/HEAT_TRANSPORT_BHE/borehole_heat_exchangers/borehole_heat_exchanger/flow_and_temperature_control/BuildingPowerCurveConstantFlow/c_BuildingPowerCurveConstantFlow.md index b12f779696b..3c3fc97cd95 100644 --- a/Documentation/ProjectFile/prj/processes/process/HEAT_TRANSPORT_BHE/borehole_heat_exchangers/borehole_heat_exchanger/flow_and_temperature_control/BuildingPowerCurveConstantFlow/c_BuildingPowerCurveConstantFlow.md +++ b/Documentation/ProjectFile/prj/processes/process/HEAT_TRANSPORT_BHE/borehole_heat_exchangers/borehole_heat_exchanger/flow_and_temperature_control/BuildingPowerCurveConstantFlow/c_BuildingPowerCurveConstantFlow.md @@ -1 +1 @@ -It is the BHE boundary condition of various heat load from buildings. Meanwhile, the COP of the heat pump is intergrated and used for calculating the transit heat load on the BHE. +It is the BHE boundary condition of various heat load from buildings. Meanwhile, the COP of the heat pump is integrated and used for calculating the transit heat load on the BHE. diff --git a/Documentation/ProjectFile/prj/processes/process/HEAT_TRANSPORT_BHE/borehole_heat_exchangers/borehole_heat_exchanger/flow_and_temperature_control/FixedPowerConstantFlow/t_power.md b/Documentation/ProjectFile/prj/processes/process/HEAT_TRANSPORT_BHE/borehole_heat_exchangers/borehole_heat_exchanger/flow_and_temperature_control/FixedPowerConstantFlow/t_power.md index ad0863a2065..88989fc7944 100644 --- a/Documentation/ProjectFile/prj/processes/process/HEAT_TRANSPORT_BHE/borehole_heat_exchangers/borehole_heat_exchanger/flow_and_temperature_control/FixedPowerConstantFlow/t_power.md +++ b/Documentation/ProjectFile/prj/processes/process/HEAT_TRANSPORT_BHE/borehole_heat_exchangers/borehole_heat_exchanger/flow_and_temperature_control/FixedPowerConstantFlow/t_power.md @@ -1 +1 @@ -It is the fixed power for the FixedPowerConstantFlow condition. It should be provided and its unit is W. Positve value means extracting energy from the soil. +It is the fixed power for the FixedPowerConstantFlow condition. It should be provided and its unit is W. Positive value means extracting energy from the soil. diff --git a/Documentation/ProjectFile/prj/processes/process/HEAT_TRANSPORT_BHE/borehole_heat_exchangers/borehole_heat_exchanger/pipes/t_distance_between_pipes.md b/Documentation/ProjectFile/prj/processes/process/HEAT_TRANSPORT_BHE/borehole_heat_exchangers/borehole_heat_exchanger/pipes/t_distance_between_pipes.md index 34119986e1a..16978ccb31f 100644 --- a/Documentation/ProjectFile/prj/processes/process/HEAT_TRANSPORT_BHE/borehole_heat_exchangers/borehole_heat_exchanger/pipes/t_distance_between_pipes.md +++ b/Documentation/ProjectFile/prj/processes/process/HEAT_TRANSPORT_BHE/borehole_heat_exchangers/borehole_heat_exchanger/pipes/t_distance_between_pipes.md @@ -1 +1 @@ -It is the distance between inlet and oulet pipes. In 1U-type borehole heat exchanger, there is distance between inlet and oulet pipes except at the bottom of the borehole heat exchanger. Such distance will affect the heat exchagne between inlet and outlet pipes. +It is the distance between inlet and oulet pipes. In 1U-type borehole heat exchanger, there is distance between inlet and oulet pipes except at the bottom of the borehole heat exchanger. Such distance will affect the heat exchange between inlet and outlet pipes. diff --git a/Documentation/ProjectFile/prj/processes/process/jacobian_assembler/CompareJacobians/t_jacobian_assembler.md b/Documentation/ProjectFile/prj/processes/process/jacobian_assembler/CompareJacobians/t_jacobian_assembler.md index bd27c7fd0fb..89170670ee5 100644 --- a/Documentation/ProjectFile/prj/processes/process/jacobian_assembler/CompareJacobians/t_jacobian_assembler.md +++ b/Documentation/ProjectFile/prj/processes/process/jacobian_assembler/CompareJacobians/t_jacobian_assembler.md @@ -1,2 +1,2 @@ -The Jacobian assember whose assembled matrices will be used subsequently in the +The Jacobian assembler whose assembled matrices will be used subsequently in the global equation system. diff --git a/Documentation/ProjectFile/prj/processes/process/jacobian_assembler/CompareJacobians/t_log_file.md b/Documentation/ProjectFile/prj/processes/process/jacobian_assembler/CompareJacobians/t_log_file.md index 05251c45b79..6e729314cbd 100644 --- a/Documentation/ProjectFile/prj/processes/process/jacobian_assembler/CompareJacobians/t_log_file.md +++ b/Documentation/ProjectFile/prj/processes/process/jacobian_assembler/CompareJacobians/t_log_file.md @@ -1,7 +1,7 @@ The path to the file to which details of differing Jacobians are written. Finally, the file will contain a Python script that can be used to conveniently -examine the differences that occured. +examine the differences that occurred. The given path is an absolute path or a path relative to the working directory of OGS. The log file will be overwritten, even if no differences exceeding the diff --git a/Documentation/ProjectFile/prj/search_length_algorithm/i_search_length_algorithm.md b/Documentation/ProjectFile/prj/search_length_algorithm/i_search_length_algorithm.md index 5dfceba4649..28be218c053 100644 --- a/Documentation/ProjectFile/prj/search_length_algorithm/i_search_length_algorithm.md +++ b/Documentation/ProjectFile/prj/search_length_algorithm/i_search_length_algorithm.md @@ -1,3 +1,3 @@ -At the moment there are two possible types of algorithms avaiable. +At the moment there are two possible types of algorithms available. - SearchLength implements a configurable fixed search length. - HeuristicSearchLength computes the search length based on the edge lengths. diff --git a/Documentation/ProjectFile/prj/search_length_algorithm/t_type.md b/Documentation/ProjectFile/prj/search_length_algorithm/t_type.md index 7e4f1adfdfe..8634faa8e81 100644 --- a/Documentation/ProjectFile/prj/search_length_algorithm/t_type.md +++ b/Documentation/ProjectFile/prj/search_length_algorithm/t_type.md @@ -1,2 +1,2 @@ -The type tag is used to specify the type of the algorithm. Avaiable algorithms +The type tag is used to specify the type of the algorithm. Available algorithms are 'fixed' and 'heuristic'. diff --git a/Documentation/ProjectFile/prj/time_loop/output/t_prefix.md b/Documentation/ProjectFile/prj/time_loop/output/t_prefix.md index 531d31d7ef4..1a887bc7064 100644 --- a/Documentation/ProjectFile/prj/time_loop/output/t_prefix.md +++ b/Documentation/ProjectFile/prj/time_loop/output/t_prefix.md @@ -9,7 +9,7 @@ Default value: {:meshname} Remark: The name of the pvd-file will be constructed out of the prefix. -Furthermore, it is possible to specifiy the format of the expressions above. For +Furthermore, it is possible to specify the format of the expressions above. For instance {:0>3timestep} results in a 3-digit output, if necessary with preceding -zeros. Also the time output can be formated using the typical floating +zeros. Also the time output can be formatted using the typical floating point precision (for instance 0.4) and type (e, E, f, F, g, G) modifiers. diff --git a/Documentation/ProjectFile/prj/time_loop/output/t_suffix.md b/Documentation/ProjectFile/prj/time_loop/output/t_suffix.md index ae19605ce88..d71b09db8f4 100644 --- a/Documentation/ProjectFile/prj/time_loop/output/t_suffix.md +++ b/Documentation/ProjectFile/prj/time_loop/output/t_suffix.md @@ -10,7 +10,7 @@ Default value: _ts_{:timestep}_t_{:time} Remark: The name of the result files will be constructed out of the prefix and the suffix. -Furthermore, it is possible to specifiy the format of the expressions above. For +Furthermore, it is possible to specify the format of the expressions above. For instance {:0>3timestep} results in a 3-digit output, if necessary with preceding -zeros. Also the time output can be formated using the typical floating +zeros. Also the time output can be formatted using the typical floating point precision (for instance 0.4) and type (e, E, f, F, g, G) modifiers. diff --git a/Documentation/ProjectFile/properties/property/EmbeddedFracturePermeability/t_initial_aperture.md b/Documentation/ProjectFile/properties/property/EmbeddedFracturePermeability/t_initial_aperture.md index 0204b03845f..c0f8795d85a 100644 --- a/Documentation/ProjectFile/properties/property/EmbeddedFracturePermeability/t_initial_aperture.md +++ b/Documentation/ProjectFile/properties/property/EmbeddedFracturePermeability/t_initial_aperture.md @@ -1 +1 @@ -The inital aperture. +The initial aperture. diff --git a/GeoLib/AnalyticalGeometry.h b/GeoLib/AnalyticalGeometry.h index 08f8ca68d74..d4fbccd2573 100644 --- a/GeoLib/AnalyticalGeometry.h +++ b/GeoLib/AnalyticalGeometry.h @@ -197,7 +197,7 @@ std::unique_ptr<GeoLib::Point> triangleLineIntersection( MathLib::Point3d const& q); /** - * Method first computes the intersection points of line segements of GeoLib::Polyline objects + * Method first computes the intersection points of line segments of GeoLib::Polyline objects * (@see computeIntersectionPoints()) and pushes each intersection point in the GeoLib::PointVec * pnt_vec. For each intersection an id is returned. This id is used to split the two * intersecting straight line segments in four straight line segments. diff --git a/GeoLib/GEOObjects.h b/GeoLib/GEOObjects.h index 7ef08bc47d8..4f90ec9ec07 100644 --- a/GeoLib/GEOObjects.h +++ b/GeoLib/GEOObjects.h @@ -256,7 +256,7 @@ public: void renameGeometry(std::string const& old_name, std::string const& new_name); - /// Constucts a station-vector based on the points of a given geometry. + /// Constructs a station-vector based on the points of a given geometry. // @param geo_name name of the geometry // @param stn_name name of the new station vector // @param only_usused_pnts if true only points not in a line or surface are diff --git a/GeoLib/IO/TINInterface.h b/GeoLib/IO/TINInterface.h index 10ca30f554b..8ea7ad80001 100644 --- a/GeoLib/IO/TINInterface.h +++ b/GeoLib/IO/TINInterface.h @@ -30,7 +30,7 @@ public: /** * Reads TIN file * @param fname TIN file name - * @param pnt_vec a point vector to which triangle vertexes are added + * @param pnt_vec a point vector to which triangle vertices are added * @param errors a vector of error messages * @return a pointer to a GeoLib::Surface object created from TIN data. nullptr is returned if it fails to read the file. */ diff --git a/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.h b/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.h index 4020cde827b..3532920b37e 100644 --- a/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.h +++ b/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.h @@ -35,7 +35,7 @@ class XmlGmlInterface final : public BaseLib::IO::XMLInterface, public: explicit XmlGmlInterface(GeoLib::GEOObjects& geo_objs); - /// Reads an xml-file containing geometric object definitions into the GEOObjects used in the contructor + /// Reads an xml-file containing geometric object definitions into the GEOObjects used in the constructor int readFile(const QString& fileName) override; bool readFile(std::string const& fname) override diff --git a/GeoLib/IO/XmlIO/Qt/XmlStnInterface.h b/GeoLib/IO/XmlIO/Qt/XmlStnInterface.h index a1a7687f1af..22879477695 100644 --- a/GeoLib/IO/XmlIO/Qt/XmlStnInterface.h +++ b/GeoLib/IO/XmlIO/Qt/XmlStnInterface.h @@ -36,7 +36,7 @@ class XmlStnInterface final : public BaseLib::IO::XMLInterface, public: explicit XmlStnInterface(GeoLib::GEOObjects& geo_objs); - /// Reads an xml-file containing station object definitions into the GEOObjects used in the contructor (requires Qt) + /// Reads an xml-file containing station object definitions into the GEOObjects used in the constructor (requires Qt) int readFile(const QString& fileName) override; bool readFile(std::string const& fname) override diff --git a/GeoLib/LineSegment.h b/GeoLib/LineSegment.h index 97b53a3f966..366d78e6339 100644 --- a/GeoLib/LineSegment.h +++ b/GeoLib/LineSegment.h @@ -21,7 +21,7 @@ public: /// @remark The main purpose of class LineSegment is the use within a /// polyline. For this reason the memory is not managed per default. But the /// user has the freedom to hand over the responsibility for the mem - /// managment of the points to the object. + /// management of the points to the object. LineSegment(GeoLib::Point* const a, GeoLib::Point* const b, bool point_mem_management_by_line_segment = false); diff --git a/GeoLib/OctTree-impl.h b/GeoLib/OctTree-impl.h index 7319743b3bc..297ec0e19e9 100644 --- a/GeoLib/OctTree-impl.h +++ b/GeoLib/OctTree-impl.h @@ -256,7 +256,7 @@ void OctTree<POINT, MAX_POINTS>::splitNode(POINT * pnt) _children[static_cast<std::int8_t>(Quadrant::SEU)] = new OctTree<POINT, MAX_POINTS> (p0, p1, _eps); - // add the passed point pnt to the childs at first + // add the passed point pnt to the children at first for (std::size_t k(0); k < 8; k++) { if (_children[k]->addPointToChild(pnt)) { diff --git a/GeoLib/OctTree.h b/GeoLib/OctTree.h index e7cd0805799..880f5d65a72 100644 --- a/GeoLib/OctTree.h +++ b/GeoLib/OctTree.h @@ -43,7 +43,7 @@ public: /// contrast a big value results into a smaller number of OctTree leaves, /// the memory requirements for the OctTree may be lower but the search /// inside a OctTree leaf may be more expensive. The value should be - /// choosen application dependend. [default 8] + /// chosen application dependent. [default 8] template <typename T> static OctTree<POINT, MAX_POINTS>* createOctTree(T ll, T ur, double eps = std::numeric_limits<double>::epsilon()); @@ -57,7 +57,7 @@ public: /// corresponding OctTree node. /// @param pnt the pointer to a point that should be inserted /// @param ret_pnt the pointer to a point in the OctTree. Three cases can - /// occure: + /// occur: /// (1) ret_pnt is nullptr: the given point (pnt) is outside of the OctTree /// domain /// (2) ret_pnt is equal to pnt: the point is added to the OctTree diff --git a/GeoLib/PointVec.h b/GeoLib/PointVec.h index a6fe83046e2..ebea781a1b6 100644 --- a/GeoLib/PointVec.h +++ b/GeoLib/PointVec.h @@ -129,7 +129,7 @@ private: /** * Inserts the instance of the Point into internal data structures * (@see TemplateVec::_data_vec, _pnt_id_map) if and only if there - * does not exist a point with the same coordinates (upto + * does not exist a point with the same coordinates (up to * std::numeric_limits<double>::epsilon()). In case there exists * already a point with the same coordinates the given pnt-object * will be deleted! diff --git a/MaterialLib/Adsorption/DensityNunez.cpp b/MaterialLib/Adsorption/DensityNunez.cpp index 20299678d8d..f7cd20b3407 100644 --- a/MaterialLib/Adsorption/DensityNunez.cpp +++ b/MaterialLib/Adsorption/DensityNunez.cpp @@ -31,7 +31,7 @@ namespace Adsorption double DensityNunez::getAdsorbateDensity(const double T_Ads) const { - // TODO admissable T range: 273.16 K <= T_Ads <= 633.15 K + // TODO admissible T range: 273.16 K <= T_Ads <= 633.15 K const double a[] = { 1.0644e3,-8.01905,1.445348e-2,-4.19589e-6,-4.5294e-9 }; const double b[] = { -8.039e-3,1.8698e-5,-2.3015e-8,2.3809e-11,-1.388e-14 }; const double u = a[0] + T_Ads * (a[1] + T_Ads * (a[2] + T_Ads * (a[3] + T_Ads * a[4]) ) ); @@ -43,7 +43,7 @@ double DensityNunez::getAdsorbateDensity(const double T_Ads) const // Thermal expansivity model for water found in the works of Hauer double DensityNunez::getAlphaT(const double T_Ads) const { - // TODO admissable T range: 273.16 K <= T_Ads <= 633.15 K + // TODO admissible T range: 273.16 K <= T_Ads <= 633.15 K const double a[] = { 1.0644e3,-8.01905,1.445348e-2,-4.19589e-6,-4.5294e-9 }; const double b[] = { -8.039e-3,1.8698e-5,-2.3015e-8,2.3809e-11,-1.388e-14 }; const double u = a[0] + T_Ads * (a[1] + T_Ads * (a[2] + T_Ads * (a[3] + T_Ads * a[4]) ) ); diff --git a/MaterialLib/Fluid/Viscosity/TemperatureDependentViscosity.h b/MaterialLib/Fluid/Viscosity/TemperatureDependentViscosity.h index 610f43e3893..5c9e71df275 100644 --- a/MaterialLib/Fluid/Viscosity/TemperatureDependentViscosity.h +++ b/MaterialLib/Fluid/Viscosity/TemperatureDependentViscosity.h @@ -86,7 +86,7 @@ public: } private: - const double _mu0; ///< Inital viscosity. + const double _mu0; ///< Initial viscosity. const double _temperature_c; ///< Reference temperature 1. const double _temperature_v; ///< Reference temperature 2. }; diff --git a/MaterialLib/FractureModels/LogPenalty.h b/MaterialLib/FractureModels/LogPenalty.h index ff3d179f8e6..e34ce433859 100644 --- a/MaterialLib/FractureModels/LogPenalty.h +++ b/MaterialLib/FractureModels/LogPenalty.h @@ -15,7 +15,7 @@ namespace MaterialLib { namespace Fracture { -/// A penalty function for negative aperture supression used as a multiplier to +/// A penalty function for negative aperture suppression used as a multiplier to /// the normal fracture stiffness. /// /// The derivative is continuous at aperture = aperture0 and aperture = diff --git a/MaterialLib/MPL/Properties/Exponential.h b/MaterialLib/MPL/Properties/Exponential.h index 2c02a8c08dc..e1a874cbc4e 100644 --- a/MaterialLib/MPL/Properties/Exponential.h +++ b/MaterialLib/MPL/Properties/Exponential.h @@ -48,7 +48,7 @@ public: PropertyDataType const& property_reference_value, ExponentData const& v); /// This method computes the value of a property \f$\alpha\f$ depending - /// exponentialy on the value of the given primary variable \f$\beta\f$. + /// exponentially on the value of the given primary variable \f$\beta\f$. PropertyDataType value(VariableArray const& variable_array, ParameterLib::SpatialPosition const& pos, double const t, double const dt) const override; diff --git a/MaterialLib/PorousMedium/Permeability/Permeability.h b/MaterialLib/PorousMedium/Permeability/Permeability.h index e93f062ddfd..edf75882f1b 100644 --- a/MaterialLib/PorousMedium/Permeability/Permeability.h +++ b/MaterialLib/PorousMedium/Permeability/Permeability.h @@ -19,7 +19,7 @@ namespace MaterialLib namespace PorousMedium { /// The class implements a basic permeability model that employs a parameter -/// (for instance a constant parameter or mesh cell dependend parameter) to fill +/// (for instance a constant parameter or mesh cell dependent parameter) to fill /// the intrinsic permeability tensor. class Permeability { diff --git a/MaterialLib/SolidModels/MFront/CreateMFront.cpp b/MaterialLib/SolidModels/MFront/CreateMFront.cpp index 7fa3df621d8..4ef0a294407 100644 --- a/MaterialLib/SolidModels/MFront/CreateMFront.cpp +++ b/MaterialLib/SolidModels/MFront/CreateMFront.cpp @@ -186,7 +186,7 @@ std::unique_ptr<MechanicsBase<DisplacementDim>> createMFront( } OGS_FATAL( - "Configuration errors occured. Please fix the project file."); + "Configuration errors occurred. Please fix the project file."); } } diff --git a/MaterialLib/SolidModels/MFront/ModCamClay_ShearTest.py b/MaterialLib/SolidModels/MFront/ModCamClay_ShearTest.py index d54db26a089..36cb8fd78fd 100644 --- a/MaterialLib/SolidModels/MFront/ModCamClay_ShearTest.py +++ b/MaterialLib/SolidModels/MFront/ModCamClay_ShearTest.py @@ -232,7 +232,7 @@ for k in range(runs): ax.set_xlabel("$p$ / MPa") ax.set_ylabel("$q$ / MPa") ax.grid() -# legend ouside by resizing the box and puting the legend relative to that +# legend outside by resizing the box and putting the legend relative to that chartBox = ax.get_position() ax.set_position([chartBox.x0, chartBox.y0, chartBox.width * 0.85, chartBox.height]) ax.legend(loc="upper center", bbox_to_anchor=(1.15, 0.80)) diff --git a/MaterialLib/SolidModels/MFront/ModCamClay_TriaxTest.py b/MaterialLib/SolidModels/MFront/ModCamClay_TriaxTest.py index dac1417f98c..157f776c24f 100644 --- a/MaterialLib/SolidModels/MFront/ModCamClay_TriaxTest.py +++ b/MaterialLib/SolidModels/MFront/ModCamClay_TriaxTest.py @@ -19,7 +19,7 @@ phi0 = 1 - 1 / v0 # Initial porosity pc0 = 200.0e3 # Initial pre-consolidation pressure in Pa pamb = 1.0e3 # Ambient pressure in Pa -# Loading programm +# Loading programme tMax = 1.0 # s , total time nTime = 200 ltime = np.linspace(0.0, tMax, nTime) diff --git a/MathLib/GeometricBasics.cpp b/MathLib/GeometricBasics.cpp index be86bfbc258..d04f2059d81 100644 --- a/MathLib/GeometricBasics.cpp +++ b/MathLib/GeometricBasics.cpp @@ -262,7 +262,7 @@ bool isCoplanar(const MathLib::Point3d& a, const MathLib::Point3d& b, const double normalisation_factor = (ab.squaredNorm() * ac.squaredNorm() * ad.squaredNorm()); - // tolerance 1e-11 is choosen such that + // tolerance 1e-11 is chosen such that // a = (0,0,0), b=(1,0,0), c=(0,1,0) and d=(1,1,1e-6) are considered as // coplanar // a = (0,0,0), b=(1,0,0), c=(0,1,0) and d=(1,1,1e-5) are considered as not diff --git a/MathLib/LinAlg/Eigen/EigenMapTools.h b/MathLib/LinAlg/Eigen/EigenMapTools.h index 91460b43595..e956192b16c 100644 --- a/MathLib/LinAlg/Eigen/EigenMapTools.h +++ b/MathLib/LinAlg/Eigen/EigenMapTools.h @@ -49,7 +49,7 @@ Eigen::Map<Matrix> createZeroedMatrix(std::vector<double>& data, /*! Creates an Eigen mapped matrix having its entries stored in the given * \c data vector. * - * This is a convienence method which makes the specification of dynamically + * This is a convenience method which makes the specification of dynamically * allocated Eigen matrices as return type easier. */ inline Eigen::Map< @@ -87,7 +87,7 @@ Eigen::Map<const Matrix> toMatrix(std::vector<double> const& data, /*! Creates an Eigen mapped matrix from the given data vector. * - * This is a convienence method which makes the specification of dynamically + * This is a convenience method which makes the specification of dynamically * allocated Eigen matrices as return type easier. */ inline Eigen::Map< @@ -126,7 +126,7 @@ Eigen::Map<Matrix> toMatrix(std::vector<double>& data, /*! Creates an Eigen mapped matrix from the given data vector. * - * This is a convienence method which makes the specification of dynamically + * This is a convenience method which makes the specification of dynamically * allocated Eigen matrices as return type easier. */ inline Eigen::Map< @@ -190,7 +190,7 @@ Eigen::Map<Vector> toVector(std::vector<double>& data, /*! Creates an Eigen mapped vector from the given data vector. * - * This is a convienence method which makes the specification of dynamically + * This is a convenience method which makes the specification of dynamically * allocated Eigen vectors as return type easier. */ inline Eigen::Map<const Eigen::VectorXd> toVector( @@ -201,7 +201,7 @@ inline Eigen::Map<const Eigen::VectorXd> toVector( /*! Creates an Eigen mapped vector from the given data vector. * - * This is a convienence method which makes the specification of dynamically + * This is a convenience method which makes the specification of dynamically * allocated Eigen vectors as return type easier. */ inline Eigen::Map<Eigen::VectorXd> toVector( diff --git a/MathLib/LinAlg/Eigen/EigenOption.h b/MathLib/LinAlg/Eigen/EigenOption.h index a07437a2d96..e432f005668 100644 --- a/MathLib/LinAlg/Eigen/EigenOption.h +++ b/MathLib/LinAlg/Eigen/EigenOption.h @@ -45,7 +45,7 @@ struct EigenOption final /// Error tolerance double error_tolerance; #ifdef USE_EIGEN_UNSUPPORTED - /// Scaling the coefficient matrix and the RHS bector + /// Scaling the coefficient matrix and the RHS vector bool scaling; /// Restart value for the GMRES solver int restart; diff --git a/MathLib/LinAlg/EigenLis/EigenLisLinearSolver.cpp b/MathLib/LinAlg/EigenLis/EigenLisLinearSolver.cpp index 585c77b209e..05e30cdf91d 100644 --- a/MathLib/LinAlg/EigenLis/EigenLisLinearSolver.cpp +++ b/MathLib/LinAlg/EigenLis/EigenLisLinearSolver.cpp @@ -49,7 +49,7 @@ bool EigenLisLinearSolver::solve(EigenMatrix &A_, EigenVector& b_, LisVector lisb(b.rows(), b.data()); LisVector lisx(x.rows(), x.data()); - LisLinearSolver lissol; // TODO not always creat Lis solver here + LisLinearSolver lissol; // TODO not always create Lis solver here lissol.setOption(_lis_option); bool const status = lissol.solve(lisA, lisb, lisx); diff --git a/MathLib/LinAlg/Lis/LisMatrix.h b/MathLib/LinAlg/Lis/LisMatrix.h index 67a30334532..ceb2447c010 100644 --- a/MathLib/LinAlg/Lis/LisMatrix.h +++ b/MathLib/LinAlg/Lis/LisMatrix.h @@ -193,7 +193,7 @@ void operator()(LisMatrix& matrix, std::vector<LisMatrix::IndexType> row_sizes; row_sizes.reserve(n_rows); - // LIS needs 1 more entry, otherewise it starts reallocating arrays. + // LIS needs 1 more entry, otherwise it starts reallocating arrays. transform(cbegin(sparsity_pattern), cend(sparsity_pattern), back_inserter(row_sizes), [](auto const i) { return i + 1; }); diff --git a/MathLib/LinAlg/PETSc/PETScLinearSolver.h b/MathLib/LinAlg/PETSc/PETScLinearSolver.h index f635402e20f..480b1060ffc 100644 --- a/MathLib/LinAlg/PETSc/PETScLinearSolver.h +++ b/MathLib/LinAlg/PETSc/PETScLinearSolver.h @@ -28,7 +28,7 @@ namespace MathLib { -/*! A class of linear solver based on PETSc rountines. +/*! A class of linear solver based on PETSc routines. All command-line options that are not recognized by OGS are passed on to PETSc, i.e., they potentially affect the linear solver. diff --git a/MathLib/LinAlg/PETSc/PETScMatrix.h b/MathLib/LinAlg/PETSc/PETScMatrix.h index 60893ac1674..5baa659abb1 100644 --- a/MathLib/LinAlg/PETSc/PETScMatrix.h +++ b/MathLib/LinAlg/PETSc/PETScMatrix.h @@ -101,7 +101,7 @@ public: 1.0, &j = k \end{cases}\f$, where \f$k \in \mbox{row\_pos}\f$ This function must be called by all ranks. - \param row_pos The row indicies of the specified rows. + \param row_pos The row indices of the specified rows. */ void setRowsColumnsZero(std::vector<PetscInt> const& row_pos); @@ -168,7 +168,7 @@ public: /*! \brief Add a dense sub-matrix to a PETSc matrix. \param row_pos The global indices of the rows of the dense sub-matrix. - \param col_pos The global indices of the colums of the dense + \param col_pos The global indices of the columns of the dense sub-matrix. \param sub_mat A dense sub-matrix to be added. */ diff --git a/MathLib/LinAlg/PETSc/PETScVector.cpp b/MathLib/LinAlg/PETSc/PETScVector.cpp index 1b0ba6f22f5..34f908d3150 100644 --- a/MathLib/LinAlg/PETSc/PETScVector.cpp +++ b/MathLib/LinAlg/PETSc/PETScVector.cpp @@ -3,7 +3,7 @@ * \brief Definition of member functions of class PETScVector, * which provides an interface to PETSc vector routines. * - * Note: the return message of PETSc routines is ommited in + * Note: the return message of PETSc routines is omitted in * the source code. If it is really needed, it can be activated by * adding a PetscErrorCode type variable before each PETSc function * diff --git a/MathLib/LinAlg/PETSc/PETScVector.h b/MathLib/LinAlg/PETSc/PETScVector.h index 8da6a555d15..bd39d4f484a 100644 --- a/MathLib/LinAlg/PETSc/PETScVector.h +++ b/MathLib/LinAlg/PETSc/PETScVector.h @@ -111,7 +111,7 @@ public: /*! Add values to several entries. - \param e_idxs Indicies of entries to be added + \param e_idxs Indices of entries to be added Note: std::size_t cannot be the type of e_idxs template argument. \param sub_vec Entries to be added. @@ -124,7 +124,7 @@ public: /*! Add values to several entries - \param e_idxs Indicies of entries to be added. + \param e_idxs Indices of entries to be added. Note: std::size_t cannot be the type of e_idxs template argument \param sub_vec Entries to be added @@ -254,7 +254,7 @@ private: */ mutable std::vector<PetscScalar> _entry_array; - /// Map global indices of ghost enrties to local indices + /// Map global indices of ghost entries to local indices mutable std::map<PetscInt, PetscInt> _global_ids2local_ids_ghost; /*! @@ -279,7 +279,7 @@ private: */ inline void restoreArray(PetscScalar* array) const; - /// A funtion called by constructors to configure members + /// A function called by constructors to configure members void config(); friend void finalizeVectorAssembly(PETScVector& vec); diff --git a/MathLib/ODE/CVodeSolver.cpp b/MathLib/ODE/CVodeSolver.cpp index 0b9d3c66ec7..c9a885f6ce5 100644 --- a/MathLib/ODE/CVodeSolver.cpp +++ b/MathLib/ODE/CVodeSolver.cpp @@ -287,7 +287,7 @@ bool CVodeSolverImpl::solve(const double t_end) // check_error asserts that t_end == t_reached and that solving the ODE // went fine. Otherwise the program will be aborted. Therefore, we don't - // have to check manually for errors here and can always savely return true. + // have to check manually for errors here and can always safely return true. return true; } diff --git a/MathLib/ODE/FunctionHandles.h b/MathLib/ODE/FunctionHandles.h index d82b0da9871..039efbf15a2 100644 --- a/MathLib/ODE/FunctionHandles.h +++ b/MathLib/ODE/FunctionHandles.h @@ -21,7 +21,7 @@ namespace detail //! \addtogroup ExternalODESolverInterface //! @{ -/*! Interface providing acces to functions computing \f$\dot y\f$ and its +/*! Interface providing access to functions computing \f$\dot y\f$ and its * Jacobian to code interfacing with external ODE solver libraries. * * \note diff --git a/MathLib/ODE/ODESolver.h b/MathLib/ODE/ODESolver.h index 26dff605417..be2b19e6905 100644 --- a/MathLib/ODE/ODESolver.h +++ b/MathLib/ODE/ODESolver.h @@ -40,7 +40,7 @@ public: /*! Sets functions that compute \f$\dot y\f$ and * the Jacobian \f$\partial \dot y/\partial y\f$. * - * If no Jacobian function shall be set, \c nullptr can be passed fo \c df. + * If no Jacobian function shall be set, \c nullptr can be passed for \c df. * * \remark * solve() cannot be directly called after this method, rather preSolve() diff --git a/MeshGeoToolsLib/GeoMapper.h b/MeshGeoToolsLib/GeoMapper.h index 63f39bbc956..fe97ff83317 100644 --- a/MeshGeoToolsLib/GeoMapper.h +++ b/MeshGeoToolsLib/GeoMapper.h @@ -76,7 +76,7 @@ private: void mapPointDataToMeshSurface(std::vector<GeoLib::Point*> const& pnts); /// Returns the elevation at Point (x,y) based on a mesh. This uses collision detection for triangles and nearest neighbor for quads. - /// NOTE: This medhod only returns correct values if the node numbering of the elements is correct! + /// NOTE: This method only returns correct values if the node numbering of the elements is correct! double getMeshElevation(double x, double y, double min_val, double max_val) const; /// Returns the elevation at Point (x,y) based on a raster diff --git a/MeshGeoToolsLib/HeuristicSearchLength.h b/MeshGeoToolsLib/HeuristicSearchLength.h index 429b78036ef..89c66214794 100644 --- a/MeshGeoToolsLib/HeuristicSearchLength.h +++ b/MeshGeoToolsLib/HeuristicSearchLength.h @@ -26,7 +26,7 @@ namespace MeshGeoToolsLib /// mesh nodes near a geometry. For this purpose it computes the average /// \f$\mu\f$ and the standard deviation \f$\sigma\f$ of edge length or node distance of mesh /// elements. The search length is set to \f$\mu-2\sigma\f$. This strategy -/// is usefull for meshes with different sizes of elements. +/// is useful for meshes with different sizes of elements. class HeuristicSearchLength : public SearchLength { public: diff --git a/MeshGeoToolsLib/MeshEditing/ResetMeshElementProperty.h b/MeshGeoToolsLib/MeshEditing/ResetMeshElementProperty.h index 498cfef2481..ed9fab401e5 100644 --- a/MeshGeoToolsLib/MeshEditing/ResetMeshElementProperty.h +++ b/MeshGeoToolsLib/MeshEditing/ResetMeshElementProperty.h @@ -54,7 +54,7 @@ void resetMeshElementProperty(MeshLib::Mesh& mesh, if (restrict_to_material_id != -1 && !material_ids) { OGS_FATAL( - "Restriction of reseting a property in a polygonal region " + "Restriction of resetting a property in a polygonal region " "requires that a MaterialIDs data array is available in the " "mesh."); } diff --git a/MeshGeoToolsLib/MeshNodeSearcher.cpp b/MeshGeoToolsLib/MeshNodeSearcher.cpp index 19477324d7f..cd3c90f89e2 100644 --- a/MeshGeoToolsLib/MeshNodeSearcher.cpp +++ b/MeshGeoToolsLib/MeshNodeSearcher.cpp @@ -191,7 +191,7 @@ MeshNodeSearcher const& MeshNodeSearcher::getMeshNodeSearcher( { auto const& m = *_mesh_node_searchers[mesh_id]; // return searcher if search length algorithm and the returned search - // lenght are the same, else recreate the searcher + // length are the same, else recreate the searcher if (typeid(m._search_length_algorithm) == typeid(search_length_algorithm) && m._search_length_algorithm->getSearchLength() == diff --git a/MeshLib/Elements/Element.h b/MeshLib/Elements/Element.h index 67bfc3a2792..43c1120096e 100644 --- a/MeshLib/Elements/Element.h +++ b/MeshLib/Elements/Element.h @@ -131,7 +131,7 @@ public: /// Returns true if the element is located at a boundary (i.e. has at least one face without neighbour) virtual bool isBoundaryElement() const; - /// Returns true if these two indeces form an edge and false otherwise + /// Returns true if these two indices form an edge and false otherwise virtual bool isEdge(unsigned i, unsigned j) const = 0; /** @@ -167,7 +167,7 @@ public: /** * Computes the length / area / volumen of this element. This is automatically - * done at initalisation time but can be repeated by calling this function at any time. + * done at initialisation time but can be repeated by calling this function at any time. */ virtual double computeVolume() = 0; diff --git a/MeshLib/IO/MPI_IO/NodePartitionedMeshReader.cpp b/MeshLib/IO/MPI_IO/NodePartitionedMeshReader.cpp index 6495000d04b..814edeca256 100644 --- a/MeshLib/IO/MPI_IO/NodePartitionedMeshReader.cpp +++ b/MeshLib/IO/MPI_IO/NodePartitionedMeshReader.cpp @@ -401,7 +401,7 @@ void NodePartitionedMeshReader::setElements( const std::vector<unsigned long> &elem_data, std::vector<MeshLib::Element*> &mesh_elems, const bool ghost) const { - // Number of elements, ether ghost or regular + // Number of elements, either ghost or regular unsigned long const ne = ghost ? _mesh_info.ghost_elements : _mesh_info.regular_elements; unsigned long const id_offset_ghost = diff --git a/MeshLib/IO/MPI_IO/NodePartitionedMeshReader.h b/MeshLib/IO/MPI_IO/NodePartitionedMeshReader.h index 4dd1af82712..0ff34d4b005 100644 --- a/MeshLib/IO/MPI_IO/NodePartitionedMeshReader.h +++ b/MeshLib/IO/MPI_IO/NodePartitionedMeshReader.h @@ -80,15 +80,15 @@ private: { unsigned long nodes; ///< 0: Number of all nodes of a partition, unsigned long base_nodes; ///< 1: Number of nodes for linear - ///elements of a parition, + ///elements of a partition, unsigned long regular_elements; ///< 2: Number of non-ghost elements ///of a partition, unsigned long ghost_elements; ///< 3: Number of ghost element of a partition, unsigned long active_base_nodes; ///< 4: Number of active nodes for - /// linear element of a parition, + /// linear element of a partition, unsigned long - active_nodes; ///< 5: Number of all active nodes a parition, + active_nodes; ///< 5: Number of all active nodes a partition, unsigned long global_base_nodes; ///< 6: Number of nodes for linear /// element of global mesh, unsigned long global_nodes; ///< 7: Number of all nodes of global mesh, @@ -207,7 +207,7 @@ private: } /*! - \brief Set mesh nodes from a tempory array containing node data read from file. + \brief Set mesh nodes from a temporary array containing node data read from file. \param node_data Vector containing node data read from file. \param mesh_node Vector of mesh nodes to be set. \param glb_node_ids Global IDs of nodes of a partition. @@ -217,7 +217,7 @@ private: std::vector<unsigned long> &glb_node_ids) const; /*! - \brief Set mesh elements from a tempory array containing node data read from file. + \brief Set mesh elements from a temporary array containing node data read from file. \param mesh_nodes Vector of mesh nodes used to set element nodes. \param elem_data Vector containing element data read from file. \param mesh_elems Vector of mesh elements to be set. diff --git a/MeshLib/IO/XDMF/Xdmf3Writer.h b/MeshLib/IO/XDMF/Xdmf3Writer.h index df18f834949..0230c67a292 100644 --- a/MeshLib/IO/XDMF/Xdmf3Writer.h +++ b/MeshLib/IO/XDMF/Xdmf3Writer.h @@ -40,7 +40,7 @@ public: * \brief Write xdmf and h5 file with geometry and topology data. * The data itself is held by a structure outside of this class. * The writer assumes a constant data holder (data itself can change, memory - * adress is the same) + * address is the same) * @param geometry contains meta data to coordinates * @param topology contains meta data cells * @param attributes vector of attributes (each attribute is a OGS property) diff --git a/MeshLib/IO/writeMeshToFile.cpp b/MeshLib/IO/writeMeshToFile.cpp index b111e5c99ff..377aa6f79b0 100644 --- a/MeshLib/IO/writeMeshToFile.cpp +++ b/MeshLib/IO/writeMeshToFile.cpp @@ -48,7 +48,7 @@ int writeMeshToFile(const MeshLib::Mesh& mesh, std::make_unique<MeshLib::IO::XdmfHdfWriter>(MeshLib::IO::XdmfHdfWriter( mesh, file_path, 0)); // \TODO Errorhandling, Change data model into static and time depended, - // then is is not neccessary to give time step 0 a special treatment + // then is is not necessary to give time step 0 a special treatment // here writer->writeStep(0, 0); diff --git a/MeshLib/MeshEditing/MeshRevision.h b/MeshLib/MeshEditing/MeshRevision.h index 9e3f2f16701..6ee66c24885 100644 --- a/MeshLib/MeshEditing/MeshRevision.h +++ b/MeshLib/MeshEditing/MeshRevision.h @@ -39,14 +39,14 @@ public: /** * Constructor * @param mesh The mesh which is being revised. Note that node IDs in mesh - * are changed during computation but are resetted after the algorithms + * are changed during computation but are reset after the algorithms * implemented here are finished */ explicit MeshRevision(MeshLib::Mesh& mesh); virtual ~MeshRevision() = default; - /// Returns the number of potentially collapsable nodes + /// Returns the number of potentially collapsible nodes unsigned getNumberOfCollapsableNodes( double eps = std::numeric_limits<double>::epsilon()) const; diff --git a/MeshLib/MeshQuality/MeshValidation.cpp b/MeshLib/MeshQuality/MeshValidation.cpp index aaf810ca3d0..46b5e64b0b9 100644 --- a/MeshLib/MeshQuality/MeshValidation.cpp +++ b/MeshLib/MeshQuality/MeshValidation.cpp @@ -39,7 +39,7 @@ MeshValidation::MeshValidation(MeshLib::Mesh &mesh) INFO("{:d} unused mesh nodes found.", ns.getSearchedNodeIDs().size()); } MeshRevision rev(mesh); - INFO("Found {:d} potentially collapsable nodes.", + INFO("Found {:d} potentially collapsible nodes.", rev.getNumberOfCollapsableNodes()); const std::vector<ElementErrorCode> codes( diff --git a/MeshLib/NodePartitionedMesh.h b/MeshLib/NodePartitionedMesh.h index 48641fba05a..0f06c384cfb 100644 --- a/MeshLib/NodePartitionedMesh.h +++ b/MeshLib/NodePartitionedMesh.h @@ -29,8 +29,8 @@ class NodePartitionedMesh : public Mesh { public: // Copy a global mesh for the case of the thread number is one, - // i.e the gobal mesh is not partitioned. - // \param mesh The gobal mesh + // i.e the global mesh is not partitioned. + // \param mesh The global mesh explicit NodePartitionedMesh(const Mesh& mesh) : Mesh(mesh), _global_node_ids(mesh.getNumberOfNodes()), diff --git a/MeshLib/Properties-impl.h b/MeshLib/Properties-impl.h index 2b75c49e749..030f83c6dfc 100644 --- a/MeshLib/Properties-impl.h +++ b/MeshLib/Properties-impl.h @@ -79,7 +79,7 @@ template <typename T> bool Properties::existsPropertyVector(std::string const& name) const { auto it(_properties.find(name)); - // Check that a PropertyVector with the approriate name exists. + // Check that a PropertyVector with the appropriate name exists. if (it == _properties.end()) { return false; diff --git a/MeshLib/Vtk/VtkMappedMeshSource.h b/MeshLib/Vtk/VtkMappedMeshSource.h index 87d173c975a..0032f946574 100644 --- a/MeshLib/Vtk/VtkMappedMeshSource.h +++ b/MeshLib/Vtk/VtkMappedMeshSource.h @@ -2,7 +2,7 @@ * \file * \author Lars Bilke * \date 2014-08-12 - * \brief VtkMappedMeshSource is a souce class to transform OGS meshes into + * \brief VtkMappedMeshSource is a source class to transform OGS meshes into * complete vtkUnstructuredGrids. Usage: \code * vtkNew<MeshLib::VtkMappedMeshSource> vtkSource; * vtkSource->SetMesh(mesh); diff --git a/NumLib/DOF/LocalToGlobalIndexMap.cpp b/NumLib/DOF/LocalToGlobalIndexMap.cpp index 0349d8f49a0..1ef6b396361 100644 --- a/NumLib/DOF/LocalToGlobalIndexMap.cpp +++ b/NumLib/DOF/LocalToGlobalIndexMap.cpp @@ -164,9 +164,9 @@ LocalToGlobalIndexMap::LocalToGlobalIndexMap( // _rows should be resized based on an element ID std::size_t max_elem_id = 0; - for (std::vector<MeshLib::Element*>const* eles : vec_var_elements) + for (std::vector<MeshLib::Element*>const* elements : vec_var_elements) { - for (auto e : *eles) + for (auto e : *elements) { max_elem_id = std::max(max_elem_id, e->getID()); } diff --git a/NumLib/DOF/LocalToGlobalIndexMap.h b/NumLib/DOF/LocalToGlobalIndexMap.h index e4c9e497abb..7794a39e845 100644 --- a/NumLib/DOF/LocalToGlobalIndexMap.h +++ b/NumLib/DOF/LocalToGlobalIndexMap.h @@ -169,7 +169,7 @@ public: /// argument instead of being created by the constructor. /// /// \attention The passed mesh_component_map is in undefined state after - /// this construtor. + /// this constructor. explicit LocalToGlobalIndexMap( std::vector<MeshLib::MeshSubset>&& mesh_subsets, std::vector<int> const& global_component_ids, diff --git a/NumLib/DOF/MatrixProviderUser.h b/NumLib/DOF/MatrixProviderUser.h index cc6f7a45afa..cf3a53a2ef4 100644 --- a/NumLib/DOF/MatrixProviderUser.h +++ b/NumLib/DOF/MatrixProviderUser.h @@ -35,7 +35,7 @@ public: * * "Released" means that the caller indicates, that he currently does not need * that \c Vector instance, i.e, Either it is not needed anymore for the entire - * program run, or it is temporarily not needed, but might be aquired again + * program run, or it is temporarily not needed, but might be acquired again * later on. Thereby the implementation of this interface can decide, whether * the storage for the specific vector can be freed or reused in the meantime. * diff --git a/NumLib/DOF/MeshComponentMap.cpp b/NumLib/DOF/MeshComponentMap.cpp index ce54eea3cfb..63cf25a6e8e 100644 --- a/NumLib/DOF/MeshComponentMap.cpp +++ b/NumLib/DOF/MeshComponentMap.cpp @@ -41,7 +41,7 @@ MeshComponentMap::MeshComponentMap( } // Use PETSc with multi-thread - // get number of unknows + // get number of unknowns GlobalIndexType num_unknowns = 0; for (auto const& c : components) { diff --git a/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator.cpp b/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator.cpp index d18a6171e13..bf633561602 100644 --- a/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator.cpp +++ b/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator.cpp @@ -164,7 +164,7 @@ void LocalLinearLeastSquaresExtrapolator::extrapolateElement( if (num_values % num_components != 0) { OGS_FATAL( - "The number of computed integration point values is not divisable " + "The number of computed integration point values is not divisible " "by the number of num_components. Maybe the computed property is " "not a {:d}-component vector for each integration point.", num_components); @@ -292,7 +292,7 @@ void LocalLinearLeastSquaresExtrapolator::calculateResidualElement( if (num_values % num_components != 0) { OGS_FATAL( - "The number of computed integration point values is not divisable " + "The number of computed integration point values is not divisible " "by the number of num_components. Maybe the computed property is " "not a {:d}-component vector for each integration point.", num_components); diff --git a/NumLib/NewtonRaphson.h b/NumLib/NewtonRaphson.h index c69ab91ffd5..aa3930e30ec 100644 --- a/NumLib/NewtonRaphson.h +++ b/NumLib/NewtonRaphson.h @@ -61,7 +61,7 @@ public: ResidualVector residual; do { - // The jacobian and the residual are updated simulataniously to keep + // The jacobian and the residual are updated simultaneously to keep // consistency. The jacobian is used after the non-linear solver // onward. _jacobian_update(jacobian); diff --git a/NumLib/ODESolver/NonlinearSolver.cpp b/NumLib/ODESolver/NonlinearSolver.cpp index 910fcbd3cfc..fc1caf567ac 100644 --- a/NumLib/ODESolver/NonlinearSolver.cpp +++ b/NumLib/ODESolver/NonlinearSolver.cpp @@ -94,7 +94,7 @@ NonlinearSolverStatus NonlinearSolver<NonlinearSolverTag::Picard>::solve( sys.getRhs(*x_prev[process_id], rhs); INFO("[time] Assembly took {:g} s.", time_assembly.elapsed()); - // Subract non-equilibrium initial residuum if set + // Subtract non-equilibrium initial residuum if set if (_r_neq != nullptr) { LinAlg::axpy(rhs, -1, *_r_neq); @@ -285,7 +285,7 @@ NonlinearSolverStatus NonlinearSolver<NonlinearSolverTag::Newton>::solve( sys.getJacobian(J); INFO("[time] Assembly took {:g} s.", time_assembly.elapsed()); - // Subract non-equilibrium initial residuum if set + // Subtract non-equilibrium initial residuum if set if (_r_neq != nullptr) LinAlg::axpy(res, -1, *_r_neq); diff --git a/ProcessLib/BoundaryCondition/Python/PythonBoundaryCondition.cpp b/ProcessLib/BoundaryCondition/Python/PythonBoundaryCondition.cpp index 97d6c83bf0a..976dee9705b 100644 --- a/ProcessLib/BoundaryCondition/Python/PythonBoundaryCondition.cpp +++ b/ProcessLib/BoundaryCondition/Python/PythonBoundaryCondition.cpp @@ -163,7 +163,7 @@ void PythonBoundaryCondition::getEssentialBCValues( if (dof_idx == NumLib::MeshComponentMap::nop) { OGS_FATAL( - "Logic error. This error should already have occured while " + "Logic error. This error should already have occurred while " "gathering primary variables. Something nasty is going on!"); } diff --git a/ProcessLib/BoundaryCondition/Python/PythonBoundaryConditionLocalAssembler.h b/ProcessLib/BoundaryCondition/Python/PythonBoundaryConditionLocalAssembler.h index b672dd9a915..b14b5ddb0bf 100644 --- a/ProcessLib/BoundaryCondition/Python/PythonBoundaryConditionLocalAssembler.h +++ b/ProcessLib/BoundaryCondition/Python/PythonBoundaryConditionLocalAssembler.h @@ -165,7 +165,7 @@ public: auto const left = comp * num_nodes; auto const width = num_nodes; auto const height = num_nodes; - // The assignement -= takes into account the sign convention + // The assignment -= takes into account the sign convention // of 1st-order in time ODE systems in OpenGeoSys. local_Jac.block(top, left, width, height).noalias() -= N.transpose() * (dFlux[comp] * w) * N; diff --git a/ProcessLib/CentralDifferencesJacobianAssembler.cpp b/ProcessLib/CentralDifferencesJacobianAssembler.cpp index 3b141643b76..bd01dc7d50b 100644 --- a/ProcessLib/CentralDifferencesJacobianAssembler.cpp +++ b/ProcessLib/CentralDifferencesJacobianAssembler.cpp @@ -39,7 +39,7 @@ void CentralDifferencesJacobianAssembler::assembleWithJacobian( if (local_x_data.size() % _absolute_epsilons.size() != 0) { OGS_FATAL( "The number of specified epsilons ({:d}) and the number of local " - "d.o.f.s ({:d}) do not match, i.e., the latter is not divisable by " + "d.o.f.s ({:d}) do not match, i.e., the latter is not divisible by " "the former.", _absolute_epsilons.size(), local_x_data.size()); } diff --git a/ProcessLib/HeatTransportBHE/BHE/BHECommon.h b/ProcessLib/HeatTransportBHE/BHE/BHECommon.h index 3b955a69d58..87244e2f72a 100644 --- a/ProcessLib/HeatTransportBHE/BHE/BHECommon.h +++ b/ProcessLib/HeatTransportBHE/BHE/BHECommon.h @@ -1,7 +1,7 @@ /** * \file * - * 2014/06/04 HS inital implementation + * 2014/06/04 HS initial implementation * borehole heat exchanger abstract class * * 1) Diersch_2011_CG diff --git a/ProcessLib/HeatTransportBHE/BHE/BHE_1P.h b/ProcessLib/HeatTransportBHE/BHE/BHE_1P.h index c5bbf6dec36..6ed4272d71d 100644 --- a/ProcessLib/HeatTransportBHE/BHE/BHE_1P.h +++ b/ProcessLib/HeatTransportBHE/BHE/BHE_1P.h @@ -28,13 +28,13 @@ namespace BHE /** * The BHE_1P class is the realization of single-pipe type of Borehole Heate * Exchanger. In this class, the pipe heat capacity, pipe heat conductiion, pie - * advection vectors are intialized according to the geometry of the single-pipe + * advection vectors are initialized according to the geometry of the single-pipe * type of BHE. For this type of BHE, 2 primary unknowns are assigned on the 1D * BHE elements. They are the temperature in the pipe T_p, and temperature of - * the grout zone sorrounding the single pipe T_g. These two primary varaibles + * the grout zone surrounding the single pipe T_g. These two primary variables * are solved according to heat convection and conduction equations on the pipes * and also in the grout zones. The interaction of the 1P type of BHE and the - * sorrounding soil is regulated through the thermal resistance values, which + * surrounding soil is regulated through the thermal resistance values, which * are calculated specifically during the initialization of the class. */ class BHE_1P final : public BHECommon diff --git a/ProcessLib/HeatTransportBHE/BHE/BHE_1U.h b/ProcessLib/HeatTransportBHE/BHE/BHE_1U.h index 11cee1e40b6..1b27f232723 100644 --- a/ProcessLib/HeatTransportBHE/BHE/BHE_1U.h +++ b/ProcessLib/HeatTransportBHE/BHE/BHE_1U.h @@ -29,13 +29,13 @@ namespace BHE /** * The BHE_1U class is the realization of 1U type of Borehole Heate Exchanger. * In this class, the pipe heat capacity, pipe heat conductiion, pie advection - * vectors are intialized according to the geometry of 1U type of BHE. + * vectors are initialized according to the geometry of 1U type of BHE. * For 1U type of BHE, 4 primary unknowns are assigned on the 1D BHE elements. * They are the temperature in inflow pipe T_in, temperature in outflow pipe - * T_out temperature of the two grout zones sorrounding the inflow and outflow - * pipe T_g1 and T_g2. These primary varaibles are solved according to heat + * T_out temperature of the two grout zones surrounding the inflow and outflow + * pipe T_g1 and T_g2. These primary variables are solved according to heat * convection and conduction equations on the pipes and also in the grout zones. - * The interaction of the 1U type of BHE and the sorrounding soil is regulated + * The interaction of the 1U type of BHE and the surrounding soil is regulated * through the thermal resistance values, which are calculated specifically * during the initialization of the class. */ diff --git a/ProcessLib/HeatTransportBHE/BHE/BHE_2U.h b/ProcessLib/HeatTransportBHE/BHE/BHE_2U.h index 1ae7032bfb8..bac48b32c48 100644 --- a/ProcessLib/HeatTransportBHE/BHE/BHE_2U.h +++ b/ProcessLib/HeatTransportBHE/BHE/BHE_2U.h @@ -29,11 +29,11 @@ namespace BHE /** * The BHE_2U class is the realization of 2U type of Borehole Heate Exchanger. * In this class, the pipe heat capacity, pipe heat conductiion, pipe advection - * vectors are intialized according to the geometry of 2U type of BHE. + * vectors are initialized according to the geometry of 2U type of BHE. * For 2U type of BHE, 8 primary unknowns are assigned on the 1D BHE elements. * They are the temperature in inflow pipe T_i1 and T_i2, temperature in outflow * pipe T_o1 and T_o2, temperature of the four grout zones surrounding the - * inflow and outflow pipe T_g1, T_g2, T_g3 and T_g4. These primary varaibles + * inflow and outflow pipe T_g1, T_g2, T_g3 and T_g4. These primary variables * are solved according to heat convection and conduction equations on the pipes * and also in the grout zones. The interaction of the 2U type of BHE and the * surrounding soil is regulated through the thermal resistance values, which diff --git a/ProcessLib/HeatTransportBHE/BHE/BHE_CXA.h b/ProcessLib/HeatTransportBHE/BHE/BHE_CXA.h index 5a9c6383839..0634c9250a5 100644 --- a/ProcessLib/HeatTransportBHE/BHE/BHE_CXA.h +++ b/ProcessLib/HeatTransportBHE/BHE/BHE_CXA.h @@ -25,7 +25,7 @@ namespace BHE /** * The BHE_CXA class is the realization of Coaxial pipe with Annular type of the * Borehole Heate Exchanger. In this class, the pipe heat capacity, - * pipe heat conduction, pipe advection vectors are intialized according to the + * pipe heat conduction, pipe advection vectors are initialized according to the * geometry of CXA type of BHE. For CXA type of BHE, 3 primary unknowns are * assigned on the 1D BHE elements. They are the temperature in inflow pipe * T_in, temperature in outflow pipe T_out, temperature of the grout zone diff --git a/ProcessLib/HeatTransportBHE/BHE/BHE_CXC.h b/ProcessLib/HeatTransportBHE/BHE/BHE_CXC.h index 462b5574735..d0b1448f317 100644 --- a/ProcessLib/HeatTransportBHE/BHE/BHE_CXC.h +++ b/ProcessLib/HeatTransportBHE/BHE/BHE_CXC.h @@ -23,7 +23,7 @@ namespace BHE /** * The BHE_CXC class is the realization of Coaxial pipe with Centred type of the * Borehole Heate Exchanger. In this class, the pipe heat capacity, - * pipe heat conduction, pipe advection vectors are intialized according to the + * pipe heat conduction, pipe advection vectors are initialized according to the * geometry of CXC type of BHE. For CXC type of BHE, 3 primary unknowns are * assigned on the 1D BHE elements. They are the temperature in inflow pipe * T_in, temperature in outflow pipe T_out, temperature of the grout zone diff --git a/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp b/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp index 7b8467cbf42..ffd05169237 100644 --- a/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp +++ b/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp @@ -215,7 +215,7 @@ std::unique_ptr<Process> createHeatTransportBHEProcess( #else OGS_FATAL( "Input files suggest the coupling of BHE with pipe network. " - "This means the compliling flag OGS_USE_PYTHON must be switched " + "This means the compiling flag OGS_USE_PYTHON must be switched " "on. "); #endif // OGS_USE_PYTHON } diff --git a/ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.cpp b/ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.cpp index c89356f662b..415f190d070 100644 --- a/ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.cpp +++ b/ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.cpp @@ -87,7 +87,7 @@ void HeatTransportBHEProcess::constructDofTable() 1}; // one component for the soil temperature variable. // - // BHE nodes with BHE type dependend number of variables. + // BHE nodes with BHE type dependent number of variables. // int const n_BHEs = _process_data._vec_BHE_property.size(); assert(n_BHEs == static_cast<int>(_bheMeshData.BHE_mat_IDs.size())); @@ -216,7 +216,7 @@ void HeatTransportBHEProcess::computeSecondaryVariableConcrete( NumLib::IterationResult HeatTransportBHEProcess::postIterationConcreteProcess( GlobalVector const& x) { - // if the process use python boundary conditon + // if the process use python boundary condition if (_process_data.py_bc_object == nullptr) return NumLib::IterationResult::SUCCESS; @@ -384,7 +384,7 @@ void HeatTransportBHEProcess::createBHEBoundaryConditionTopBottom( #else OGS_FATAL( "The Python Boundary Condition was switched off! " - "Not able to create Boundary Condtion for BHE! "); + "Not able to create Boundary Condition for BHE! "); #endif // OGS_USE_PYTHON } else diff --git a/ProcessLib/LIE/Common/LevelSetFunction.h b/ProcessLib/LIE/Common/LevelSetFunction.h index f2ffef3b0ae..026881da832 100644 --- a/ProcessLib/LIE/Common/LevelSetFunction.h +++ b/ProcessLib/LIE/Common/LevelSetFunction.h @@ -29,7 +29,7 @@ struct JunctionProperty; /// @param junction_props junction properties /// @param fracID_to_local a mapping table from a fracture ID to a local index /// in frac_props -/// @param x evaluating point coordiates +/// @param x evaluating point coordinates /// @return a vector of enrichment values for displacements std::vector<double> uGlobalEnrichments( std::vector<FractureProperty*> const& frac_props, @@ -46,7 +46,7 @@ std::vector<double> uGlobalEnrichments( /// @param junction_props junction properties /// @param fracID_to_local a mapping table from a fracture ID to a local index /// in frac_props -/// @param x evaluating point coordiates +/// @param x evaluating point coordinates /// @return a vector of enrichment values for fracture relative displacements std::vector<double> duGlobalEnrichments( std::size_t this_frac_id, diff --git a/ProcessLib/LIE/Common/MeshUtils.cpp b/ProcessLib/LIE/Common/MeshUtils.cpp index 17d5acf29dd..cf4fa79523b 100644 --- a/ProcessLib/LIE/Common/MeshUtils.cpp +++ b/ProcessLib/LIE/Common/MeshUtils.cpp @@ -195,12 +195,12 @@ void findFracutreIntersections( } } - for (auto& eles : intersected_fracture_elements) + for (auto& elements : intersected_fracture_elements) { - BaseLib::makeVectorUnique(eles); + BaseLib::makeVectorUnique(elements); } - DBUG("-> found {:d} branchs and {:d} junctions", + DBUG("-> found {:d} branches and {:d} junctions", vec_branch_nodeID_matIDs.size(), vec_junction_nodeID_matIDs.size()); } diff --git a/ProcessLib/LIE/Common/Utils.h b/ProcessLib/LIE/Common/Utils.h index 171417ad6eb..a982199dc49 100644 --- a/ProcessLib/LIE/Common/Utils.h +++ b/ProcessLib/LIE/Common/Utils.h @@ -21,7 +21,7 @@ namespace LIE /// Compute a normal vector of the given element /// /// Computed normal vector is oriented in the left direction of the given line -/// element such that computeRotationMatrix() returns the indentity matrix for +/// element such that computeRotationMatrix() returns the identity matrix for /// line elements parallel to a vector (1,0,0) void computeNormalVector(MeshLib::Element const& e, unsigned const global_dim, Eigen::Vector3d& element_normal); diff --git a/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.cpp b/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.cpp index d4f31f59e72..880b3dd5560 100644 --- a/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.cpp +++ b/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.cpp @@ -212,7 +212,7 @@ void HydroMechanicsProcess<GlobalDim>::initializeConcreteProcess( HydroMechanicsLocalAssemblerMatrixNearFracture, HydroMechanicsLocalAssemblerFracture>( mesh.getElements(), dof_table, - // use displacment process variable for shapefunction order + // use displacement process variable for shapefunction order getProcessVariables( monolithic_process_id)[1].get().getShapeFunctionOrder(), _local_assemblers, mesh.isAxiallySymmetric(), integration_order, diff --git a/ProcessLib/LIE/HydroMechanics/LocalAssembler/LocalDataInitializer.h b/ProcessLib/LIE/HydroMechanics/LocalAssembler/LocalDataInitializer.h index bf5e78398d3..35628892881 100644 --- a/ProcessLib/LIE/HydroMechanics/LocalAssembler/LocalDataInitializer.h +++ b/ProcessLib/LIE/HydroMechanics/LocalAssembler/LocalDataInitializer.h @@ -227,7 +227,7 @@ public: auto const n_local_dof = _dof_table.getNumberOfElementDOF(id); auto const varIDs = _dof_table.getElementVariableIDs(id); bool const isPressureDeactivated = (varIDs.front() != 0); - std::vector<int> involved_varIDs; // including deactived elements + std::vector<int> involved_varIDs; // including deactivated elements involved_varIDs.reserve(varIDs.size() + 1); if (isPressureDeactivated) { diff --git a/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.h b/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.h index c29aafcaa08..b25a8cc6930 100644 --- a/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.h +++ b/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.h @@ -39,7 +39,7 @@ namespace RichardsComponentTransport * - \f$\phi\f$ is the porosity, * - \f$S\f$ is the saturation, * - \f$p\f$ is the pressure, - * - \f$k_{\mathrm{rel}}\f$ is the relativ permeability (depending on \f$S\f$), + * - \f$k_{\mathrm{rel}}\f$ is the relative permeability (depending on \f$S\f$), * - \f$\kappa\f$ is the specific permeability, * - \f$\mu\f$ is viscosity of the fluid, * - \f$\rho_w\f$ is the mass density of the fluid, and diff --git a/ProcessLib/RichardsMechanics/RichardsMechanicsFEM-impl.h b/ProcessLib/RichardsMechanics/RichardsMechanicsFEM-impl.h index ca36115eb74..0fea32e72ce 100644 --- a/ProcessLib/RichardsMechanics/RichardsMechanicsFEM-impl.h +++ b/ProcessLib/RichardsMechanics/RichardsMechanicsFEM-impl.h @@ -97,7 +97,7 @@ RichardsMechanicsLocalAssembler<ShapeFunctionDisplacement, ip_data.N_p = shape_matrices_p[ip].N; ip_data.dNdx_p = shape_matrices_p[ip].dNdx; - // Initial porosity. Could be read from intergration point data or mesh. + // Initial porosity. Could be read from integration point data or mesh. ip_data.porosity = solid_phase.property(MPL::porosity) .template initialValue<double>( diff --git a/ProcessLib/SmallDeformation/Tests.cmake b/ProcessLib/SmallDeformation/Tests.cmake index 08919094533..f593abe1212 100644 --- a/ProcessLib/SmallDeformation/Tests.cmake +++ b/ProcessLib/SmallDeformation/Tests.cmake @@ -89,7 +89,7 @@ AddTest( VIS disc_with_hole_ts_4_t_1.000000.vtu ) -# Tests that internal state variables work correcly. +# Tests that internal state variables work correctly. AddTest( NAME Mechanics_DruckerPrager_mfront PATH Mechanics/Ehlers/MFront diff --git a/ProcessLib/SourceTerms/Python/PythonSourceTermLocalAssembler.h b/ProcessLib/SourceTerms/Python/PythonSourceTermLocalAssembler.h index b507e9895f1..e4b12a9e826 100644 --- a/ProcessLib/SourceTerms/Python/PythonSourceTermLocalAssembler.h +++ b/ProcessLib/SourceTerms/Python/PythonSourceTermLocalAssembler.h @@ -185,7 +185,7 @@ public: auto const left = comp * num_nodes; auto const width = num_nodes; auto const height = num_nodes; - // The assignement -= takes into account the sign convention + // The assignment -= takes into account the sign convention // of 1st-order in time ODE systems in OpenGeoSys. local_Jac.block(top, left, width, height).noalias() -= ip_data.N.transpose() * (dflux[comp] * w) * N; diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h b/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h index c186cb3f53c..7d35ad59fc6 100644 --- a/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h +++ b/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h @@ -281,7 +281,7 @@ private: * \f[ * \rho c_p \cdot{T} - \nabla (\mathbf{K} (\nabla T) = Q_T * \f] - * where \f$ rho\f$ is the solid density, \f$ c_p\f$ is the spefific heat + * where \f$ rho\f$ is the solid density, \f$ c_p\f$ is the specific heat * capacity, \f$ \mathbf{K} \f$ is the thermal conductivity, and \f$ Q_T\f$ * is the source/sink term. * diff --git a/Tests/AutoCheckTools.h b/Tests/AutoCheckTools.h index 34facdc5cc9..5cf301bac16 100644 --- a/Tests/AutoCheckTools.h +++ b/Tests/AutoCheckTools.h @@ -41,7 +41,7 @@ namespace autocheck template <typename T, typename Gen = generator<T>> struct IntervalGenerator { - /// Construtor initializing the slope and the \f$y\f$-intercept deploying + /// Constructor initializing the slope and the \f$y\f$-intercept deploying /// lower bound \f$a\f$ and upper bound \f$b\f$ of the interval. IntervalGenerator(T a, T b) : _m((b-a)/2), _n((b+a)/2) diff --git a/Tests/Data/Parabolic/LiquidFlow/AxiSymTheis/axisym_theis.gml b/Tests/Data/Parabolic/LiquidFlow/AxiSymTheis/axisym_theis.gml index 20f3926cf77..aaab2683935 100644 --- a/Tests/Data/Parabolic/LiquidFlow/AxiSymTheis/axisym_theis.gml +++ b/Tests/Data/Parabolic/LiquidFlow/AxiSymTheis/axisym_theis.gml @@ -15,7 +15,7 @@ <pnt>0</pnt> <pnt>1</pnt> </polyline> - <polyline id="1" name="infinit"> + <polyline id="1" name="infinite"> <pnt>2</pnt> <pnt>3</pnt> </polyline> diff --git a/Tests/Data/Parabolic/LiquidFlow/AxiSymTheis/axisym_theis.prj b/Tests/Data/Parabolic/LiquidFlow/AxiSymTheis/axisym_theis.prj index c119ff2fbe2..531bc745120 100644 --- a/Tests/Data/Parabolic/LiquidFlow/AxiSymTheis/axisym_theis.prj +++ b/Tests/Data/Parabolic/LiquidFlow/AxiSymTheis/axisym_theis.prj @@ -167,7 +167,7 @@ </boundary_condition> <boundary_condition> <geometrical_set>theis_geo</geometrical_set> - <geometry>infinit</geometry> + <geometry>infinite</geometry> <type>Dirichlet</type> <parameter>p_dbc</parameter> </boundary_condition> diff --git a/Tests/GeoLib/TestAABB.cpp b/Tests/GeoLib/TestAABB.cpp index 89a9af40d0a..bc52a9d5ed8 100644 --- a/Tests/GeoLib/TestAABB.cpp +++ b/Tests/GeoLib/TestAABB.cpp @@ -38,7 +38,7 @@ TEST(GeoLibAABB, RandomNumberOfPointersToRandomPoints) pnts_list.push_back(new GeoLib::Point(rand() % box_size - half_box_size, rand() % box_size - half_box_size, rand() % box_size - half_box_size)); } - // construct from list points a axis algined bounding box + // construct from list points a axis aligned bounding box GeoLib::AABB aabb(pnts_list.begin(), pnts_list.end()); MathLib::Point3d const& min_pnt(aabb.getMinPoint()); @@ -77,7 +77,7 @@ TEST(GeoLibAABB, RandomNumberOfPointsRandomPointInAList) rand() % box_size - half_box_size); } - // construct from list points a axis algined bounding box + // construct from list points a axis aligned bounding box GeoLib::AABB aabb(pnts_list.begin(), pnts_list.end()); MathLib::Point3d const& min_pnt(aabb.getMinPoint()); @@ -148,7 +148,7 @@ TEST(GeoLibAABB, RandomNumberOfPointsRandomPointInAVector) rand() % box_size - half_box_size); } - // construct from list points a axis algined bounding box + // construct from list points a axis aligned bounding box GeoLib::AABB aabb(pnts.begin(), pnts.end()); MathLib::Point3d const& min_pnt(aabb.getMinPoint()); diff --git a/Tests/MaterialLib/MFront.cpp b/Tests/MaterialLib/MFront.cpp index dd60d007400..20b322d14ab 100644 --- a/Tests/MaterialLib/MFront.cpp +++ b/Tests/MaterialLib/MFront.cpp @@ -48,7 +48,7 @@ struct StandardElasticityBrickBehaviour "StandardElasticityBrick", hypothesis(Dim)); using P = ParameterLib::ConstantParameter<double>; - // Parameters used by mfront model in the order of appearence in the + // Parameters used by mfront model in the order of appearance in the // .mfront file. static P const young_modulus("", 1e11); static P const poisson_ratio("", 0.3); @@ -69,7 +69,7 @@ struct ElasticBehaviour "Elasticity", hypothesis(Dim)); using P = ParameterLib::ConstantParameter<double>; - // Parameters used by mfront model in the order of appearence in the + // Parameters used by mfront model in the order of appearance in the // .mfront file. static P const young_modulus("", 1e11); static P const poisson_ratio("", 0.3); @@ -91,7 +91,7 @@ struct MohrCoulombAbboSloanBehaviour "libOgsMFrontBehaviour", "MohrCoulombAbboSloan", hypothesis(Dim)); using P = ParameterLib::ConstantParameter<double>; - // Parameters used by mfront model in the order of appearence in the + // Parameters used by mfront model in the order of appearance in the // .mfront file. static P const young_modulus("", 150e3); static P const poisson_ratio("", 0.3); diff --git a/Tests/MathLib/TestGaussLegendreIntegration.cpp b/Tests/MathLib/TestGaussLegendreIntegration.cpp index 536a8f1130e..a96d90814a5 100644 --- a/Tests/MathLib/TestGaussLegendreIntegration.cpp +++ b/Tests/MathLib/TestGaussLegendreIntegration.cpp @@ -424,7 +424,7 @@ std::unique_ptr<FBase> getF(unsigned polynomial_order) * different degree over the unit cube. * * Gauss-Legendre integration should be able to exactly integrate those up to a - * certian degree. + * certain degree. * * The coefficients of the tested polynomials are chosen randomly. * diff --git a/Tests/MathLib/TestGlobalMatrixInterface.cpp b/Tests/MathLib/TestGlobalMatrixInterface.cpp index 74375c582aa..500aa32c4af 100644 --- a/Tests/MathLib/TestGlobalMatrixInterface.cpp +++ b/Tests/MathLib/TestGlobalMatrixInterface.cpp @@ -98,7 +98,7 @@ void checkGlobalMatrixInterfaceMPI(T_MATRIX &m, T_VECTOR &v) // Test basic assignment operator with an empty T_MATRIX._A T_MATRIX m_c = m; - // Test basic assignment operator with an initalized T_MATRIX._A + // Test basic assignment operator with an initialized T_MATRIX._A m_c = m; // Multiply by a vector diff --git a/Tests/MeshLib/TestFindElementsWithinRadius.cpp b/Tests/MeshLib/TestFindElementsWithinRadius.cpp index a63de9f59f1..9163a6ec7cb 100644 --- a/Tests/MeshLib/TestFindElementsWithinRadius.cpp +++ b/Tests/MeshLib/TestFindElementsWithinRadius.cpp @@ -28,7 +28,7 @@ struct MeshLibFindElementWithinRadius : public ::testing::Test ac::gtest_reporter gtest_reporter; }; -// For zero radius only the starting element is alway returned. +// For zero radius only the starting element is always returned. TEST_F(MeshLibFindElementWithinRadius, ZeroRadius) { auto mesh = diff --git a/Tests/ProcessLib/RichardsMechanics/MicroporosityComputation.cpp b/Tests/ProcessLib/RichardsMechanics/MicroporosityComputation.cpp index 57df6f0b07e..94bad847b92 100644 --- a/Tests/ProcessLib/RichardsMechanics/MicroporosityComputation.cpp +++ b/Tests/ProcessLib/RichardsMechanics/MicroporosityComputation.cpp @@ -247,7 +247,7 @@ TEST(RichardsMechanics, computeMicroPorosity) << "with eps = " << eps; EXPECT_TRUE((a.sigma_sw - b.sigma_sw).norm() / 1e9 < eps) << "with eps = " << eps; - // Divide pressures and stresses by GPa to get approxmately + // Divide pressures and stresses by GPa to get approximately // O(1) numbers. return eps_equal(a.phi_m, b.phi_m) && eps_equal(a.e_sw, b.e_sw) && eps_equal(a.p_L_m / 1e9, b.p_L_m / 1e9) && diff --git a/Tests/testrunner.cpp b/Tests/testrunner.cpp index 0366d45ae3a..2277add78fb 100644 --- a/Tests/testrunner.cpp +++ b/Tests/testrunner.cpp @@ -58,7 +58,7 @@ int main(int argc, char* argv[]) spdlog::set_pattern("%^%l:%$ %v"); spdlog::set_error_handler([](const std::string& msg) { std::cerr << "spdlog error: " << msg << std::endl; - OGS_FATAL("spdlog logger error occured."); + OGS_FATAL("spdlog logger error occurred."); }); #ifdef USE_PETSC { // Can be called only after MPI_INIT. diff --git a/Tests/xdmfdiff/xdmfdiff.cpp b/Tests/xdmfdiff/xdmfdiff.cpp index 75fd23dc053..16d2ac9d849 100644 --- a/Tests/xdmfdiff/xdmfdiff.cpp +++ b/Tests/xdmfdiff/xdmfdiff.cpp @@ -278,13 +278,13 @@ int main(int argc, char* argv[]) if (!compareValues(mesh_a->point_values, mesh_b->point_values, args.abs_err_thr)) { - std::cerr << "Error in mesh points' comparison occured.\n"; + std::cerr << "Error in mesh points' comparison occurred.\n"; return EXIT_FAILURE; } if (!compareCellTopology(mesh_a->topology_values, mesh_b->topology_values)) { - std::cerr << "Error in cells' topology comparison occured.\n"; + std::cerr << "Error in cells' topology comparison occurred.\n"; return EXIT_FAILURE; } @@ -294,7 +294,7 @@ int main(int argc, char* argv[]) { std::cerr << "Error in mesh attribute ( " << args.data_array_a << ") " << "of first mesh and ( " << args.data_array_b << ") " - << "of second mesh occured.\n"; + << "of second mesh occurred.\n"; return EXIT_FAILURE; } diff --git a/scripts/cmake/CMakeSetup.cmake b/scripts/cmake/CMakeSetup.cmake index f35dd1b7da3..0d13896d857 100644 --- a/scripts/cmake/CMakeSetup.cmake +++ b/scripts/cmake/CMakeSetup.cmake @@ -25,7 +25,7 @@ list(APPEND CMAKE_PREFIX_PATH $ENV{CMAKE_LIBRARY_SEARCH_PATH} # Environment variable, Windows ${CMAKE_LIBRARY_SEARCH_PATH}) # CMake option, Windows -# Load addional modules +# Load additional modules include(GNUInstallDirs) include(ProcessorCount) ProcessorCount(NUM_PROCESSORS) diff --git a/scripts/cmake/conan/conan.cmake b/scripts/cmake/conan/conan.cmake index d77ff21eea0..3d9c60cddee 100644 --- a/scripts/cmake/conan/conan.cmake +++ b/scripts/cmake/conan/conan.cmake @@ -332,7 +332,7 @@ endmacro() function(conan_cmake_install) # Calls "conan install" - # Argument BUILD is equivalant to --build={missing, PkgName,...} or + # Argument BUILD is equivalent to --build={missing, PkgName,...} or # --build when argument is 'BUILD all' (which builds all packages from source) # Argument CONAN_COMMAND, to specify the conan path, e.g. in case of running from source # cmake does not identify conan as command, even if it is +x and it is in the path diff --git a/scripts/cmake/jedbrown/CorrectWindowsPaths.cmake b/scripts/cmake/jedbrown/CorrectWindowsPaths.cmake index 5058282e74a..33b767b1b1d 100644 --- a/scripts/cmake/jedbrown/CorrectWindowsPaths.cmake +++ b/scripts/cmake/jedbrown/CorrectWindowsPaths.cmake @@ -2,7 +2,7 @@ # # CONVERT_CYGWIN_PATH( PATH ) # This uses the command cygpath (provided by cygwin) to convert -# unix-style paths into paths useable by cmake on windows +# unix-style paths into paths usable by cmake on windows macro (CONVERT_CYGWIN_PATH _path) if (WIN32) diff --git a/scripts/cmake/jedbrown/FindPETSc.cmake b/scripts/cmake/jedbrown/FindPETSc.cmake index 41e02d9798c..7fb969e138e 100644 --- a/scripts/cmake/jedbrown/FindPETSc.cmake +++ b/scripts/cmake/jedbrown/FindPETSc.cmake @@ -36,7 +36,7 @@ if(NOT PETSc_FIND_COMPONENTS) set(PETSC_LANGUAGE_BINDINGS "CXX") endif () else() - # Right now, this is designed for compatability with the --with-clanguage option, so + # Right now, this is designed for compatibility with the --with-clanguage option, so # only allow one item in the components list. list(LENGTH ${PETSc_FIND_COMPONENTS} components_length) if(${components_length} GREATER 1) diff --git a/scripts/cmake/jedbrown/FindPackageMultipass.cmake b/scripts/cmake/jedbrown/FindPackageMultipass.cmake index fbf06a7f0fc..763fed3423f 100644 --- a/scripts/cmake/jedbrown/FindPackageMultipass.cmake +++ b/scripts/cmake/jedbrown/FindPackageMultipass.cmake @@ -27,7 +27,7 @@ # variable is either C or CXX indicating which compiler the test should # use. # MULTIPASS_C_SOURCE_RUNS (Name INCLUDES LIBRARIES SOURCE RUNS) -# DEPRECATED! This is only included for backwards compatability. Use +# DEPRECATED! This is only included for backwards compatibility. Use # the more general MULTIPASS_SOURCE_RUNS instead. # Always runs the given test, use this when you need to re-run tests # because parent variables have made old cache entries stale. diff --git a/scripts/cmake/jedbrown/ResolveCompilerPaths.cmake b/scripts/cmake/jedbrown/ResolveCompilerPaths.cmake index 6610e30ec6d..cf9abd5a923 100644 --- a/scripts/cmake/jedbrown/ResolveCompilerPaths.cmake +++ b/scripts/cmake/jedbrown/ResolveCompilerPaths.cmake @@ -78,7 +78,7 @@ macro (RESOLVE_LIBRARIES LIBS LINK_LINE) endif (token MATCHES "-L([^\" ]+|\"[^\"]+\")") endforeach (token) set (_lib "NOTFOUND" CACHE INTERNAL "Scratch variable" FORCE) - # only the LAST occurence of each library is required since there should be no circular dependencies + # only the LAST occurrence of each library is required since there should be no circular dependencies if (_libs_found) list (REVERSE _libs_found) list (REMOVE_DUPLICATES _libs_found) diff --git a/scripts/doc/linked-xml-file.py b/scripts/doc/linked-xml-file.py index f209d19cd83..57d8ceadae9 100755 --- a/scripts/doc/linked-xml-file.py +++ b/scripts/doc/linked-xml-file.py @@ -34,7 +34,7 @@ datadir = os.path.abspath(datadir) docauxdir = os.path.abspath(docauxdir) outdir = os.path.join(docauxdir, "dox", "CTestProjectFiles") -# Expansions or shortcuts for the documenation can be added here in the +# Expansions or shortcuts for the documentation can be added here in the # following format: # "prj__processes__process": "process", # See the expansion table in the append-xml-tags.py too. @@ -275,7 +275,7 @@ for (dirpath, dirnames, filenames) in os.walk(datadir, topdown=False): try: xmlroot = ET.parse(filepath).getroot() except ET.ParseError as err: - print("ParseError occured in file :", filepath) + print("ParseError occurred in file :", filepath) print(err) raise print_tags(xmlroot, 0, "prj", fh, None, 0, relfilepath) diff --git a/scripts/test/clang_sanitizer_blacklist.txt b/scripts/test/clang_sanitizer_blacklist.txt index 44fb0114a35..4aa88c22164 100644 --- a/scripts/test/clang_sanitizer_blacklist.txt +++ b/scripts/test/clang_sanitizer_blacklist.txt @@ -17,7 +17,7 @@ fun:_ZNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE10_S_compareEmm fun:_ZNSs10_S_compareEmm fun:*_S_compare* -# When looking for a last occurence of a string in another string the algorithm +# When looking for a last occurrence of a string in another string the algorithm # an integer subtraction overflow happens. # STL gcc-5.3: std::string::find_last_of(...) const fun:_ZNKSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEE12find_last_ofEPKcmm diff --git a/web/content/docs/benchmarks/bgr_verification_examples/heatconduction.md b/web/content/docs/benchmarks/bgr_verification_examples/heatconduction.md index f524e172ae3..225a8bd6ea9 100644 --- a/web/content/docs/benchmarks/bgr_verification_examples/heatconduction.md +++ b/web/content/docs/benchmarks/bgr_verification_examples/heatconduction.md @@ -17,7 +17,7 @@ These benchmark examples test the implementation of heat conduction process with analytical solutions presented by Vogel/Massmann. -A detailed descritption can be found in the ogs Benchmark books. +A detailed description can be found in the ogs Benchmark books. The following table links the ogs problem descriptions with its corresponding chapters in the benchmark books. diff --git a/web/content/docs/benchmarks/bgr_verification_examples/hydromechanics.md b/web/content/docs/benchmarks/bgr_verification_examples/hydromechanics.md index 24ce7e95136..85068d4acda 100644 --- a/web/content/docs/benchmarks/bgr_verification_examples/hydromechanics.md +++ b/web/content/docs/benchmarks/bgr_verification_examples/hydromechanics.md @@ -17,7 +17,7 @@ These benchmark examples test the implementation of hydromechanics process with analytical solutions presented by Vogel/Massmann. -A detailed descritption can be found in the ogs Benchmark books. +A detailed description can be found in the ogs Benchmark books. The following table links the ogs problem descriptions with its corresponding chapters in the benchmark books. diff --git a/web/content/docs/benchmarks/bgr_verification_examples/liquid_flow.md b/web/content/docs/benchmarks/bgr_verification_examples/liquid_flow.md index b3510b0762c..40768c2b8d2 100644 --- a/web/content/docs/benchmarks/bgr_verification_examples/liquid_flow.md +++ b/web/content/docs/benchmarks/bgr_verification_examples/liquid_flow.md @@ -17,7 +17,7 @@ These benchmark examples test the implementation of liquid flow process with analytical solutions presented by Vogel/Massmann. -A detailed descritption can be found in the ogs Benchmark books. +A detailed description can be found in the ogs Benchmark books. The following table links the ogs problem descriptions with its corresponding chapters in the benchmark books. diff --git a/web/content/docs/benchmarks/bgr_verification_examples/mechanics.md b/web/content/docs/benchmarks/bgr_verification_examples/mechanics.md index 4a11f8b68d1..f3406eb9164 100644 --- a/web/content/docs/benchmarks/bgr_verification_examples/mechanics.md +++ b/web/content/docs/benchmarks/bgr_verification_examples/mechanics.md @@ -14,7 +14,7 @@ These benchmark examples test the implementation of small deformations process with analytical solutions presented by Vogel/Massmann. -A detailed descritption can be found in the ogs Benchmark books. +A detailed description can be found in the ogs Benchmark books. The following table links the ogs problem descriptions with its corresponding chapters in the benchmark books. diff --git a/web/content/docs/benchmarks/bgr_verification_examples/thermomechanics.md b/web/content/docs/benchmarks/bgr_verification_examples/thermomechanics.md index f3c8b9ef49e..cbe551d46eb 100644 --- a/web/content/docs/benchmarks/bgr_verification_examples/thermomechanics.md +++ b/web/content/docs/benchmarks/bgr_verification_examples/thermomechanics.md @@ -17,7 +17,7 @@ These benchmark examples test the implementation of thermomechanics process with analytical solutions presented by Vogel/Massmann. -A detailed descritption can be found in the ogs Benchmark books. +A detailed description can be found in the ogs Benchmark books. The following table links the ogs problem descriptions with its corresponding chapters in the benchmark books. diff --git a/web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation.md b/web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation.md index da85a82ea47..7fc58ab6278 100644 --- a/web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation.md +++ b/web/content/docs/benchmarks/creep-after-excavation-bgra/CreepAfterExcavation.md @@ -73,7 +73,7 @@ The following three figures are plotted by using the results of the simulation o The three figures display the distribution of horizontal and vertical stresses at times of 108 days, 409 days and 1000 days, respectively. -In theses three figures, +In these three figures, the left sub-figure show the time variations of horizontal and vertical stresses at a position just close to the top of the drift, and the green vertical line in it marks the time of the displayed stress field. diff --git a/web/content/docs/benchmarks/creepbgra/BGRaVerificationExamples.md b/web/content/docs/benchmarks/creepbgra/BGRaVerificationExamples.md index 0b22709fffb..677466c057f 100644 --- a/web/content/docs/benchmarks/creepbgra/BGRaVerificationExamples.md +++ b/web/content/docs/benchmarks/creepbgra/BGRaVerificationExamples.md @@ -16,7 +16,7 @@ author = "Jan Thiedau" These benchmark examples test the implementation of the BGRa creep law with analytical solutions presented by Vogel/Massmann. -A detailed descritption can be found in the ogs Benchmark books. +A detailed description can be found in the ogs Benchmark books. The following table links the ogs problem descriptions with its corresponding chapters in the benchmark books. diff --git a/web/content/docs/benchmarks/elliptic/poisson_equation.md b/web/content/docs/benchmarks/elliptic/poisson_equation.md index dfa4fc2eac6..474446c115d 100644 --- a/web/content/docs/benchmarks/elliptic/poisson_equation.md +++ b/web/content/docs/benchmarks/elliptic/poisson_equation.md @@ -94,7 +94,7 @@ follows: <python_script>sin_x_sin_y_source_term.py</python_script> ``` -In the source term descripition +In the source term description ```xml <source_term> diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE.md b/web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE.md index b806d437db0..f692d9d23fe 100644 --- a/web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE.md +++ b/web/content/docs/benchmarks/heat-transport-bhe/3D_2U_BHE.md @@ -15,7 +15,7 @@ project = "Parabolic/T/3D_2U_BHE/3D_2U_BHE.prj" ## Model Setup -The numerical model was established based on dual continuum method developed by Diersch et al. (2011). In the 3D 2U type BHE benchmark, the depth of the whole domain is 18.5 m with a square cross section of 5 m per side. The BHE bottom is situated at -18 m and its total length is 18 m. Detailed parameters for the model configuration are listed in the follwoing table. +The numerical model was established based on dual continuum method developed by Diersch et al. (2011). In the 3D 2U type BHE benchmark, the depth of the whole domain is 18.5 m with a square cross section of 5 m per side. The BHE bottom is situated at -18 m and its total length is 18 m. Detailed parameters for the model configuration are listed in the following table. | Parameter | Symbol | Value | Unit | | ---------------------------------- |:------------------ | -------------------:| --------------------------: | @@ -50,7 +50,7 @@ All the other parameters adopted in the model is same as the ones used in the sc ## FEFLOW Input Files For the benchmark a FEFLOW model is presented. -The mesh used in the OGS model is directly coverted from the FEFLOW model mesh, to ensure that there is no influence to the comparison results from the mesh side. +The mesh used in the OGS model is directly converted from the FEFLOW model mesh, to ensure that there is no influence to the comparison results from the mesh side. Both the FEFLOW and ogs model mesh can be found in the ogs GitLab (<https://gitlab.opengeosys.org/ogs/ogs/-/merge_requests/3426>). ## FEFLOW Input Files @@ -67,9 +67,9 @@ The comparison figures demonstrate that the OGS numerical results and FEFLOW res Figure 2: Comparison of vertical temperature distribution from scenario by adopting the fixed inflow boundary condition Figure 3 shows the vertical distributed temperature of circulating fluid after operation for 3300 s by adopting different power boundary conditions in OGS and FEFLOW models. -Compared to the resutls computed from the OGS model with using a fixed power boundary condtion (illustrated as the blue and green line), A 0.18 $^{\circ}$C difference is found for the averaged vertical temperature from the FEFLOW model (illustrated as the dotted line). +Compared to the resutls computed from the OGS model with using a fixed power boundary condition (illustrated as the blue and green line), A 0.18 $^{\circ}$C difference is found for the averaged vertical temperature from the FEFLOW model (illustrated as the dotted line). The reason to the results difference is due to the different power boundary condition type adopted in the two software. -In FEFLOW the power boundary condtion is based on the outlet temperature calculated from the last time step (non-iterative). +In FEFLOW the power boundary condition is based on the outlet temperature calculated from the last time step (non-iterative). Compared to it, the default power boundary condition adopted in the OGS `Heat_Transport_BHE` process is based on the outlet temperature calculated from the current time step (with-iterative). Besides, by setting python bindings, the current OGS `Heat_Transport_BHE` process is capable to adopt the power boundary condition type used in the FEFLOW software. In this way, the computed vertical distributed circulating fluid temperature is updated to the black and red solid line illustrated in the figure 3. diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array.md b/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array.md index 1e027336b85..a2f9c4e992b 100644 --- a/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array.md +++ b/web/content/docs/benchmarks/heat-transport-bhe/3D_3BHEs_array.md @@ -99,7 +99,7 @@ This imbalance leads to a lower outflow temperature from the BHE \#2, which is s Compared to the decrease of the heat extraction rate on the centre BHE \#2, the rates on the other two BHEs located at the out sides was gradually increasing. It indicates that the heat extraction rate is shifting from the centre BHE towards the outer BHEs over the heating season. -In comparision to the one-way setup, the closed-loop network shows a slightly different behaviour. +In comparison to the one-way setup, the closed-loop network shows a slightly different behaviour. The evolution of inflow refrigerant temperature and flow rate entering the BHE array is shown in Figure 5. With the decreasing of the working fluid temperature over the time, the system flow rate dereases gradually. Figure 6 depicts the thermal load shifting phenomenon with the closed-loop model. diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox.md b/web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox.md index 28dfa3b451e..1700fb1081a 100644 --- a/web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox.md +++ b/web/content/docs/benchmarks/heat-transport-bhe/3D_Beier_sandbox.md @@ -19,7 +19,7 @@ The U-type Borehole Heat Exchanger (BHE) is always utilized to extract the shall ## Model Setup -The numerical model was established using dual continuum method Diersch et al. (2011), in which the BHE is represented by the line element and 3D prism stands for the sand part. The numerical geometry model can be visualized as shown in Figure 1. Thus, there are two material groups in the model distinguishing the soil part and the BHE part. The length of the whole box is 18.5 m with a square cross section of 5 m per side to avoid the impact of boundary conditions on the soil temperature. Detailed parameters for the model configuration are listed in the follwoing table. +The numerical model was established using dual continuum method Diersch et al. (2011), in which the BHE is represented by the line element and 3D prism stands for the sand part. The numerical geometry model can be visualized as shown in Figure 1. Thus, there are two material groups in the model distinguishing the soil part and the BHE part. The length of the whole box is 18.5 m with a square cross section of 5 m per side to avoid the impact of boundary conditions on the soil temperature. Detailed parameters for the model configuration are listed in the following table. | Parameter | Symbol | Value | Unit | | ---------------------------------- |:------------------ | -------------------:| --------------------------: | diff --git a/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE.md b/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE.md index 2a22b5d2e13..74f0890f9e2 100644 --- a/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE.md +++ b/web/content/docs/benchmarks/heat-transport-bhe/3D_coaxial_deep_BHE.md @@ -15,7 +15,7 @@ project = "Parabolic/T/3D_deep_BHE/3D_deep_BHE_CXA.prj" ## Problem description -In recent years, Borehole Heat Exchangers (BHE) are very widely utilized to extract geothermal energy for building heating. For coaxial type of BHEs, an inner pipe is installed inside of an outer pipe, allowing the downward and upward flow to be seperated. In some projects, very long coaxial BHEs are installed down to a 2-km depth, in order to extract more energy from the deep subsurface (Kong et al., 2017). Based on the flow directions, there are two types of coaxial BHEs. When downward flow is located in the inner pipe, it is called Coaxial-Centred (CXC) type. On the countary, if the inflow is introduced in the annular space, it is called a CXA type. Detailed schematization of the CXA-type BHE system is shown in Figure 1. In this benchmark, the numerical model in OGS-6 has been tested for the 2 coaxial types of BHEs. The simulation results are compared with previous OGS-5 results and also the analytical solution proposed by [Beier et al. (2014)](../Analytical_coaxial_BHE.zip). +In recent years, Borehole Heat Exchangers (BHE) are very widely utilized to extract geothermal energy for building heating. For coaxial type of BHEs, an inner pipe is installed inside of an outer pipe, allowing the downward and upward flow to be separated. In some projects, very long coaxial BHEs are installed down to a 2-km depth, in order to extract more energy from the deep subsurface (Kong et al., 2017). Based on the flow directions, there are two types of coaxial BHEs. When downward flow is located in the inner pipe, it is called Coaxial-Centred (CXC) type. On the countary, if the inflow is introduced in the annular space, it is called a CXA type. Detailed schematization of the CXA-type BHE system is shown in Figure 1. In this benchmark, the numerical model in OGS-6 has been tested for the 2 coaxial types of BHEs. The simulation results are compared with previous OGS-5 results and also the analytical solution proposed by [Beier et al. (2014)](../Analytical_coaxial_BHE.zip). {{< img src="../3D_coaxial_deep_BHE_figures/coaxial_deep_BHE.png" width="200">}} diff --git a/web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term.md b/web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term.md index dc3ab0ab5b0..16ddfb9728b 100644 --- a/web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term.md +++ b/web/content/docs/benchmarks/heatconduction/heatconduction-line_source_term.md @@ -37,7 +37,7 @@ available. Here, some of the 3d benchmarks are described. ### Cylindrical domain -The Poisson equation on cylindrical domain of heigth $1$ and radius +The Poisson equation on cylindrical domain of height $1$ and radius $r=1$ is solved. In the following figure the geometry, partly semi-transparent, is sketched. Furthermore, the mesh resolution is shown in the cylindrical domain within the first quadrant of the coordinate system. In the second quadrant the @@ -102,7 +102,7 @@ The input meshes are stored in the VTK file format and can be directly visualize ### Cylindrical domain - axisymmetric example -The Poisson equation on cylindrical domain of heigth $1$ and radius +The Poisson equation on cylindrical domain of height $1$ and radius $r=1$ is solved. The cylindrical domain is defined as axisymmetric. #### Results and evaluation diff --git a/web/content/docs/benchmarks/hydro-component/vdbc.md b/web/content/docs/benchmarks/hydro-component/vdbc.md index e1f5fed09cb..43732ec288d 100644 --- a/web/content/docs/benchmarks/hydro-component/vdbc.md +++ b/web/content/docs/benchmarks/hydro-component/vdbc.md @@ -22,4 +22,4 @@ For the setup and parameterization, see the chapter "Density dependent flow - Th ## Results -{{< img src="../VDBC_num_ana_comp.png" title="UPPER PART: Analytical solution on the right boundary in dependance of time $t$ of the problem indicated with red dashed line in comparison to numerical solution indicated by blue crosses; LOWER PART: development of relative error in dependance of time $t$. Grid spacing for simulations: 0.1; widest timestep 10. The relative error is below $5 \times 10^{-5}$ for all simulation times.">}} +{{< img src="../VDBC_num_ana_comp.png" title="UPPER PART: Analytical solution on the right boundary in dependence of time $t$ of the problem indicated with red dashed line in comparison to numerical solution indicated by blue crosses; LOWER PART: development of relative error in dependence of time $t$. Grid spacing for simulations: 0.1; widest timestep 10. The relative error is below $5 \times 10^{-5}$ for all simulation times.">}} diff --git a/web/content/docs/benchmarks/hydro-thermal/constant-viscosity.md b/web/content/docs/benchmarks/hydro-thermal/constant-viscosity.md index 5cf3dd0caa8..78c1f934e39 100644 --- a/web/content/docs/benchmarks/hydro-thermal/constant-viscosity.md +++ b/web/content/docs/benchmarks/hydro-thermal/constant-viscosity.md @@ -21,7 +21,7 @@ See [this PDF](../HT-Process.pdf). This is a 2d benchmark of large-scale thermal convection that tests the temperature dependent fluid density in the hydro-thermal process monolitic approach implementation. It is defined on the domain $\Omega = [0,5500]^2.$ -- The initial conditions for the pressure is a gradient starting from zero at the top surface to a pressure of circa 54 mega pascal at the bottom given in the data array 'initial_pressure' in the vtu file. The initial temperature is also almost a gradient from top (293 K) to bottom (443 K) of the domain, except there is a small pertubation given by adding $\sin \left( \pi \frac{y}{5500}\right) \cdot \cos \left( \pi \frac{x}{5500}\right).$ See the following images. +- The initial conditions for the pressure is a gradient starting from zero at the top surface to a pressure of circa 54 mega pascal at the bottom given in the data array 'initial_pressure' in the vtu file. The initial temperature is also almost a gradient from top (293 K) to bottom (443 K) of the domain, except there is a small perturbation given by adding $\sin \left( \pi \frac{y}{5500}\right) \cdot \cos \left( \pi \frac{x}{5500}\right).$ See the following images. TODO 3 images diff --git a/web/content/docs/benchmarks/liquid-flow/time-dependent-heterogeneous-source-term-and-boundary-conditions.md b/web/content/docs/benchmarks/liquid-flow/time-dependent-heterogeneous-source-term-and-boundary-conditions.md index 18fd18c66e3..93eeb49914f 100644 --- a/web/content/docs/benchmarks/liquid-flow/time-dependent-heterogeneous-source-term-and-boundary-conditions.md +++ b/web/content/docs/benchmarks/liquid-flow/time-dependent-heterogeneous-source-term-and-boundary-conditions.md @@ -51,7 +51,7 @@ defined also. Values of the parameter are piecewise linear interpolated. ## Example -This simple example should demonstrate the use of the time depenendent +This simple example should demonstrate the use of the time dependent heterogeneous parameter. We start with homogeneous parabolic problem: $$ \begin{equation} diff --git a/web/content/docs/benchmarks/phase-field/pf_perc.md b/web/content/docs/benchmarks/phase-field/pf_perc.md index 11236a4817c..edcc4c598ba 100644 --- a/web/content/docs/benchmarks/phase-field/pf_perc.md +++ b/web/content/docs/benchmarks/phase-field/pf_perc.md @@ -23,7 +23,7 @@ We simulate two different fluid percolation experiments performed on rock salt s ## Results and evaluation -Simulated crack pathes (phase-field) for the two cases are shown below: +Simulated crack paths (phase-field) for the two cases are shown below: {{< img src="../VPF_ME2_case1.png" >}} {{< img src="../VPF_ME2_case2.png" >}} diff --git a/web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact.md b/web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact.md index 64067364b7f..5192589ec62 100644 --- a/web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact.md +++ b/web/content/docs/benchmarks/python-bc/hertz-contact/hertz-contact.md @@ -94,5 +94,5 @@ For the average pressure $\bar p$ the analytical form of Eq. $(\ref{eq:bar-p})$ is reproduced, too. But for $\bar p$ there are rather strong deviations between the numerical and analytical results, which might be due to deviations in the -contact radii $a$, due to unsufficient mesh resolution or due to +contact radii $a$, due to insufficient mesh resolution or due to the chosen linear order of FEM ansatz functions. diff --git a/web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2.md b/web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2.md index 7cc23488ae6..beb4913d266 100644 --- a/web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2.md +++ b/web/content/docs/benchmarks/reactive-transport/kineticreactant_allascomponents/KineticReactant2.md @@ -34,7 +34,7 @@ The initial concentration of $\text{H}^+$--ions is $1.0e\textrm{-}7~\textrm{mol Respective material properties, initial and boundary conditions are listed in the tables below. **2d scenario:** -The 2d--scenario only differs in the domain geometry and assignement of the boundary conditions. +The 2d--scenario only differs in the domain geometry and assignment of the boundary conditions. The horizontal domain is 0.5 m in x and 0.5 m in y direction, and, discretized into 10374 quadratic elemtents with an edge size of 0.0025 m.  diff --git a/web/content/docs/benchmarks/reactive-transport/wetland/Wetland.md b/web/content/docs/benchmarks/reactive-transport/wetland/Wetland.md index 05a34e86497..79dfa3d7158 100644 --- a/web/content/docs/benchmarks/reactive-transport/wetland/Wetland.md +++ b/web/content/docs/benchmarks/reactive-transport/wetland/Wetland.md @@ -15,7 +15,7 @@ title = "Complex kinetic reaction network" ## Overview -The studied system represents a treatment wetland, which can be considered as an engineered ecosystem that mimics natural occuring microbiological processes to treat wastewater. +The studied system represents a treatment wetland, which can be considered as an engineered ecosystem that mimics natural occurring microbiological processes to treat wastewater. Basically, such a system consists of a basin filled with a grained solid media (e.g. gravel or sand) and wastewater is passed through it. Multiple types of microbial organisms are present that can metabolize chemical pollutants (e.g. ammoni or organic molecules) present in wastewater, which drives the cycling of carbon and nutrients. diff --git a/web/content/docs/devguide/advanced/configuration-options.md b/web/content/docs/devguide/advanced/configuration-options.md index 66c82134f19..8b470fc2e95 100644 --- a/web/content/docs/devguide/advanced/configuration-options.md +++ b/web/content/docs/devguide/advanced/configuration-options.md @@ -11,7 +11,7 @@ weight = 1033 ## CMake options -Some of these options are enabled by default ("*Defaults* to *ON*") otherwise they must be expicitly set to *ON*. +Some of these options are enabled by default ("*Defaults* to *ON*") otherwise they must be explicitly set to *ON*. ### General diff --git a/web/content/docs/devguide/advanced/python-env.md b/web/content/docs/devguide/advanced/python-env.md index da624addc1f..4edd7bc336c 100644 --- a/web/content/docs/devguide/advanced/python-env.md +++ b/web/content/docs/devguide/advanced/python-env.md @@ -67,7 +67,7 @@ cmake ../ogs -DOGS_USE_CONAN=auto ### Poetry & Benchmarks -You can use the argument `PYTHON_PACKAGES` on `AddTest()` to specifiy additional Python package dependencies. +You can use the argument `PYTHON_PACKAGES` on `AddTest()` to specify additional Python package dependencies. The following example would install the latest version of `numpy` and `pandas` version 0.1.2: diff --git a/web/content/docs/devguide/development-workflows/development-ides.md b/web/content/docs/devguide/development-workflows/development-ides.md index e3cd06bb94c..c63c7db5d82 100644 --- a/web/content/docs/devguide/development-workflows/development-ides.md +++ b/web/content/docs/devguide/development-workflows/development-ides.md @@ -29,7 +29,7 @@ I will assume, that you have the sources (eg. checked out from github) and that /home/user/ogs6/sources ``` -Please, create a seperate **build directory** for your favorite IDE like +Please, create a separate **build directory** for your favorite IDE like ```bash /home/user/ogs6/build_gdb diff --git a/web/content/docs/tools/fileio/Mesh2Raster/index.md b/web/content/docs/tools/fileio/Mesh2Raster/index.md index c6c1fe7b46d..376d12e8d70 100644 --- a/web/content/docs/tools/fileio/Mesh2Raster/index.md +++ b/web/content/docs/tools/fileio/Mesh2Raster/index.md @@ -65,4 +65,4 @@ Mesh2Raster -i input.vtu -o output.asc -c 1000 ## Application -The resulting ASCII-rasters can be used to represent surface data in geographic information systems. In the absense of input data, a detailed raster can also be used by OpenGeoSys preprocessing tools to generate new surface meshes with different resolution or properties. +The resulting ASCII-rasters can be used to represent surface data in geographic information systems. In the absence of input data, a detailed raster can also be used by OpenGeoSys preprocessing tools to generate new surface meshes with different resolution or properties. diff --git a/web/content/docs/tools/getting-started/first_steps/index.md b/web/content/docs/tools/getting-started/first_steps/index.md index dbd9cbf5032..0259739fa74 100644 --- a/web/content/docs/tools/getting-started/first_steps/index.md +++ b/web/content/docs/tools/getting-started/first_steps/index.md @@ -9,7 +9,7 @@ weight = 101 parent = "getting-started" +++ -## Frist Steps +## First Steps This section describes a possible general pre-processing workflow using some of the tools provided by OGS. diff --git a/web/content/docs/tools/getting-started/video-tutorial/mesh_basin.py b/web/content/docs/tools/getting-started/video-tutorial/mesh_basin.py index 5f26e12b5d4..c478acbdfab 100644 --- a/web/content/docs/tools/getting-started/video-tutorial/mesh_basin.py +++ b/web/content/docs/tools/getting-started/video-tutorial/mesh_basin.py @@ -32,7 +32,7 @@ gmsh.model.add("basinMesh") # - the first 3 arguments are the point coordinates (x, y, z) # - the next (optional) argument is the target mesh size (the "characteristic # length") close to the point -# - the last (optional) argument is the point tag (a stricly positive integer +# - the last (optional) argument is the point tag (a strictly positive integer # that uniquely identifies the point) # The distribution of the mesh element sizes will be obtained by interpolation @@ -130,7 +130,7 @@ for l in range(1, 5): # groups are defined, Gmsh will export in output files only mesh elements that # belong to at least one physical group. (To force Gmsh to save all elements, # whether they belong to physical groups or not, set the `Mesh.SaveAll' option -# to 1.) Physical groups are also identified by tags, i.e. stricly positive +# to 1.) Physical groups are also identified by tags, i.e. strictly positive # integers, that should be unique per dimension (0D, 1D, 2D or 3D). Physical # groups can also be given names. # diff --git a/web/content/docs/tools/meshing-submeshes/identifySubdomains/index.md b/web/content/docs/tools/meshing-submeshes/identifySubdomains/index.md index e5039d01f29..6bdf6955589 100644 --- a/web/content/docs/tools/meshing-submeshes/identifySubdomains/index.md +++ b/web/content/docs/tools/meshing-submeshes/identifySubdomains/index.md @@ -18,12 +18,12 @@ mesh. ## Example Given a "bulk" mesh (Tests/Data/Mechanics/Linear/disc_with_hole.vtu) and a -[quater cirle mesh](quater_circle.vtu) extracted manually we want to use the -quater circle mesh for heterogeneous boundary condition. OGS requires two +[quarter circle mesh](quater_circle.vtu) extracted manually we want to use the +quarter circle mesh for heterogeneous boundary condition. OGS requires two mappings into the "bulk" mesh, one for the nodes and one for the elements.  To create this mappings we run diff --git a/web/content/docs/tools/meshing-submeshes/submeshes/index.md b/web/content/docs/tools/meshing-submeshes/submeshes/index.md index 82fa0c9a9e5..b9116fca366 100644 --- a/web/content/docs/tools/meshing-submeshes/submeshes/index.md +++ b/web/content/docs/tools/meshing-submeshes/submeshes/index.md @@ -20,7 +20,7 @@ simulation. There are several possibilities to define a subdomain. One possibility is to use a geometry via a gli- or gml-file. Since the geometry often doesn't match exactly on the domain mesh, one has to specify a search radius to find nodes, elements, or faces in the neighborhood of the geometry. -It can be difficult to find an appropriate search readius for adaptive refined +It can be difficult to find an appropriate search radius for adaptive refined domain meshes. Finally, with the geometry and a suitable search radius the associated domain elements and domain nodes are searched for. Since this happens during the simulation, this approach is not very robust. @@ -28,7 +28,7 @@ during the simulation, this approach is not very robust. Another possibility, avoiding the search during the simulation and thus more robust, is to precompute the subdomains as meshes. These precomputed subdomains are now passed to the OGS-6 simulator in the same format as the bulk mesh, the -vtu format. The subdomains additionaly contain information to identify the +vtu format. The subdomains additionally contain information to identify the corresponding bulk mesh entities like nodes, elements and faces of elements. ### A simple example diff --git a/web/content/docs/tools/model-preparation/add-element-quality/index.md b/web/content/docs/tools/model-preparation/add-element-quality/index.md index 967b6058641..dca36b191e7 100644 --- a/web/content/docs/tools/model-preparation/add-element-quality/index.md +++ b/web/content/docs/tools/model-preparation/add-element-quality/index.md @@ -9,6 +9,6 @@ author = "Thomas Fischer" The command line tool `AddElementQuality` adds a data array to the given mesh that holds for each element a value for the quality. The quality value depends -on the choosen quality criterion. The available quality criteria are shown using +on the chosen quality criterion. The available quality criteria are shown using the help argument on the command line. The resulting data arrays can be used to draw histograms or can be visually analyzed in the OGS Data Explorer or Paraview. diff --git a/web/content/docs/tools/model-preparation/create-boundary-conditions-along-a-polyline/index.md b/web/content/docs/tools/model-preparation/create-boundary-conditions-along-a-polyline/index.md index 8e2dd1f807b..6cb2b1e4cda 100644 --- a/web/content/docs/tools/model-preparation/create-boundary-conditions-along-a-polyline/index.md +++ b/web/content/docs/tools/model-preparation/create-boundary-conditions-along-a-polyline/index.md @@ -12,7 +12,7 @@ author = "Thomas Fischer" The tool `CreateBoundaryConditionsAlongPolylines` searches for mesh nodes that are near to polylines and generates for each found node an OGS-5 boundary condition at a point. -The user has to provide the input mesh `mesh` and the geometry `geometry` that must contain at least one polyline. Possible input formats for the mesh are the legacy OGS-5 mesh format or the vtu format. The geometry can be provided in the legacy OGS-5 gli format as well as in the gml format. The user can specify an environment via a search radius around the polyline. For all nodes within this environment boundary conditions are generated. Furthermore the type of the process the boundary condition is belonging to should be given. At the moment there are boundary condition output for LIQUID_FLOW (primary variable PRESSURE1) and STEADY_STATE_DIFFUSION (primary variable HEAD) process avaible. +The user has to provide the input mesh `mesh` and the geometry `geometry` that must contain at least one polyline. Possible input formats for the mesh are the legacy OGS-5 mesh format or the vtu format. The geometry can be provided in the legacy OGS-5 gli format as well as in the gml format. The user can specify an environment via a search radius around the polyline. For all nodes within this environment boundary conditions are generated. Furthermore the type of the process the boundary condition is belonging to should be given. At the moment there are boundary condition output for LIQUID_FLOW (primary variable PRESSURE1) and STEADY_STATE_DIFFUSION (primary variable HEAD) process available. The tool will output a OGS-5 boundary condition file (.bc) and a geometry file (.gli) containing the points the boundary conditions refer to. The original geometry will not be altered. Additional, it is possible to write the geometry in the gml format by setting the switch `gml` to 1. diff --git a/web/content/docs/tools/workflows/create-a-simple-parallel-model/index.md b/web/content/docs/tools/workflows/create-a-simple-parallel-model/index.md index 2188413675d..ce24d8c79b4 100644 --- a/web/content/docs/tools/workflows/create-a-simple-parallel-model/index.md +++ b/web/content/docs/tools/workflows/create-a-simple-parallel-model/index.md @@ -34,7 +34,7 @@ So far, the parallel FEM scheme with PETSc cannot be used by the all processes In order to discretize the domain of a unit cube do `bin/generateStructuredMesh -o cube_1x1x1_hex_axbxc.vtu -e hex --lx 1 --ly 1 --lz 1 --nx a --ny b --nz c` -where `a`, `b`, and `c` should be choosen according to the needs. +where `a`, `b`, and `c` should be chosen according to the needs. | `a` | `b` | `c` | #cells in 10^6 | compute cores | success | | ---: | ---: | ---: | ---: | ---: | :---: | diff --git a/web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE.md b/web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE.md index f828482b3a9..722bffeea8c 100644 --- a/web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE.md +++ b/web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE.md @@ -14,7 +14,7 @@ weight = 1 Borehole heat exchangers (BHE) are widely applied in Ground Source Heat Pump (GSHP) systems to explore geothermal energy for building heating and cooling purposes. There are more and more engineerings starting to use simulation tools for the performance evaluation and design of GSHP projects.\ For OGS-6, it allows the users to simulate the subsurface and soil temperature evolution induced by BHE and operation performance of BHE coupled heat pump. -## Mathmatical framework +## Mathematical framework This part aims to give an explanation of the mathematical framework in configuring the Heat_Transport_BHE process provided in OpenGeoSys. The numerical method implemented in OGS-6 is the so-called double-continuum finite element method (`DC-FEM`). This approach was originally proposed by Al-Khoury et al. (2010) and extendend by Diersch et al. (2011a; 2011b). It was then implemented in OpenGeoSys by Shao et al. (2016). This modelling appraoch has the following assumptions. @@ -52,7 +52,7 @@ In the configuration of `Heat_Transport_BHE` process, it is generally configured ### < borehole > -The borehole < length > and < diameter > are difined here. The unit of these parameters are in $\mathrm{m}$. Here is an example of a borehole with 18 m in length and 0.13 m in diameter. +The borehole < length > and < diameter > are defined here. The unit of these parameters are in $\mathrm{m}$. Here is an example of a borehole with 18 m in length and 0.13 m in diameter. ```bash <borehole> @@ -142,7 +142,7 @@ Here is an example using `TemperatureCurveConstantFlow`. ``` For 2U-type BHE configuration, the flow rate in < flow_and_temperature_control > indicates the flow rate within each U-pipe. -When a fixed power or power curve is imposed on a 2U-type BHE, the given value in < flow_and_temperature_control > or in the related power curve should be speficed with half of the user's presumed entire borehole exchanger power. +When a fixed power or power curve is imposed on a 2U-type BHE, the given value in < flow_and_temperature_control > or in the related power curve should be specified with half of the user's presumed entire borehole exchanger power. ### < grout > The thermal properties of the grout material is defined here. @@ -171,7 +171,7 @@ The thermal properties of the circulating fluid is defined here. The parameters * /viscosity/: dynamic viscosity of circulating media which has the unit of $\mathrm{kg·m^{-1} s^{-1}}$; * /specific_heat_capacity/: specific heat capacity of circulating fluid, which has the unit of $\mathrm{J·kg^{-1} K^{-1}}$; * /thermal_conductivity/: thermal conductivity of the circulating fluid, which has the unit of $\mathrm{W·m^{-1} K^{-1}}$; -* /reference_temperature/: When the < flow_and_temperature_control > was not set to TemperatureCurveConstantFlow, OGS needs to have an initial outlet temperature value in the first time step to start the simulation. A reference temperature has to be defined for the calcualtion of initial inflow temperature. The unit of refenrence temperature is in $^{\circ}$C. +* /reference_temperature/: When the < flow_and_temperature_control > was not set to TemperatureCurveConstantFlow, OGS needs to have an initial outlet temperature value in the first time step to start the simulation. A reference temperature has to be defined for the calculation of initial inflow temperature. The unit of refenrence temperature is in $^{\circ}$C. Here is an example in which the circulating fluid is water at about 15 $^{\circ}$C. diff --git a/web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE_PipelineNetwork.md b/web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE_PipelineNetwork.md index e5f0db49c2e..b14c6262105 100644 --- a/web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE_PipelineNetwork.md +++ b/web/content/docs/userguide/process-dependent-configuration/Heat_Transport_BHE_PipelineNetwork.md @@ -23,7 +23,7 @@ This short tutorial aims to give the user a guide to the PipeNetwork feature. It ## Requirements on the computer -In order to use the PipeNetwork feature, the computer running the `Heat_Transport_BHE` process of OpenGeoSys is required to have a Python 3 environment with the TESPy program installed. For the Python 3 environmental installation, there are various tutorial availabe on the Internet. For the TESPy package, one can install it with the following command line in the Python3 environment: +In order to use the PipeNetwork feature, the computer running the `Heat_Transport_BHE` process of OpenGeoSys is required to have a Python 3 environment with the TESPy program installed. For the Python 3 environmental installation, there are various tutorial available on the Internet. For the TESPy package, one can install it with the following command line in the Python3 environment: ```bash pip3 install tespy @@ -31,7 +31,7 @@ pip3 install tespy ## Creating a pipeline network model with the software TESPy -Thermal Engineering Systems in Python (software paper: <https://doi.org/10.21105/joss.02178>, software archive: <https://doi.org/10.5281/zenodo.2555866>) is a software package developed by Francesco Witte. It is capable of simulating coupled thermal-hydraulic status of working fluids in thermal engineering applications. Such systm typically involves a cirulation network that is composed of pre-defined components including pipes, heat exchangers and different types of turbo machinery. Interested readers may refer to the online documentation (<https://tespy.readthedocs.io/en/master/index.html>) of TESPy for more detailed introduction of the software. The workflow in this part is built based on the benchmark example "A 3-BHE Array Coupled With Pipe Network" from the OpenGeoSys Documentation (<https://www.opengeosys.org/docs/benchmarks/heat-transport-bhe/3d_3bhes_array/>). One can refer to this benchmark and download its latest benchmark files from GitHub (<https://www.opengeosys.org/docs/userguide/basics/introduction/>) for creating the pipeline network TESPy model. The OpenGeoSys and TESPy version used for this tutorial is (OpenGeoSys 6.2.2) and 0.3.3 accordingly. +Thermal Engineering Systems in Python (software paper: <https://doi.org/10.21105/joss.02178>, software archive: <https://doi.org/10.5281/zenodo.2555866>) is a software package developed by Francesco Witte. It is capable of simulating coupled thermal-hydraulic status of working fluids in thermal engineering applications. Such system typically involves a cirulation network that is composed of pre-defined components including pipes, heat exchangers and different types of turbo machinery. Interested readers may refer to the online documentation (<https://tespy.readthedocs.io/en/master/index.html>) of TESPy for more detailed introduction of the software. The workflow in this part is built based on the benchmark example "A 3-BHE Array Coupled With Pipe Network" from the OpenGeoSys Documentation (<https://www.opengeosys.org/docs/benchmarks/heat-transport-bhe/3d_3bhes_array/>). One can refer to this benchmark and download its latest benchmark files from GitHub (<https://www.opengeosys.org/docs/userguide/basics/introduction/>) for creating the pipeline network TESPy model. The OpenGeoSys and TESPy version used for this tutorial is (OpenGeoSys 6.2.2) and 0.3.3 accordingly. The coupled model that is going to be built is demonstrated in Figure 1. It consists of a pipeline network connected with 3 BHEs, a water pump, a virtual heat pump as the consumer, a splitter to split up the feeding fluid flow and a merge to returned flow. These devices are all defined as `components` in TESPy. A full list of available components can be found in the TESPy components module. In the pipeline network, these components are connected with each other through `connections` parts, which are illustrated by the black lines in the figure. With these two main parts, a completely TESPy pipeline network model can be set up. @@ -173,7 +173,7 @@ btes.save('tespy_nw') ## Connecting the TESPy model with the OGS model -The work flow of the PipeNetwork feature is illustrated in Figure 2. To explicitly simulate both the BHE and the pipe network, OGS is coupled with the TESPy through a Python interface. Within every time step and each iteration, the outflow temperature `Tout` from each BHE is computed by OGS and transferred to TESPy via the interface. Then TESPy will use these `Tout` temperature and the current hydraulic state as the boundary condition imposed on the pipeline network to calculate the current inflow temperature `Tin` of each BHE and the currently flow rate, which satisfies the overall thermal load of the building. After the calcualtion, all data will be transferred back to OGS and update the inlet temperature and flow rate of each BHE for the next iteration. The convergence is set to be satisfied when the difference from the last two iteration results is smaller than a preset tolerance value. Additionally, OGS will transfer the currently time step 't' to TESPy within each iteration, which makes TESPy able to adjust its time dependent network boundary conditions according to the user's configuration. +The work flow of the PipeNetwork feature is illustrated in Figure 2. To explicitly simulate both the BHE and the pipe network, OGS is coupled with the TESPy through a Python interface. Within every time step and each iteration, the outflow temperature `Tout` from each BHE is computed by OGS and transferred to TESPy via the interface. Then TESPy will use these `Tout` temperature and the current hydraulic state as the boundary condition imposed on the pipeline network to calculate the current inflow temperature `Tin` of each BHE and the currently flow rate, which satisfies the overall thermal load of the building. After the calculation, all data will be transferred back to OGS and update the inlet temperature and flow rate of each BHE for the next iteration. The convergence is set to be satisfied when the difference from the last two iteration results is smaller than a preset tolerance value. Additionally, OGS will transfer the currently time step 't' to TESPy within each iteration, which makes TESPy able to adjust its time dependent network boundary conditions according to the user's configuration. {{< img src="../BHE_PipeNetwork_feature_workflow.png" width="100">}} diff --git a/web/content/releases/6.2.0.md b/web/content/releases/6.2.0.md index 85df62355db..108cde4f6c2 100644 --- a/web/content/releases/6.2.0.md +++ b/web/content/releases/6.2.0.md @@ -136,7 +136,7 @@ The following notable changes and new features were implemented between OpenGeoS ### New tools -- `TecPlotTools`: splitting files containing multiple zones into seperate +- `TecPlotTools`: splitting files containing multiple zones into separate TecPlot files. [#2114](https://github.com/ufz/ogs/pull/2114) - `TecPlot-Reader`: converting TecPlot rasters into OGS meshes (one file per zone, containing all variables as scalar arrays). [#2114](https://github.com/ufz/ogs/pull/2114) diff --git a/web/content/releases/6.2.1.md b/web/content/releases/6.2.1.md index aabbba9ca3c..fdfa86d79f3 100644 --- a/web/content/releases/6.2.1.md +++ b/web/content/releases/6.2.1.md @@ -109,7 +109,7 @@ note = """ ### CMake options changes -- Bumbed miniumum CMake version to 3.12, [#2597](https://github.com/ufz/ogs/pull/2597) +- Bumped minimum CMake version to 3.12, [#2597](https://github.com/ufz/ogs/pull/2597) - Added option `OGS_CONAN_BUILD_TYPE` to overwrite Conan build type, [#2577](https://github.com/ufz/ogs/pull/2577) ### Web / Docs diff --git a/web/content/releases/6.2.2.md b/web/content/releases/6.2.2.md index da9fba0829f..03e5e245355 100644 --- a/web/content/releases/6.2.2.md +++ b/web/content/releases/6.2.2.md @@ -72,7 +72,7 @@ note = """ ### New tools - command line utility to interpolate equidistant raster files between two boundary rasters (for vertical refinement of subsurface layers). [#2621](https://github.com/ufz/ogs/pull/2621) - command line utility to convert 2D meshes into ESRI shape files. [#2627](https://github.com/ufz/ogs/pull/2627) -- command line utility to conver netCDF-files into OGS meshes. [#2654](https://github.com/ufz/ogs/pull/2654) +- command line utility to convert netCDF-files into OGS meshes. [#2654](https://github.com/ufz/ogs/pull/2654) - command line utility for for 3D mesh to grid conversion. [#2704](https://github.com/ufz/ogs/pull/2704) ### Other notable code changes -- GitLab