From 5d0c291d9538314a24bd3d6f95bb264c8642abaf Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <github@naumov.de>
Date: Sun, 4 Apr 2021 11:13:54 +0200
Subject: [PATCH] Format multiline strings.
Adding a single space in incorrectly broken lines.
---
Applications/ApplicationsLib/ProjectData.cpp | 19 +++++------
.../ApplicationsLib/TestDefinition.cpp | 3 +-
Applications/CLI/ogs.cpp | 16 ++++-----
.../Utils/FileConverter/NetCdfConverter.cpp | 3 +-
.../Utils/GeoTools/TriangulatePolyline.cpp | 4 +--
...CreateBoundaryConditionsAlongPolylines.cpp | 8 ++---
.../MeshEdit/MapGeometryToMeshSurface.cpp | 2 +-
.../ResetPropertiesInPolygonalRegion.cpp | 4 +--
.../Utils/MeshEdit/removeMeshElements.cpp | 4 +--
.../Utils/MeshEdit/swapNodeCoordinateAxes.cpp | 4 +--
.../IntegrateBoreholesIntoMesh.cpp | 5 ++-
.../MeshGeoTools/VerticalSliceFromLayers.cpp | 3 +-
...computeSurfaceNodeIDsInPolygonalRegion.cpp | 4 +--
.../PartitionMesh/NodeWiseMeshPartitioner.cpp | 8 ++---
.../PartitionMesh/PartitionMesh.cpp | 20 +++++------
.../ModelPreparation/createNeumannBc.cpp | 33 +++++++++----------
BaseLib/StringTools.cpp | 4 +--
ChemistryLib/PhreeqcIO.cpp | 7 ++--
.../CreateInitialAqueousSolution.cpp | 3 +-
GeoLib/AnalyticalGeometry.cpp | 4 +--
.../IO/XmlIO/Boost/BoostXmlGmlInterface.cpp | 19 +++++------
GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp | 8 ++---
GeoLib/SurfaceGrid.cpp | 3 +-
.../CreateMaterialSpatialDistributionMap.cpp | 8 ++---
.../MPL/Properties/AverageMolarMass.cpp | 4 +--
...pillaryPressureRegularizedVanGenuchten.cpp | 7 ++--
.../CapillaryPressureVanGenuchten.cpp | 31 +++++++++--------
.../SaturationLiakopoulos.cpp | 8 ++---
.../SaturationVanGenuchten.cpp | 4 +--
.../MPL/Properties/ClausiusClapeyron.cpp | 4 +--
.../CreateEmbeddedFracturePermeability.cpp | 4 +--
...CreateGasPressureDependentPermeability.cpp | 4 +--
.../CreateStrainDependentPermeability.cpp | 4 +--
.../Enthalpy/LinearWaterVapourLatentHeat.cpp | 4 +--
.../GasPressureDependentPermeability.cpp | 4 +--
MaterialLib/MPL/Properties/IdealGasLaw.cpp | 8 ++---
.../PermeabilityOrthotropicPowerLaw.cpp | 8 ++---
...lPermNonWettingPhaseVanGenuchtenMualem.cpp | 5 ++-
.../RelPermUdellNonwettingPhase.cpp | 4 +--
.../SaturationDependentHeatConduction.cpp | 3 +-
.../SaturationDependentSwelling.cpp | 8 ++---
.../StrainDependentPermeability.cpp | 3 +-
.../SoilThermalConductivitySomerton.cpp | 14 ++++----
.../VapourDiffusion/VapourDiffusionFEBEX.cpp | 4 +--
.../Utils/CheckVanGenuchtenExponentRange.cpp | 4 +--
...FormKelvinVectorFromThermalExpansivity.cpp | 6 ++--
.../CreatePorousMediaProperties.cpp | 6 ++--
.../CreateCapillaryPressureModel.cpp | 4 +--
.../PiecewiseLinearInterpolation.cpp | 4 +--
MeshLib/MeshEditing/AddLayerToMesh.cpp | 4 +--
.../MeshEditing/ElementValueModification.cpp | 6 ++--
.../Mesh2MeshPropertyInterpolation.cpp | 4 +--
MeshLib/MeshSurfaceExtraction.cpp | 4 +--
NumLib/DOF/MeshComponentMap.cpp | 8 ++---
.../LocalLinearLeastSquaresExtrapolator.cpp | 4 +--
...nvergenceCriterionPerComponentResidual.cpp | 3 +-
NumLib/ODESolver/NonlinearSolver.cpp | 3 +-
ParameterLib/CoordinateSystem.cpp | 9 +++--
...tiveFreeComponentFlowBoundaryCondition.cpp | 3 +-
.../Python/PythonBoundaryCondition.cpp | 9 +++--
...ionDependentDirichletBoundaryCondition.cpp | 3 +-
...iableDependentNeumannBoundaryCondition.cpp | 4 +--
ProcessLib/CreateDeactivatedSubdomain.cpp | 8 ++---
ProcessLib/CreateProcessData.cpp | 8 ++---
ProcessLib/HT/HTProcess.cpp | 4 +--
.../CreateHeatTransportBHEProcess.cpp | 6 ++--
.../HeatTransportBHEProcess.cpp | 8 ++---
.../HydroMechanics/HydroMechanicsProcess.cpp | 4 +--
.../CreateHydroMechanicsProcess.cpp | 7 ++--
.../HydroMechanics/HydroMechanicsProcess.cpp | 3 +-
.../CreateSmallDeformationProcess.cpp | 3 +-
.../SmallDeformationProcess.cpp | 3 +-
ProcessLib/LocalAssemblerInterface.cpp | 3 +-
ProcessLib/Output/CreateOutput.cpp | 4 +--
ProcessLib/Output/IntegrationPointWriter.cpp | 6 ++--
ProcessLib/Output/Output.cpp | 8 ++---
ProcessLib/Output/ProcessOutput.cpp | 7 ++--
.../PhaseField/CreatePhaseFieldProcess.cpp | 7 ++--
.../SmallDeformationNonlocalProcess.cpp | 3 +-
ProcessLib/SourceTerms/CreateSourceTerm.cpp | 7 ++--
.../Python/CreatePythonSourceTerm.cpp | 3 +-
.../ThermoHydroMechanicsProcess.cpp | 4 +--
...reateThermoMechanicalPhaseFieldProcess.cpp | 6 ++--
.../ThermoMechanicalPhaseFieldProcess.cpp | 15 +++------
.../ThermoRichardsMechanicsProcess.cpp | 13 +++-----
ProcessLib/TimeLoop.cpp | 14 ++++----
Tests/BaseLib/TestgetParenthesizedString.cpp | 4 +--
...TestMPLSoilThermalConductivitySomerton.cpp | 28 ++++++++--------
.../MaterialLib/TestMPLWaterVapourDensity.cpp | 4 +--
.../TestMPLWaterVapourLatentHeat.cpp | 4 +--
Tests/ParameterLib/Parameter.cpp | 3 +-
91 files changed, 281 insertions(+), 335 deletions(-)
diff --git a/Applications/ApplicationsLib/ProjectData.cpp b/Applications/ApplicationsLib/ProjectData.cpp
index c0c51678af7..a66c1b0db6b 100644
--- a/Applications/ApplicationsLib/ProjectData.cpp
+++ b/Applications/ApplicationsLib/ProjectData.cpp
@@ -489,9 +489,8 @@ void ProjectData::parseMedia(
{
OGS_FATAL(
"Multiple media were specified for the same material id "
- "'{:d}'. "
- "Keep in mind, that if no material id is specified, it is "
- "assumed to be 0 by default.",
+ "'{:d}'. Keep in mind, that if no material id is "
+ "specified, it is assumed to be 0 by default.",
id);
}
@@ -537,8 +536,8 @@ ProjectData::parseChemicalSolverInterface(
if (boost::iequals(chemical_solver, "Phreeqc"))
{
INFO(
- "Configuring phreeqc interface for water chemistry "
- "calculation using file-based approach.");
+ "Configuring phreeqc interface for water chemistry calculation "
+ "using file-based approach.");
chemical_solver_interface = ChemistryLib::createChemicalSolverInterface<
ChemistryLib::ChemicalSolver::Phreeqc>(_mesh_vec, *config,
@@ -547,9 +546,9 @@ ProjectData::parseChemicalSolverInterface(
else if (boost::iequals(chemical_solver, "PhreeqcKernel"))
{
OGS_FATAL(
- "The chemical solver option of PhreeqcKernel is not accessible "
- "for the time being. Please set 'Phreeqc'' as the chemical "
- "solver for reactive transport modeling.");
+ "The chemical solver option of PhreeqcKernel is not accessible for "
+ "the time being. Please set 'Phreeqc'' as the chemical solver for "
+ "reactive transport modeling.");
}
else
{
@@ -809,8 +808,8 @@ void ProjectData::parseProcesses(
break;
default:
OGS_FATAL(
- "SMALL_DEFORMATION process does not support "
- "given dimension");
+ "SMALL_DEFORMATION process does not support given "
+ "dimension");
}
}
else
diff --git a/Applications/ApplicationsLib/TestDefinition.cpp b/Applications/ApplicationsLib/TestDefinition.cpp
index 3fb1a415682..d2713d4c7c1 100644
--- a/Applications/ApplicationsLib/TestDefinition.cpp
+++ b/Applications/ApplicationsLib/TestDefinition.cpp
@@ -115,8 +115,7 @@ std::string findVtkdiff()
}
WARN(
"Calling {:s} from the VTKDIFF_EXE environment variable didn't "
- "work "
- "as expected. Return value was {:d}.",
+ "work as expected. Return value was {:d}.",
vtkdiff_exe, return_value);
}
diff --git a/Applications/CLI/ogs.cpp b/Applications/CLI/ogs.cpp
index acb119cc144..d2b52a3c68a 100644
--- a/Applications/CLI/ogs.cpp
+++ b/Applications/CLI/ogs.cpp
@@ -83,17 +83,17 @@ int main(int argc, char* argv[])
false, "", "PATH");
cmd.add(outdir_arg);
- TCLAP::ValueArg<std::string> log_level_arg("l", "log-level",
- "the verbosity of logging "
- "messages: none, error, warn, "
- "info, debug, all",
- false,
+ TCLAP::ValueArg<std::string> log_level_arg(
+ "l", "log-level",
+ "the verbosity of logging messages: none, error, warn, info, debug, "
+ "all",
+ false,
#ifdef NDEBUG
- "info",
+ "info",
#else
- "all",
+ "all",
#endif
- "LOG_LEVEL");
+ "LOG_LEVEL");
cmd.add(log_level_arg);
TCLAP::SwitchArg nonfatal_arg("",
diff --git a/Applications/Utils/FileConverter/NetCdfConverter.cpp b/Applications/Utils/FileConverter/NetCdfConverter.cpp
index e95e63ed6bd..b199acb1e34 100644
--- a/Applications/Utils/FileConverter/NetCdfConverter.cpp
+++ b/Applications/Utils/FileConverter/NetCdfConverter.cpp
@@ -705,8 +705,7 @@ int main(int argc, char* argv[])
TCLAP::ValueArg<std::size_t> arg_dim2(
"", "dim2",
- "index of second dimension (y/latitude) for the selected "
- "variable",
+ "index of second dimension (y/latitude) for the selected variable",
false, 0, &allowed_dim_vals);
cmd.add(arg_dim2);
diff --git a/Applications/Utils/GeoTools/TriangulatePolyline.cpp b/Applications/Utils/GeoTools/TriangulatePolyline.cpp
index 171c000b3a1..191f0cb5520 100644
--- a/Applications/Utils/GeoTools/TriangulatePolyline.cpp
+++ b/Applications/Utils/GeoTools/TriangulatePolyline.cpp
@@ -127,9 +127,7 @@ int main(int argc, char* argv[])
}
else
{
- WARN(
- "\t Creating a surface by triangulation of the polyline "
- "failed.");
+ WARN("\t Creating a surface by triangulation of the polyline failed.");
}
GeoLib::SurfaceVec* sfc_vec(geo_objects.getSurfaceVecObj(geo_name));
std::size_t const sfc_id = geo_objects.getSurfaceVec(geo_name)->size() - 1;
diff --git a/Applications/Utils/MeshEdit/CreateBoundaryConditionsAlongPolylines.cpp b/Applications/Utils/MeshEdit/CreateBoundaryConditionsAlongPolylines.cpp
index b28ad4d93ca..c06b2988684 100644
--- a/Applications/Utils/MeshEdit/CreateBoundaryConditionsAlongPolylines.cpp
+++ b/Applications/Utils/MeshEdit/CreateBoundaryConditionsAlongPolylines.cpp
@@ -140,16 +140,16 @@ int main(int argc, char* argv[])
TCLAP::ValueArg<std::string> output_base_fname(
"o", "output-base-file-name",
- "the base name of the file the output (geometry (gli) and boundary"
+ "the base name of the file the output (geometry (gli) and boundary "
"condition (bc)) will be written to",
true, "", "file name");
cmd.add(output_base_fname);
TCLAP::ValueArg<std::string> bc_type(
"t", "type",
- "the process type the boundary condition will be written for "
- "currently LIQUID_FLOW (primary variable PRESSURE1) and "
- "GROUNDWATER_FLOW (primary variable HEAD, default) are supported",
+ "the process type the boundary condition will be written for currently "
+ "LIQUID_FLOW (primary variable PRESSURE1) and GROUNDWATER_FLOW "
+ "(primary variable HEAD, default) are supported",
true, "",
"process type as string (LIQUID_FLOW or GROUNDWATER_FLOW (default))");
cmd.add(bc_type);
diff --git a/Applications/Utils/MeshEdit/MapGeometryToMeshSurface.cpp b/Applications/Utils/MeshEdit/MapGeometryToMeshSurface.cpp
index 6a3dc18ee2a..6c0506a48be 100644
--- a/Applications/Utils/MeshEdit/MapGeometryToMeshSurface.cpp
+++ b/Applications/Utils/MeshEdit/MapGeometryToMeshSurface.cpp
@@ -24,7 +24,7 @@
int main(int argc, char* argv[])
{
TCLAP::CmdLine cmd(
- "Maps geometric objects to the surface of a given mesh."
+ "Maps geometric objects to the surface of a given mesh. "
"The documentation is available at "
"https://docs.opengeosys.org/docs/tools/model-preparation/"
"map-geometric-object-to-the-surface-of-a-mesh.\n\n"
diff --git a/Applications/Utils/MeshEdit/ResetPropertiesInPolygonalRegion.cpp b/Applications/Utils/MeshEdit/ResetPropertiesInPolygonalRegion.cpp
index 75159e58d94..6bed6f4e44f 100644
--- a/Applications/Utils/MeshEdit/ResetPropertiesInPolygonalRegion.cpp
+++ b/Applications/Utils/MeshEdit/ResetPropertiesInPolygonalRegion.cpp
@@ -51,8 +51,8 @@ int main(int argc, char* argv[])
cmd.add(polygon_name_arg);
TCLAP::ValueArg<std::string> geometry_fname(
"g", "geometry",
- "the name of "
- "the file containing the input geometry (gli or gml format)",
+ "the name of the file containing the input geometry (gli or gml "
+ "format)",
true, "", "file name");
cmd.add(geometry_fname);
TCLAP::ValueArg<char> char_property_arg(
diff --git a/Applications/Utils/MeshEdit/removeMeshElements.cpp b/Applications/Utils/MeshEdit/removeMeshElements.cpp
index d9fa6d42a72..2ed89a584bf 100644
--- a/Applications/Utils/MeshEdit/removeMeshElements.cpp
+++ b/Applications/Utils/MeshEdit/removeMeshElements.cpp
@@ -210,8 +210,8 @@ int main(int argc, char* argv[])
!((min_property_arg.isSet() && max_property_arg.isSet()) ||
property_arg.isSet()))
{
- ERR("Specify a value or range ('-min-value' and '-max_value') "
- "for the property selected.");
+ ERR("Specify a value or range ('-min-value' and '-max_value') for "
+ "the property selected.");
return EXIT_FAILURE;
}
diff --git a/Applications/Utils/MeshEdit/swapNodeCoordinateAxes.cpp b/Applications/Utils/MeshEdit/swapNodeCoordinateAxes.cpp
index f049b526f60..0b3e741251c 100644
--- a/Applications/Utils/MeshEdit/swapNodeCoordinateAxes.cpp
+++ b/Applications/Utils/MeshEdit/swapNodeCoordinateAxes.cpp
@@ -104,8 +104,8 @@ int main(int argc, char* argv[])
cmd.add(output_arg);
TCLAP::ValueArg<std::string> new_order_arg(
"n", "new-order",
- "the new order of swapped coordinate values "
- "(e.g. 'xzy' for converting XYZ values to XZY values)",
+ "the new order of swapped coordinate values (e.g. 'xzy' for converting "
+ "XYZ values to XZY values)",
true, "", "string");
cmd.add(new_order_arg);
cmd.parse(argc, argv);
diff --git a/Applications/Utils/MeshGeoTools/IntegrateBoreholesIntoMesh.cpp b/Applications/Utils/MeshGeoTools/IntegrateBoreholesIntoMesh.cpp
index ebfd1124b64..460ff05dfb6 100644
--- a/Applications/Utils/MeshGeoTools/IntegrateBoreholesIntoMesh.cpp
+++ b/Applications/Utils/MeshGeoTools/IntegrateBoreholesIntoMesh.cpp
@@ -78,9 +78,8 @@ 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 matching any mesh nodes or located "
- "outside "
- "the mesh are ignored.\n\n"
+ "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 +
".\n"
diff --git a/Applications/Utils/MeshGeoTools/VerticalSliceFromLayers.cpp b/Applications/Utils/MeshGeoTools/VerticalSliceFromLayers.cpp
index f388c91aa79..6d6a07f80b5 100644
--- a/Applications/Utils/MeshGeoTools/VerticalSliceFromLayers.cpp
+++ b/Applications/Utils/MeshGeoTools/VerticalSliceFromLayers.cpp
@@ -238,8 +238,7 @@ MeshLib::Mesh* generateMesh(GeoLib::GEOObjects& geo,
int const return_value = std::system(gmsh_command.c_str());
if (return_value != 0)
{
- ERR("Execution of gmsh command returned non-zero "
- "status, %d",
+ ERR("Execution of gmsh command returned non-zero status, %d",
return_value);
}
return FileIO::GMSH::readGMSHMesh(gmsh_mesh_name);
diff --git a/Applications/Utils/MeshGeoTools/computeSurfaceNodeIDsInPolygonalRegion.cpp b/Applications/Utils/MeshGeoTools/computeSurfaceNodeIDsInPolygonalRegion.cpp
index f86893798f9..a0e61a2d1c8 100644
--- a/Applications/Utils/MeshGeoTools/computeSurfaceNodeIDsInPolygonalRegion.cpp
+++ b/Applications/Utils/MeshGeoTools/computeSurfaceNodeIDsInPolygonalRegion.cpp
@@ -170,8 +170,8 @@ 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. Writing to"
- " files '{:s}' and '{:s}'.",
+ "Polygonal part of surface '{:s}' contains %{ul} nodes. Writing to "
+ "files '{:s}' and '{:s}'.",
polygon_name,
ids_and_areas.size(),
id_and_area_fname,
diff --git a/Applications/Utils/ModelPreparation/PartitionMesh/NodeWiseMeshPartitioner.cpp b/Applications/Utils/ModelPreparation/PartitionMesh/NodeWiseMeshPartitioner.cpp
index bcb9afd8096..74fa6e95051 100644
--- a/Applications/Utils/ModelPreparation/PartitionMesh/NodeWiseMeshPartitioner.cpp
+++ b/Applications/Utils/ModelPreparation/PartitionMesh/NodeWiseMeshPartitioner.cpp
@@ -414,8 +414,8 @@ bool copyPropertyVector(
*partitioned_pv);
}
OGS_FATAL(
- "Copying of property vector values for mesh item type {:s} is "
- "not implemented.",
+ "Copying of property vector values for mesh item type {:s} is not "
+ "implemented.",
item_type);
};
@@ -506,8 +506,8 @@ MeshLib::Properties partitionProperties(
{MeshItemType::Node, count_tuples(MeshItemType::Node)}};
DBUG(
- "total number of tuples after partitioning defined for cells is"
- " {:d} and for nodes {:d}.",
+ "total number of tuples after partitioning defined for cells is {:d} "
+ "and for nodes {:d}.",
total_number_of_tuples.at(MeshItemType::Cell),
total_number_of_tuples.at(MeshItemType::Node));
diff --git a/Applications/Utils/ModelPreparation/PartitionMesh/PartitionMesh.cpp b/Applications/Utils/ModelPreparation/PartitionMesh/PartitionMesh.cpp
index 5ede41a5158..00b46c06901 100644
--- a/Applications/Utils/ModelPreparation/PartitionMesh/PartitionMesh.cpp
+++ b/Applications/Utils/ModelPreparation/PartitionMesh/PartitionMesh.cpp
@@ -51,8 +51,8 @@ int main(int argc, char* argv[])
TCLAP::ValueArg<std::string> metis_mesh_input(
"x", "metis-mesh-input-file",
- "base name (without .mesh extension) of the file containing the "
- "metis input mesh",
+ "base name (without .mesh extension) of the file containing the metis "
+ "input mesh",
false, "",
"base name (without .mesh extension) of the file containing the metis "
"input mesh");
@@ -81,17 +81,17 @@ int main(int argc, char* argv[])
"q", "lh_elements", "Mixed linear and high order elements.", false);
cmd.add(lh_elems_flag);
- TCLAP::ValueArg<std::string> log_level_arg("l", "log-level",
- "the verbosity of logging "
- "messages: none, error, warn, "
- "info, debug, all",
- false,
+ TCLAP::ValueArg<std::string> log_level_arg(
+ "l", "log-level",
+ "the verbosity of logging messages: none, error, warn, info, debug, "
+ "all",
+ false,
#ifdef NDEBUG
- "info",
+ "info",
#else
- "all",
+ "all",
#endif
- "LOG_LEVEL");
+ "LOG_LEVEL");
cmd.add(log_level_arg);
// All the remaining arguments are used as file names for boundary/subdomain
diff --git a/Applications/Utils/ModelPreparation/createNeumannBc.cpp b/Applications/Utils/ModelPreparation/createNeumannBc.cpp
index 596bfb34e57..9e5ab188c8b 100644
--- a/Applications/Utils/ModelPreparation/createNeumannBc.cpp
+++ b/Applications/Utils/ModelPreparation/createNeumannBc.cpp
@@ -40,8 +40,7 @@ std::vector<double> getSurfaceIntegratedValuesForNodes(
if (!mesh.getProperties().existsPropertyVector<double>(prop_name))
{
- ERR("Need element property, but the property '{:s}' is not "
- "available.",
+ ERR("Need element property, but the property '{:s}' is not available.",
prop_name);
return std::vector<double>();
}
@@ -77,9 +76,9 @@ int main(int argc, char* argv[])
TCLAP::CmdLine cmd(
"Integrates the given element property and outputs an OGS-5 direct "
"Neumann boundary condition. The mesh has to contain a property "
- "'bulk_node_ids' that stores the original subsurface "
- "mesh node ids. Such surface meshes can be created using the OGS-6 "
- "tool ExtractSurface.\n\n"
+ "'bulk_node_ids' that stores the original subsurface mesh node ids. "
+ "Such surface meshes can be created using the OGS-6 tool "
+ "ExtractSurface.\n\n"
"OpenGeoSys-6 software, version " +
GitInfoLib::GitInfo::ogs_version +
".\n"
@@ -87,21 +86,21 @@ int main(int argc, char* argv[])
"(http://www.opengeosys.org)",
' ', GitInfoLib::GitInfo::ogs_version);
- TCLAP::ValueArg<std::string> in_mesh("i",
- "in-mesh",
- "the surface mesh that has an element "
- "property for the Neumann "
- "boundary condition",
- true,
- "",
- "filename for surface mesh input");
+ TCLAP::ValueArg<std::string> in_mesh(
+ "i",
+ "in-mesh",
+ "the surface mesh that has an element property for the Neumann "
+ "boundary condition",
+ true,
+ "",
+ "filename for surface mesh input");
cmd.add(in_mesh);
TCLAP::ValueArg<std::string> property_in_arg(
"p",
"property-in-name",
- "name of an element property used for the computation of the "
- "Neumann boundary condition",
+ "name of an element property used for the computation of the Neumann "
+ "boundary condition",
true,
"",
"string (property name)");
@@ -110,8 +109,8 @@ int main(int argc, char* argv[])
TCLAP::ValueArg<std::string> property_out_arg(
"",
"property-out-name",
- "name of the node based property used for the output of the "
- "Neumann boundary condition",
+ "name of the node based property used for the output of the Neumann "
+ "boundary condition",
true,
"",
"string (property name)");
diff --git a/BaseLib/StringTools.cpp b/BaseLib/StringTools.cpp
index dd7ef12887a..b8f4ed5ae2b 100644
--- a/BaseLib/StringTools.cpp
+++ b/BaseLib/StringTools.cpp
@@ -102,9 +102,7 @@ std::string format(const char* format_str, ...)
std::string randomString(std::size_t const length)
{
static constexpr char charset[] =
- "0123456789"
- "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
- "abcdefghijklmnopqrstuvwxyz";
+ "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
static const auto seed = static_cast<std::mt19937::result_type>(
std::chrono::system_clock::now().time_since_epoch().count());
diff --git a/ChemistryLib/PhreeqcIO.cpp b/ChemistryLib/PhreeqcIO.cpp
index ff46aeec8cb..7bd943b1ec8 100644
--- a/ChemistryLib/PhreeqcIO.cpp
+++ b/ChemistryLib/PhreeqcIO.cpp
@@ -516,8 +516,7 @@ std::istream& operator>>(std::istream& in, PhreeqcIO& phreeqc_io)
{
OGS_FATAL(
"Error when reading calculation result of Solution {:d} "
- "after "
- "the reaction.",
+ "after the reaction.",
chemical_system_id);
}
@@ -540,8 +539,8 @@ std::istream& operator>>(std::istream& in, PhreeqcIO& phreeqc_io)
catch (const std::invalid_argument& e)
{
OGS_FATAL(
- "Invalid argument. Could not convert string '{:s}' "
- "to double for chemical system {:d}, column {:d}. "
+ "Invalid argument. Could not convert string '{:s}' to "
+ "double for chemical system {:d}, column {:d}. "
"Exception '{:s}' was thrown.",
items[item_id], chemical_system_id + 1, item_id,
e.what());
diff --git a/ChemistryLib/PhreeqcKernelData/CreateInitialAqueousSolution.cpp b/ChemistryLib/PhreeqcKernelData/CreateInitialAqueousSolution.cpp
index deef103cbc2..f5c54b4ac51 100644
--- a/ChemistryLib/PhreeqcKernelData/CreateInitialAqueousSolution.cpp
+++ b/ChemistryLib/PhreeqcKernelData/CreateInitialAqueousSolution.cpp
@@ -52,8 +52,7 @@ InitialAqueousSolution createInitialAqueousSolution(
{
OGS_FATAL(
"Component {:s} given in <solution>/<components> is not found "
- "in "
- "specified coupled processes (see "
+ "in specified coupled processes (see "
"<process>/<process_variables>/<concentration>).",
component.first);
}
diff --git a/GeoLib/AnalyticalGeometry.cpp b/GeoLib/AnalyticalGeometry.cpp
index 3bcab2ef272..011835cc159 100644
--- a/GeoLib/AnalyticalGeometry.cpp
+++ b/GeoLib/AnalyticalGeometry.cpp
@@ -569,8 +569,8 @@ std::vector<MathLib::Point3d> lineSegmentIntersect2d(
err.precision(std::numeric_limits<double>::digits10);
err << ab << " x " << cd;
OGS_FATAL(
- "The case of parallel line segments ({:s}) "
- "is not handled yet. Aborting.",
+ "The case of parallel line segments ({:s}) is not handled yet. "
+ "Aborting.",
err.str());
}
return std::vector<MathLib::Point3d>();
diff --git a/GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.cpp b/GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.cpp
index a47b433d80d..e39cdc06254 100644
--- a/GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.cpp
+++ b/GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.cpp
@@ -247,8 +247,7 @@ void BoostXmlGmlInterface::readSurfaces(
{
OGS_FATAL(
"The element list of the surface `{:s}' contains "
- "the "
- "invalid point id `{:d}'.",
+ "the invalid point id `{:d}'.",
s_name->c_str(), pt_idx);
}
return search->second;
@@ -342,8 +341,8 @@ void BoostXmlGmlInterface::addSurfacesToPropertyTree(
if (!sfc_vec)
{
INFO(
- "BoostXmlGmlInterface::addSurfacesToPropertyTree(): "
- "No surfaces within the geometry '{:s}'.",
+ "BoostXmlGmlInterface::addSurfacesToPropertyTree(): No surfaces "
+ "within the geometry '{:s}'.",
export_name);
return;
}
@@ -352,8 +351,8 @@ void BoostXmlGmlInterface::addSurfacesToPropertyTree(
if (!surfaces || surfaces->empty())
{
INFO(
- "BoostXmlGmlInterface::addSurfacesToPropertyTree(): "
- "No surfaces within the geometry '{:s}'.",
+ "BoostXmlGmlInterface::addSurfacesToPropertyTree(): No surfaces "
+ "within the geometry '{:s}'.",
export_name);
return;
}
@@ -388,8 +387,8 @@ void BoostXmlGmlInterface::addPolylinesToPropertyTree(
if (!vec)
{
INFO(
- "BoostXmlGmlInterface::addPolylinesToPropertyTree(): "
- "No polylines within the geometry '{:s}'.",
+ "BoostXmlGmlInterface::addPolylinesToPropertyTree(): No polylines "
+ "within the geometry '{:s}'.",
export_name);
return;
}
@@ -398,8 +397,8 @@ void BoostXmlGmlInterface::addPolylinesToPropertyTree(
if (!polylines || polylines->empty())
{
INFO(
- "BoostXmlGmlInterface::addPolylinesToPropertyTree(): "
- "No polylines within the geometry '{:s}'.",
+ "BoostXmlGmlInterface::addPolylinesToPropertyTree(): No polylines "
+ "within the geometry '{:s}'.",
export_name);
return;
}
diff --git a/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp b/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp
index 5464f7e9209..9b1fb214e5e 100644
--- a/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp
+++ b/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp
@@ -248,8 +248,8 @@ void XmlGmlInterface::readPolylines(
polyline_name = polyline.attribute("name").toStdString();
}
OGS_FATAL(
- "Polyline `{:s}' contains the point id `{:d}' which is "
- "not in the point list.",
+ "Polyline `{:s}' contains the point id `{:d}' which is not "
+ "in the point list.",
polyline_name, pt_idx);
}
return search->second;
@@ -294,8 +294,8 @@ void XmlGmlInterface::readSurfaces(
surface_name = surface.attribute("name").toStdString();
}
OGS_FATAL(
- "Surface `{:s}' contains the point id `{:d}', which is "
- "not in the point list.",
+ "Surface `{:s}' contains the point id `{:d}', which is not "
+ "in the point list.",
surface_name, pt_idx);
}
return search->second;
diff --git a/GeoLib/SurfaceGrid.cpp b/GeoLib/SurfaceGrid.cpp
index 9b05727a9ee..c904e991d97 100644
--- a/GeoLib/SurfaceGrid.cpp
+++ b/GeoLib/SurfaceGrid.cpp
@@ -150,8 +150,7 @@ void SurfaceGrid::sortTrianglesInGridCells(Surface const* const sfc)
Point const& p1(*((*sfc)[l]->getPoint(1)));
Point const& p2(*((*sfc)[l]->getPoint(2)));
ERR("Sorting triangle {:d} [({:f},{:f},{:f}), ({:f},{:f},{:f}), "
- "({:f},{:f},{:f}) into "
- "grid.",
+ "({:f},{:f},{:f}) into grid.",
l, p0[0], p0[1], p0[2], p1[0], p1[1], p1[2], p2[0], p2[1],
p2[2]);
OGS_FATAL("");
diff --git a/MaterialLib/MPL/CreateMaterialSpatialDistributionMap.cpp b/MaterialLib/MPL/CreateMaterialSpatialDistributionMap.cpp
index 6c30af7b0ea..8faac213709 100644
--- a/MaterialLib/MPL/CreateMaterialSpatialDistributionMap.cpp
+++ b/MaterialLib/MPL/CreateMaterialSpatialDistributionMap.cpp
@@ -32,9 +32,8 @@ createMaterialSpatialDistributionMap(
WARN(
"The maximum value of MaterialIDs in mesh is {:d}. As the given "
"number of porous media definitions in the project file is {:d}, "
- "the "
- "maximum value of MaterialIDs in mesh must be {:d} (index starts "
- "with zero).",
+ "the maximum value of MaterialIDs in mesh must be {:d} (index "
+ "starts with zero).",
max_material_id, media.size(), max_material_id - 1);
}
@@ -43,8 +42,7 @@ createMaterialSpatialDistributionMap(
WARN(
"There are {:d} porous medium definitions in the project file but "
"only {:d} different values in the MaterialIDs vector/data_array "
- "in "
- "the mesh.",
+ "in the mesh.",
media.size(), max_material_id - 1);
}
return std::make_unique<MaterialSpatialDistributionMap>(media,
diff --git a/MaterialLib/MPL/Properties/AverageMolarMass.cpp b/MaterialLib/MPL/Properties/AverageMolarMass.cpp
index 202f29f7b4c..4af19eb5c43 100644
--- a/MaterialLib/MPL/Properties/AverageMolarMass.cpp
+++ b/MaterialLib/MPL/Properties/AverageMolarMass.cpp
@@ -90,8 +90,8 @@ PropertyDataType AverageMolarMass::dValue(
(void)primary_variable;
assert(((primary_variable == Variable::phase_pressure) ||
(primary_variable == Variable::temperature)) &&
- "AverageMolarMass::dValue is implemented for "
- " derivatives with respect to phase_pressure or temperature only.");
+ "AverageMolarMass::dValue is implemented for derivatives with "
+ "respect to phase_pressure or temperature only.");
auto phase = std::get<Phase*>(scale_);
diff --git a/MaterialLib/MPL/Properties/CapillaryPressureSaturation/CapillaryPressureRegularizedVanGenuchten.cpp b/MaterialLib/MPL/Properties/CapillaryPressureSaturation/CapillaryPressureRegularizedVanGenuchten.cpp
index e4faf60352b..e594193ede8 100644
--- a/MaterialLib/MPL/Properties/CapillaryPressureSaturation/CapillaryPressureRegularizedVanGenuchten.cpp
+++ b/MaterialLib/MPL/Properties/CapillaryPressureSaturation/CapillaryPressureRegularizedVanGenuchten.cpp
@@ -74,10 +74,9 @@ PropertyDataType CapillaryPressureRegularizedVanGenuchten::dValue(
double const /*dt*/) const
{
(void)primary_variable;
- assert(
- (primary_variable == Variable::liquid_saturation) &&
- "CapillaryPressureRegularizedVanGenuchten::dValue is implemented for "
- "derivatives with respect to liquid saturation only.");
+ assert((primary_variable == Variable::liquid_saturation) &&
+ "CapillaryPressureRegularizedVanGenuchten::dValue is implemented "
+ "for derivatives with respect to liquid saturation only.");
const double Sl = std::get<double>(
variable_array[static_cast<int>(Variable::liquid_saturation)]);
diff --git a/MaterialLib/MPL/Properties/CapillaryPressureSaturation/CapillaryPressureVanGenuchten.cpp b/MaterialLib/MPL/Properties/CapillaryPressureSaturation/CapillaryPressureVanGenuchten.cpp
index 423496c93a1..abbb155f408 100644
--- a/MaterialLib/MPL/Properties/CapillaryPressureSaturation/CapillaryPressureVanGenuchten.cpp
+++ b/MaterialLib/MPL/Properties/CapillaryPressureSaturation/CapillaryPressureVanGenuchten.cpp
@@ -36,47 +36,46 @@ CapillaryPressureVanGenuchten::CapillaryPressureVanGenuchten(
if (S_L_res_ < 0 || S_L_res_ > 1)
{
OGS_FATAL(
- "Van Genuchten capillary pressure model: "
- "The residual liquid saturation value S_L_res = {:g} is out of "
- "admissible range [0, 1].",
+ "Van Genuchten capillary pressure model: The residual liquid "
+ "saturation value S_L_res = {:g} is out of admissible range [0, "
+ "1].",
S_L_res_);
}
if (S_L_max_ < 0 || S_L_max_ > 1)
{
OGS_FATAL(
- "Van Genuchten capillary pressure model: "
- "The maximum liquid saturation value S_L_max = {:g} is out of "
- "admissible range [0, 1].",
+ "Van Genuchten capillary pressure model: The maximum liquid "
+ "saturation value S_L_max = {:g} is out of admissible range [0, "
+ "1].",
S_L_max_);
}
if (S_L_res_ >= S_L_max_)
{
OGS_FATAL(
- "Van Genuchten capillary pressure model: "
- "The maximum liquid saturation S_L_max = {:g} must not be less or "
- "equal to the residual liquid saturion S_L_res = { : g}.",
+ "Van Genuchten capillary pressure model: The maximum liquid "
+ "saturation S_L_max = {:g} must not be less or equal to the "
+ "residual liquid saturion S_L_res = { : g}.",
S_L_max_, S_L_res_);
}
if (!(m_ > 0 && m_ < 1))
{
OGS_FATAL(
- "Van Genuchten capillary pressure model: "
- "The exponent value m = {:g} is out of of admissible range (0, 1).",
+ "Van Genuchten capillary pressure model: The exponent value m = "
+ "{:g} is out of of admissible range (0, 1).",
m_);
}
if (p_b_ <= 0)
{
OGS_FATAL(
- "Van Genuchten capillary pressure model: "
- "The pressure scaling value p_b = {:g} must be positive.",
+ "Van Genuchten capillary pressure model: The pressure scaling "
+ "value p_b = {:g} must be positive.",
p_b_);
}
if (p_cap_max_ < 0)
{
OGS_FATAL(
- "Van Genuchten capillary pressure model: "
- "The maximum capillary pressure value p_cap_max = {:g} must be "
- "non-negative.",
+ "Van Genuchten capillary pressure model: The maximum capillary "
+ "pressure value p_cap_max = {:g} must be non-negative.",
p_cap_max_);
}
}
diff --git a/MaterialLib/MPL/Properties/CapillaryPressureSaturation/SaturationLiakopoulos.cpp b/MaterialLib/MPL/Properties/CapillaryPressureSaturation/SaturationLiakopoulos.cpp
index 41de64ff96a..d8d0069aacb 100644
--- a/MaterialLib/MPL/Properties/CapillaryPressureSaturation/SaturationLiakopoulos.cpp
+++ b/MaterialLib/MPL/Properties/CapillaryPressureSaturation/SaturationLiakopoulos.cpp
@@ -44,8 +44,8 @@ PropertyDataType SaturationLiakopoulos::dValue(
{
(void)primary_variable;
assert((primary_variable == Variable::capillary_pressure) &&
- "SaturationLiakopoulos::dvalue is implemented for "
- " derivatives with respect to capillary pressure only.");
+ "SaturationLiakopoulos::dvalue is implemented for derivatives with "
+ "respect to capillary pressure only.");
const double p_cap = std::get<double>(
variable_array[static_cast<int>(Variable::capillary_pressure)]);
@@ -69,8 +69,8 @@ PropertyDataType SaturationLiakopoulos::d2Value(
(void)primary_variable2;
assert((primary_variable1 == Variable::capillary_pressure) &&
(primary_variable2 == Variable::capillary_pressure) &&
- "SaturationLiakopoulos::ddvalue is implemented for "
- " derivatives with respect to capillary pressure only.");
+ "SaturationLiakopoulos::ddvalue is implemented for derivatives "
+ "with respect to capillary pressure only.");
const double p_cap = std::get<double>(
variable_array[static_cast<int>(Variable::capillary_pressure)]);
diff --git a/MaterialLib/MPL/Properties/CapillaryPressureSaturation/SaturationVanGenuchten.cpp b/MaterialLib/MPL/Properties/CapillaryPressureSaturation/SaturationVanGenuchten.cpp
index c36e82caf72..9e8154c2db0 100644
--- a/MaterialLib/MPL/Properties/CapillaryPressureSaturation/SaturationVanGenuchten.cpp
+++ b/MaterialLib/MPL/Properties/CapillaryPressureSaturation/SaturationVanGenuchten.cpp
@@ -107,8 +107,8 @@ PropertyDataType SaturationVanGenuchten::d2Value(
(void)primary_variable2;
assert((primary_variable1 == Variable::capillary_pressure) &&
(primary_variable2 == Variable::capillary_pressure) &&
- "SaturationVanGenuchten::d2Value is implemented for "
- " derivatives with respect to capillary pressure only.");
+ "SaturationVanGenuchten::d2Value is implemented for derivatives "
+ "with respect to capillary pressure only.");
const double p_cap = std::get<double>(
variable_array[static_cast<int>(Variable::capillary_pressure)]);
diff --git a/MaterialLib/MPL/Properties/ClausiusClapeyron.cpp b/MaterialLib/MPL/Properties/ClausiusClapeyron.cpp
index e5b3bfc2feb..34c08fb2889 100644
--- a/MaterialLib/MPL/Properties/ClausiusClapeyron.cpp
+++ b/MaterialLib/MPL/Properties/ClausiusClapeyron.cpp
@@ -138,8 +138,8 @@ PropertyDataType ClausiusClapeyron::dValue(
return p_vap * dh / R * (1. / T_ref_ - 1. / T) * dM;
}
OGS_FATAL(
- "ClausiusClapeyron::dValue is implemented for derivatives "
- "with respect to phase pressure or temperature only.");
+ "ClausiusClapeyron::dValue is implemented for derivatives with respect "
+ "to phase pressure or temperature only.");
}
PropertyDataType ClausiusClapeyron::d2Value(
diff --git a/MaterialLib/MPL/Properties/CreateEmbeddedFracturePermeability.cpp b/MaterialLib/MPL/Properties/CreateEmbeddedFracturePermeability.cpp
index 1620f782da0..c30721ff28f 100644
--- a/MaterialLib/MPL/Properties/CreateEmbeddedFracturePermeability.cpp
+++ b/MaterialLib/MPL/Properties/CreateEmbeddedFracturePermeability.cpp
@@ -20,8 +20,8 @@ std::unique_ptr<Property> createEmbeddedFracturePermeability(
if ((geometry_dimension != 2) && (geometry_dimension != 3))
{
OGS_FATAL(
- "The EmbeddedFracturePermeability is implemented only "
- "for 2D or 3D problems");
+ "The EmbeddedFracturePermeability is implemented only for 2D or 3D "
+ "problems");
}
//! \ogs_file_param{properties__property__type}
diff --git a/MaterialLib/MPL/Properties/CreateGasPressureDependentPermeability.cpp b/MaterialLib/MPL/Properties/CreateGasPressureDependentPermeability.cpp
index 2cc3fcaf3ef..c51eafe25bd 100644
--- a/MaterialLib/MPL/Properties/CreateGasPressureDependentPermeability.cpp
+++ b/MaterialLib/MPL/Properties/CreateGasPressureDependentPermeability.cpp
@@ -32,8 +32,8 @@ std::unique_ptr<Property> createGasPressureDependentPermeability(
if ((geometry_dimension != 2) && (geometry_dimension != 3))
{
OGS_FATAL(
- "The GasPressureDependentPermeability is implemented only "
- "for 2D or 3D problems");
+ "The GasPressureDependentPermeability is implemented only for 2D "
+ "or 3D problems");
}
//! \ogs_file_param{properties__property__type}
diff --git a/MaterialLib/MPL/Properties/CreateStrainDependentPermeability.cpp b/MaterialLib/MPL/Properties/CreateStrainDependentPermeability.cpp
index 626accca9c9..aaad96dd2fc 100644
--- a/MaterialLib/MPL/Properties/CreateStrainDependentPermeability.cpp
+++ b/MaterialLib/MPL/Properties/CreateStrainDependentPermeability.cpp
@@ -32,8 +32,8 @@ std::unique_ptr<Property> createStrainDependentPermeability(
if ((geometry_dimension != 2) && (geometry_dimension != 3))
{
OGS_FATAL(
- "The StrainDependentPermeability is implemented only "
- "for 2D or 3D problems");
+ "The StrainDependentPermeability is implemented only for 2D or 3D "
+ "problems");
}
//! \ogs_file_param{properties__property__type}
diff --git a/MaterialLib/MPL/Properties/Enthalpy/LinearWaterVapourLatentHeat.cpp b/MaterialLib/MPL/Properties/Enthalpy/LinearWaterVapourLatentHeat.cpp
index e4250d201af..a6456e00ad8 100644
--- a/MaterialLib/MPL/Properties/Enthalpy/LinearWaterVapourLatentHeat.cpp
+++ b/MaterialLib/MPL/Properties/Enthalpy/LinearWaterVapourLatentHeat.cpp
@@ -42,8 +42,8 @@ PropertyDataType LinearWaterVapourLatentHeat::dValue(
}
OGS_FATAL(
- "LinearWaterVapourLatentHeat::dValue is implemented for "
- "the derivative with respect to temperature only.");
+ "LinearWaterVapourLatentHeat::dValue is implemented for the derivative "
+ "with respect to temperature only.");
}
} // namespace MaterialPropertyLib
diff --git a/MaterialLib/MPL/Properties/GasPressureDependentPermeability.cpp b/MaterialLib/MPL/Properties/GasPressureDependentPermeability.cpp
index 5eb240d09bf..c163598e75f 100644
--- a/MaterialLib/MPL/Properties/GasPressureDependentPermeability.cpp
+++ b/MaterialLib/MPL/Properties/GasPressureDependentPermeability.cpp
@@ -46,8 +46,8 @@ void GasPressureDependentPermeability<DisplacementDim>::checkScale() const
if (!std::holds_alternative<Medium*>(scale_))
{
OGS_FATAL(
- "The property 'GasPressureDependentPermeability' is "
- "implemented on the 'medium' scale only.");
+ "The property 'GasPressureDependentPermeability' is implemented on "
+ "the 'medium' scale only.");
}
}
diff --git a/MaterialLib/MPL/Properties/IdealGasLaw.cpp b/MaterialLib/MPL/Properties/IdealGasLaw.cpp
index 9dfe4440ac3..d362a23a1a6 100644
--- a/MaterialLib/MPL/Properties/IdealGasLaw.cpp
+++ b/MaterialLib/MPL/Properties/IdealGasLaw.cpp
@@ -78,8 +78,8 @@ PropertyDataType IdealGasLaw::dValue(VariableArray const& variable_array,
}
OGS_FATAL(
- "IdealGasLaw::dValue is implemented for derivatives "
- "with respect to phase pressure or temperature only.");
+ "IdealGasLaw::dValue is implemented for derivatives with respect to "
+ "phase pressure or temperature only.");
return 0.;
}
@@ -120,8 +120,8 @@ PropertyDataType IdealGasLaw::d2Value(VariableArray const& variable_array,
}
OGS_FATAL(
- "IdealGasLaw::d2Value is implemented for derivatives "
- "with respect to phase pressure and temperature only.");
+ "IdealGasLaw::d2Value is implemented for derivatives with respect to "
+ "phase pressure and temperature only.");
return 0.;
}
diff --git a/MaterialLib/MPL/Properties/PermeabilityOrthotropicPowerLaw.cpp b/MaterialLib/MPL/Properties/PermeabilityOrthotropicPowerLaw.cpp
index 4974f4544d6..4affdb393cd 100644
--- a/MaterialLib/MPL/Properties/PermeabilityOrthotropicPowerLaw.cpp
+++ b/MaterialLib/MPL/Properties/PermeabilityOrthotropicPowerLaw.cpp
@@ -40,8 +40,8 @@ void PermeabilityOrthotropicPowerLaw<DisplacementDim>::checkScale() const
if (!std::holds_alternative<Medium*>(scale_))
{
OGS_FATAL(
- "The property 'PermeabilityOrthotropicPowerLaw' is "
- "implemented on the 'medium' scales only.");
+ "The property 'PermeabilityOrthotropicPowerLaw' is implemented on "
+ "the 'medium' scales only.");
}
}
template <int DisplacementDim>
@@ -93,8 +93,8 @@ PropertyDataType PermeabilityOrthotropicPowerLaw<DisplacementDim>::dValue(
{
(void)primary_variable;
assert((primary_variable == Variable::total_strain) &&
- "PermeabilityOrthotropicPowerLaw::dValue is implemented for "
- " derivatives with respect to total strain only.");
+ "PermeabilityOrthotropicPowerLaw::dValue is implemented for "
+ "derivatives with respect to total strain only.");
return 0.;
}
diff --git a/MaterialLib/MPL/Properties/RelativePermeability/RelPermNonWettingPhaseVanGenuchtenMualem.cpp b/MaterialLib/MPL/Properties/RelativePermeability/RelPermNonWettingPhaseVanGenuchtenMualem.cpp
index 66fa669c89c..ca8bdbfd8de 100644
--- a/MaterialLib/MPL/Properties/RelativePermeability/RelPermNonWettingPhaseVanGenuchtenMualem.cpp
+++ b/MaterialLib/MPL/Properties/RelativePermeability/RelPermNonWettingPhaseVanGenuchtenMualem.cpp
@@ -118,9 +118,8 @@ double RelPermNonWettingPhaseVanGenuchtenMualem::
OGS_FATAL(
"The given minimum relative permeability, {:g}, is not "
- "associated with the saturation in the range of '('{:f}, "
- "{:f}')'. Please try another one in '(0, 1)', which should be "
- "close to zero",
+ "associated with the saturation in the range of '('{:f}, {:f}')'. "
+ "Please try another one in '(0, 1)', which should be close to zero",
krel_min_, S_L_r_, S_L_max_);
}
} // namespace MaterialPropertyLib
diff --git a/MaterialLib/MPL/Properties/RelativePermeability/RelPermUdellNonwettingPhase.cpp b/MaterialLib/MPL/Properties/RelativePermeability/RelPermUdellNonwettingPhase.cpp
index f19e4d0da8f..bfc695e08d7 100644
--- a/MaterialLib/MPL/Properties/RelativePermeability/RelPermUdellNonwettingPhase.cpp
+++ b/MaterialLib/MPL/Properties/RelativePermeability/RelPermUdellNonwettingPhase.cpp
@@ -74,8 +74,8 @@ PropertyDataType RelPermUdellNonwettingPhase::dValue(
{
(void)primary_variable;
assert((primary_variable == Variable::liquid_saturation) &&
- "RelPermUdellNonwettingPhase::dValue is implemented for "
- " derivatives with respect to liquid saturation only.");
+ "RelPermUdellNonwettingPhase::dValue is implemented for "
+ "derivatives with respect to liquid saturation only.");
const double S_L = std::get<double>(
variable_array[static_cast<int>(Variable::liquid_saturation)]);
diff --git a/MaterialLib/MPL/Properties/SaturationDependentHeatConduction.cpp b/MaterialLib/MPL/Properties/SaturationDependentHeatConduction.cpp
index f5d49d606fb..a08c07fd062 100644
--- a/MaterialLib/MPL/Properties/SaturationDependentHeatConduction.cpp
+++ b/MaterialLib/MPL/Properties/SaturationDependentHeatConduction.cpp
@@ -49,8 +49,7 @@ PropertyDataType SaturationDependentHeatConduction::dValue(
(void)variable;
assert((variable == Variable::liquid_saturation) &&
"SaturationDependentHeatConduction::dvalue is implemented for "
- "derivatives with "
- "respect to liquid saturation only.");
+ "derivatives with respect to liquid saturation only.");
return K_wet_ - K_dry_;
}
diff --git a/MaterialLib/MPL/Properties/SaturationDependentSwelling.cpp b/MaterialLib/MPL/Properties/SaturationDependentSwelling.cpp
index 158f167a6db..e3b967f4c00 100644
--- a/MaterialLib/MPL/Properties/SaturationDependentSwelling.cpp
+++ b/MaterialLib/MPL/Properties/SaturationDependentSwelling.cpp
@@ -40,8 +40,8 @@ void SaturationDependentSwelling::checkScale() const
if (!std::holds_alternative<Phase*>(scale_))
{
OGS_FATAL(
- "The property 'SaturationDependentSwelling' is "
- "implemented on the 'phase' scales only.");
+ "The property 'SaturationDependentSwelling' is implemented on the "
+ "'phase' scales only.");
}
auto const phase = std::get<Phase*>(scale_);
if (phase->name != "Solid")
@@ -106,8 +106,8 @@ PropertyDataType SaturationDependentSwelling::dValue(
{
(void)primary_variable;
assert((primary_variable == Variable::liquid_saturation) &&
- "SaturationDependentSwelling::dValue is implemented for "
- " derivatives with respect to liquid saturation only.");
+ "SaturationDependentSwelling::dValue is implemented for "
+ "derivatives with respect to liquid saturation only.");
auto const S_L = std::get<double>(
variable_array[static_cast<int>(Variable::liquid_saturation)]);
diff --git a/MaterialLib/MPL/Properties/StrainDependentPermeability.cpp b/MaterialLib/MPL/Properties/StrainDependentPermeability.cpp
index 5769a7cf60c..85ec9b4a4dd 100644
--- a/MaterialLib/MPL/Properties/StrainDependentPermeability.cpp
+++ b/MaterialLib/MPL/Properties/StrainDependentPermeability.cpp
@@ -108,8 +108,7 @@ PropertyDataType StrainDependentPermeability<DisplacementDim>::dValue(
OGS_FATAL(
"The derivative of the intrinsic permeability of "
- "StrainDependentPermeability"
- "is not implemented.");
+ "StrainDependentPermeabilityis not implemented.");
}
template class StrainDependentPermeability<2>;
template class StrainDependentPermeability<3>;
diff --git a/MaterialLib/MPL/Properties/ThermalConductivity/SoilThermalConductivitySomerton.cpp b/MaterialLib/MPL/Properties/ThermalConductivity/SoilThermalConductivitySomerton.cpp
index 217bed6dfba..474a47612f1 100644
--- a/MaterialLib/MPL/Properties/ThermalConductivity/SoilThermalConductivitySomerton.cpp
+++ b/MaterialLib/MPL/Properties/ThermalConductivity/SoilThermalConductivitySomerton.cpp
@@ -54,8 +54,8 @@ SoilThermalConductivitySomerton<1>::SoilThermalConductivitySomerton(
{
OGS_FATAL(
"In 'SoilThermalConductivitySomerton', "
- "dry_thermal_conductivity of '{:g}' is "
- "larger than wet_thermal_conductivity of '{:g}'.",
+ "dry_thermal_conductivity of '{:g}' is larger than "
+ "wet_thermal_conductivity of '{:g}'.",
lambda_try, lambda_wet);
}
}
@@ -134,9 +134,9 @@ SoilThermalConductivitySomerton<GlobalDimension>::
if (lambda_try.size() != lambda_wet.size())
{
OGS_FATAL(
- "In 'SoilThermalConductivitySomerton' input data, "
- "the data size of dry_thermal_conductivity of '{:d}' is "
- "different from that of dry_thermal_conductivity of '{:d}'.",
+ "In 'SoilThermalConductivitySomerton' input data, the data size of "
+ "dry_thermal_conductivity of '{:d}' is different from that of "
+ "dry_thermal_conductivity of '{:d}'.",
lambda_try.size(), lambda_wet.size());
}
@@ -146,8 +146,8 @@ SoilThermalConductivitySomerton<GlobalDimension>::
{
OGS_FATAL(
"In 'SoilThermalConductivitySomerton', "
- "dry_thermal_conductivity of '{:g}' is "
- "larger than wet_thermal_conductivity of '{:g}'.",
+ "dry_thermal_conductivity of '{:g}' is larger than "
+ "wet_thermal_conductivity of '{:g}'.",
lambda_try[i], lambda_wet[i]);
}
}
diff --git a/MaterialLib/MPL/Properties/VapourDiffusion/VapourDiffusionFEBEX.cpp b/MaterialLib/MPL/Properties/VapourDiffusion/VapourDiffusionFEBEX.cpp
index be9b0d5f3eb..4ab078db1ec 100644
--- a/MaterialLib/MPL/Properties/VapourDiffusion/VapourDiffusionFEBEX.cpp
+++ b/MaterialLib/MPL/Properties/VapourDiffusion/VapourDiffusionFEBEX.cpp
@@ -76,8 +76,8 @@ PropertyDataType VapourDiffusionFEBEX::dValue(
}
OGS_FATAL(
- "VapourDiffusionFEBEX::dValue is implemented for "
- "derivatives with respect to temperature or saturation only.");
+ "VapourDiffusionFEBEX::dValue is implemented for derivatives with "
+ "respect to temperature or saturation only.");
}
} // namespace MaterialPropertyLib
diff --git a/MaterialLib/MPL/Utils/CheckVanGenuchtenExponentRange.cpp b/MaterialLib/MPL/Utils/CheckVanGenuchtenExponentRange.cpp
index 27fee4cfedc..b966a622168 100644
--- a/MaterialLib/MPL/Utils/CheckVanGenuchtenExponentRange.cpp
+++ b/MaterialLib/MPL/Utils/CheckVanGenuchtenExponentRange.cpp
@@ -20,8 +20,8 @@ void checkVanGenuchtenExponentRange(const double m)
if (m <= 0 || m >= 1)
{
OGS_FATAL(
- "The exponent value m = {:e} of van Genuchten saturation "
- "model, is out of its range of(0, 1) ",
+ "The exponent value m = {:e} of van Genuchten saturation model, is "
+ "out of its range of(0, 1) ",
m);
}
}
diff --git a/MaterialLib/MPL/Utils/FormKelvinVectorFromThermalExpansivity.cpp b/MaterialLib/MPL/Utils/FormKelvinVectorFromThermalExpansivity.cpp
index 20c10f18a5c..1509f87aaff 100644
--- a/MaterialLib/MPL/Utils/FormKelvinVectorFromThermalExpansivity.cpp
+++ b/MaterialLib/MPL/Utils/FormKelvinVectorFromThermalExpansivity.cpp
@@ -16,9 +16,9 @@
namespace MaterialPropertyLib
{
static const char error_info[] =
- "The thermal expansivity can only be either a scalar number for "
- "isotropic thermal expansion or a three element array for anisotropic "
- "thermal expansion.";
+ "The thermal expansivity can only be either a scalar number for isotropic "
+ "thermal expansion or a three element array for anisotropic thermal "
+ "expansion.";
template <int GlobalDim>
struct FormKelvinVectorFromThermalExpansivity
diff --git a/MaterialLib/PorousMedium/CreatePorousMediaProperties.cpp b/MaterialLib/PorousMedium/CreatePorousMediaProperties.cpp
index ddaba4f165e..90c05fc7a75 100644
--- a/MaterialLib/PorousMedium/CreatePorousMediaProperties.cpp
+++ b/MaterialLib/PorousMedium/CreatePorousMediaProperties.cpp
@@ -84,9 +84,9 @@ PorousMediaProperties createPorousMediaProperties(
{
OGS_FATAL(
"The maximum value of MaterialIDs in mesh is {:d}. As the "
- "given number of porous media definitions in the project "
- "file is {:d}, the maximum value of MaterialIDs in mesh must be "
- "{:d} (index starts with zero).",
+ "given number of porous media definitions in the project file is "
+ "{:d}, the maximum value of MaterialIDs in mesh must be {:d} "
+ "(index starts with zero).",
max_material_id, mat_ids.size(), max_material_id - 1);
}
diff --git a/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CreateCapillaryPressureModel.cpp b/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CreateCapillaryPressureModel.cpp
index 82ee8f9f921..eb4fd1a9a48 100644
--- a/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CreateCapillaryPressureModel.cpp
+++ b/MaterialLib/PorousMedium/UnsaturatedProperty/CapillaryPressure/CreateCapillaryPressureModel.cpp
@@ -155,8 +155,8 @@ std::unique_ptr<CapillaryPressureSaturation> createCapillaryPressureModel(
}
OGS_FATAL(
- "The capillary pressure saturation models {:s} are unavailable.\n"
- "The available types are: \n\tBrooksCorey, \n\tvanGenuchten,",
+ "The capillary pressure saturation models {:s} are unavailable.\nThe "
+ "available types are: \n\tBrooksCorey, \n\tvanGenuchten,",
"\n\tCurve.\n",
type.data());
}
diff --git a/MathLib/InterpolationAlgorithms/PiecewiseLinearInterpolation.cpp b/MathLib/InterpolationAlgorithms/PiecewiseLinearInterpolation.cpp
index cdff20a3e61..89e948342c3 100644
--- a/MathLib/InterpolationAlgorithms/PiecewiseLinearInterpolation.cpp
+++ b/MathLib/InterpolationAlgorithms/PiecewiseLinearInterpolation.cpp
@@ -42,8 +42,8 @@ PiecewiseLinearInterpolation::PiecewiseLinearInterpolation(
{
const std::size_t i = std::distance(_supp_pnts.begin(), it);
OGS_FATAL(
- "Variable {:d} and variable {:d} are the same. "
- "Piecewise linear interpolation is not possible\n",
+ "Variable {:d} and variable {:d} are the same. Piecewise linear "
+ "interpolation is not possible\n",
i, i + 1);
}
}
diff --git a/MeshLib/MeshEditing/AddLayerToMesh.cpp b/MeshLib/MeshEditing/AddLayerToMesh.cpp
index 5ad8c4e2c09..f332139ab25 100644
--- a/MeshLib/MeshEditing/AddLayerToMesh.cpp
+++ b/MeshLib/MeshEditing/AddLayerToMesh.cpp
@@ -168,8 +168,8 @@ MeshLib::Mesh* addLayerToMesh(MeshLib::Mesh const& mesh, double thickness,
if (!mesh.getProperties().existsPropertyVector<int>("MaterialIDs"))
{
- ERR("Could not copy the property 'MaterialIDs' since the original "
- "mesh does not contain such a property.");
+ ERR("Could not copy the property 'MaterialIDs' since the original mesh "
+ "does not contain such a property.");
return new_mesh;
}
auto const* const materials =
diff --git a/MeshLib/MeshEditing/ElementValueModification.cpp b/MeshLib/MeshEditing/ElementValueModification.cpp
index bbebbc9c732..d1d06baaa2c 100644
--- a/MeshLib/MeshEditing/ElementValueModification.cpp
+++ b/MeshLib/MeshEditing/ElementValueModification.cpp
@@ -50,9 +50,9 @@ bool ElementValueModification::replace(MeshLib::Mesh& mesh,
if ((*property_value_vec)[i] == new_value)
{
WARN(
- "ElementValueModification::replaceElementValue() "
- "- Replacement value '{:d}' is already taken, "
- "no changes have been made.",
+ "ElementValueModification::replaceElementValue() - "
+ "Replacement value '{:d}' is already taken, no changes "
+ "have been made.",
new_value);
return false;
}
diff --git a/MeshLib/MeshEditing/Mesh2MeshPropertyInterpolation.cpp b/MeshLib/MeshEditing/Mesh2MeshPropertyInterpolation.cpp
index b8ede148ebc..5c31760f63b 100644
--- a/MeshLib/MeshEditing/Mesh2MeshPropertyInterpolation.cpp
+++ b/MeshLib/MeshEditing/Mesh2MeshPropertyInterpolation.cpp
@@ -68,8 +68,8 @@ bool Mesh2MeshPropertyInterpolation::setPropertiesForMesh(Mesh& dest_mesh) const
if (!dest_properties)
{
WARN(
- "Could not get or create a PropertyVector of type double"
- " using the given name '{:s}'.",
+ "Could not get or create a PropertyVector of type double using "
+ "the given name '{:s}'.",
_property_name);
return false;
}
diff --git a/MeshLib/MeshSurfaceExtraction.cpp b/MeshLib/MeshSurfaceExtraction.cpp
index 3d37732aa82..6ff19b802c7 100644
--- a/MeshLib/MeshSurfaceExtraction.cpp
+++ b/MeshLib/MeshSurfaceExtraction.cpp
@@ -146,8 +146,8 @@ bool createSfcMeshProperties(MeshLib::Mesh& sfc_mesh,
else
{
WARN(
- "Skipping property vector '{:s}' - no matching data type '{:s}'"
- "found.",
+ "Skipping property vector '{:s}' - no matching data type "
+ "'{:s}' found.",
name, typeid(*property).name());
vectors_skipped++;
}
diff --git a/NumLib/DOF/MeshComponentMap.cpp b/NumLib/DOF/MeshComponentMap.cpp
index 63cf25a6e8e..28de9971814 100644
--- a/NumLib/DOF/MeshComponentMap.cpp
+++ b/NumLib/DOF/MeshComponentMap.cpp
@@ -74,8 +74,8 @@ MeshComponentMap::MeshComponentMap(
// a rank in the parallel computing.
OGS_FATAL(
"Global index in the system of equations"
- " can only be numbered by the order type"
- " of ComponentOrder::BY_LOCATION");
+ " can only be numbered by the order type of "
+ "ComponentOrder::BY_LOCATION");
}
global_id = static_cast<GlobalIndexType>(
components.size() * p_mesh.getGlobalNodeID(j) + comp_id);
@@ -124,8 +124,8 @@ MeshComponentMap MeshComponentMap::getSubset(
if (first_mismatch != end(bulk_mesh_subsets))
{
OGS_FATAL(
- "Assumption in the MeshComponentMap violated. Expecting "
- "all of mesh ids to be the same, but it is not true for "
+ "Assumption in the MeshComponentMap violated. Expecting all of "
+ "mesh ids to be the same, but it is not true for "
"the mesh '{:s}' with id {:d}.",
first_mismatch->getMesh().getName(),
first_mismatch->getMeshID());
diff --git a/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator.cpp b/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator.cpp
index a742023871c..3b6c67cdd9b 100644
--- a/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator.cpp
+++ b/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator.cpp
@@ -36,8 +36,8 @@ LocalLinearLeastSquaresExtrapolator::LocalLinearLeastSquaresExtrapolator(
if (dof_table.getNumberOfGlobalComponents() != 1)
{
OGS_FATAL(
- "The d.o.f. table passed must be for one variable that has "
- "only one component!");
+ "The d.o.f. table passed must be for one variable that has only "
+ "one component!");
}
}
diff --git a/NumLib/ODESolver/ConvergenceCriterionPerComponentResidual.cpp b/NumLib/ODESolver/ConvergenceCriterionPerComponentResidual.cpp
index c389b5a585f..6a1e6e13d2c 100644
--- a/NumLib/ODESolver/ConvergenceCriterionPerComponentResidual.cpp
+++ b/NumLib/ODESolver/ConvergenceCriterionPerComponentResidual.cpp
@@ -97,8 +97,7 @@ void ConvergenceCriterionPerComponentResidual::checkResidual(
auto const norm_res0 = _residual_norms_0[global_component];
INFO(
"Convergence criterion, component {:d}: |r|={:.4e}, "
- "|r0|={:.4e}, "
- "|r|/|r0|={:.4e}",
+ "|r0|={:.4e}, |r|/|r0|={:.4e}",
global_component, norm_res, norm_res0,
(norm_res0 == 0. ? std::numeric_limits<double>::quiet_NaN()
: (norm_res / norm_res0)));
diff --git a/NumLib/ODESolver/NonlinearSolver.cpp b/NumLib/ODESolver/NonlinearSolver.cpp
index 760901b22f4..5e07e66615c 100644
--- a/NumLib/ODESolver/NonlinearSolver.cpp
+++ b/NumLib/ODESolver/NonlinearSolver.cpp
@@ -338,8 +338,7 @@ NonlinearSolverStatus NonlinearSolver<NonlinearSolverTag::Newton>::solve(
case IterationResult::REPEAT_ITERATION:
INFO(
"Newton: The postIteration() hook decided that this "
- "iteration"
- " has to be repeated.");
+ "iteration has to be repeated.");
// TODO introduce some onDestroy hook.
NumLib::GlobalVectorProvider::provider.releaseVector(
*x_new[process_id]);
diff --git a/ParameterLib/CoordinateSystem.cpp b/ParameterLib/CoordinateSystem.cpp
index 52423f6b50b..ea59706a491 100644
--- a/ParameterLib/CoordinateSystem.cpp
+++ b/ParameterLib/CoordinateSystem.cpp
@@ -18,9 +18,9 @@ namespace ParameterLib
{
static double const tolerance = 1.e-15;
static const char* const error_info =
- "The determinant of the coordinate system transformation matrix is "
- "'{:g}', which is not sufficiently close to unity with the tolerance of "
- "'{:g}'. Please adjust the accuracy of the local system bases";
+ "The determinant of the coordinate system transformation matrix is '{:g}', "
+ "which is not sufficiently close to unity with the tolerance of '{:g}'. "
+ "Please adjust the accuracy of the local system bases";
CoordinateSystem::CoordinateSystem(Parameter<double> const& e0,
Parameter<double> const& e1)
@@ -30,8 +30,7 @@ CoordinateSystem::CoordinateSystem(Parameter<double> const& e0,
{
OGS_FATAL(
"The parameter types for the basis must be equal but they are "
- "'{:s}' "
- "and '{:s}'.",
+ "'{:s}' and '{:s}'.",
typeid(_base[0]).name(),
typeid(_base[1]).name());
}
diff --git a/ProcessLib/BoundaryCondition/HCNonAdvectiveFreeComponentFlowBoundaryCondition.cpp b/ProcessLib/BoundaryCondition/HCNonAdvectiveFreeComponentFlowBoundaryCondition.cpp
index 124131ef1f0..660a510a53a 100644
--- a/ProcessLib/BoundaryCondition/HCNonAdvectiveFreeComponentFlowBoundaryCondition.cpp
+++ b/ProcessLib/BoundaryCondition/HCNonAdvectiveFreeComponentFlowBoundaryCondition.cpp
@@ -35,8 +35,7 @@ createHCNonAdvectiveFreeComponentFlowBoundaryCondition(
{
OGS_FATAL(
"The dimension ({:d}) of the given boundary mesh '{:s}' is not by "
- "one "
- "lower than the bulk dimension ({:d}).",
+ "one lower than the bulk dimension ({:d}).",
bc_mesh.getDimension(), bc_mesh.getName(), global_dim);
}
diff --git a/ProcessLib/BoundaryCondition/Python/PythonBoundaryCondition.cpp b/ProcessLib/BoundaryCondition/Python/PythonBoundaryCondition.cpp
index 976dee9705b..1ba9c7ecad3 100644
--- a/ProcessLib/BoundaryCondition/Python/PythonBoundaryCondition.cpp
+++ b/ProcessLib/BoundaryCondition/Python/PythonBoundaryCondition.cpp
@@ -128,11 +128,10 @@ void PythonBoundaryCondition::getEssentialBCValues(
// TODO extend Python BC to mixed FEM ansatz functions
OGS_FATAL(
"No d.o.f. found for (node={:d}, var={:d}, comp={:d}). "
- " "
- "That might be due to the use of mixed FEM ansatz "
- "functions, which is currently not supported by "
- "the implementation of Python BCs. That excludes, "
- "e.g., the HM process.",
+ " That might be due to the use of mixed FEM ansatz "
+ "functions, which is currently not supported by the "
+ "implementation of Python BCs. That excludes, e.g., "
+ "the HM process.",
bulk_node_id, var, comp);
}
diff --git a/ProcessLib/BoundaryCondition/SolutionDependentDirichletBoundaryCondition.cpp b/ProcessLib/BoundaryCondition/SolutionDependentDirichletBoundaryCondition.cpp
index 4d8f5bc2992..07aa6d68218 100644
--- a/ProcessLib/BoundaryCondition/SolutionDependentDirichletBoundaryCondition.cpp
+++ b/ProcessLib/BoundaryCondition/SolutionDependentDirichletBoundaryCondition.cpp
@@ -47,8 +47,7 @@ SolutionDependentDirichletBoundaryCondition::
OGS_FATAL(
"Found mesh property '{:s}' in the mesh '{:s}' which is for "
"boundary assignment. This mesh property is the built-in property "
- "of the "
- "class SolutionDependentDirichletBoundaryCondition.",
+ "of the class SolutionDependentDirichletBoundaryCondition.",
property_name, bc_mesh.getName());
}
diff --git a/ProcessLib/BoundaryCondition/VariableDependentNeumannBoundaryCondition.cpp b/ProcessLib/BoundaryCondition/VariableDependentNeumannBoundaryCondition.cpp
index c870a106cdc..861b2e963a7 100644
--- a/ProcessLib/BoundaryCondition/VariableDependentNeumannBoundaryCondition.cpp
+++ b/ProcessLib/BoundaryCondition/VariableDependentNeumannBoundaryCondition.cpp
@@ -28,8 +28,8 @@ createVariableDependentNeumannBoundaryCondition(
if (dof_table.getNumberOfVariables() != 2)
{
OGS_FATAL(
- "VariableDependentNeumann BC only implemented for 2 "
- "variable processes.");
+ "VariableDependentNeumann BC only implemented for 2 variable "
+ "processes.");
}
assert(variable_id == 0 || variable_id == 1);
diff --git a/ProcessLib/CreateDeactivatedSubdomain.cpp b/ProcessLib/CreateDeactivatedSubdomain.cpp
index 74fb1ef0429..469c84cba75 100644
--- a/ProcessLib/CreateDeactivatedSubdomain.cpp
+++ b/ProcessLib/CreateDeactivatedSubdomain.cpp
@@ -143,8 +143,8 @@ static std::pair<Eigen::Vector3d, Eigen::Vector3d> parseLineSegment(
if (start.size() != 3)
{
OGS_FATAL(
- "For construction of a line segment the start point must be a "
- "3D point. Got a vector of size {}.",
+ "For construction of a line segment the start point must be a 3D "
+ "point. Got a vector of size {}.",
start.size());
}
@@ -155,8 +155,8 @@ static std::pair<Eigen::Vector3d, Eigen::Vector3d> parseLineSegment(
if (end.size() != 3)
{
OGS_FATAL(
- "For construction of a line segment the end point must be a "
- "3D point. Got a vector of size {}.",
+ "For construction of a line segment the end point must be a 3D "
+ "point. Got a vector of size {}.",
end.size());
}
return {Eigen::Vector3d{start[0], start[1], start[2]},
diff --git a/ProcessLib/CreateProcessData.cpp b/ProcessLib/CreateProcessData.cpp
index fbf2429dd28..27737e26b63 100644
--- a/ProcessLib/CreateProcessData.cpp
+++ b/ProcessLib/CreateProcessData.cpp
@@ -115,8 +115,8 @@ std::vector<std::unique_ptr<ProcessData>> createPerProcessData(
"In order to make the specification of output in the project "
"file consistent, the variables output tags were moved from "
"xpath "
- "'//OpenGeoSysProject/time_loop/processes/process/output' "
- "to the global output section, i.e., to the xpath "
+ "'//OpenGeoSysProject/time_loop/processes/process/output' to "
+ "the global output section, i.e., to the xpath "
"'//OpenGeoSysProject/time_loop/output'. This has to be done "
"in the current project file!");
}
@@ -133,8 +133,8 @@ std::vector<std::unique_ptr<ProcessData>> createPerProcessData(
if (processes.size() > 1)
{
OGS_FATAL(
- "Some processes have not been configured to be solved by this "
- " time loop.");
+ "Some processes have not been configured to be solved by this "
+ "time loop.");
}
else
{
diff --git a/ProcessLib/HT/HTProcess.cpp b/ProcessLib/HT/HTProcess.cpp
index 0f909abda1b..d4b80bef82c 100644
--- a/ProcessLib/HT/HTProcess.cpp
+++ b/ProcessLib/HT/HTProcess.cpp
@@ -206,8 +206,8 @@ void HTProcess::postTimestepConcreteProcess(std::vector<GlobalVector*> const& x,
if (_use_monolithic_scheme && process_id != 0)
{
OGS_FATAL(
- "The condition of process_id = 0 must be satisfied for "
- "monolithic HTProcess, which is a single process.");
+ "The condition of process_id = 0 must be satisfied for monolithic "
+ "HTProcess, which is a single process.");
}
if (!_use_monolithic_scheme &&
process_id != _process_data.hydraulic_process_id)
diff --git a/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp b/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp
index 2220e527b53..b0ef6a9d7c6 100644
--- a/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp
+++ b/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp
@@ -78,8 +78,7 @@ std::unique_ptr<Process> createHeatTransportBHEProcess(
{
OGS_FATAL(
"Could not find process variable '{:s}' in the provided "
- "variables "
- "list for config tag <{:s}>.",
+ "variables list for config tag <{:s}>.",
pv_name, "process_variable");
}
DBUG("Found process variable '{:s}' for config tag <{:s}>.",
@@ -167,8 +166,7 @@ std::unique_ptr<Process> createHeatTransportBHEProcess(
if (!scope.contains("bc_bhe"))
OGS_FATAL(
"Function 'bc_bhe' is not defined in the python script file, "
- "or there "
- "was no python script file specified.");
+ "or there was no python script file specified.");
py_object =
scope["bc_bhe"]
diff --git a/ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.cpp b/ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.cpp
index 6aeb559d2b3..0f54e4aff5e 100644
--- a/ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.cpp
+++ b/ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.cpp
@@ -239,9 +239,7 @@ NumLib::IterationResult HeatTransportBHEProcess::postIterationConcreteProcess(
std::get<2>(_process_data.py_bc_object->dataframe_network));
if (!_process_data.py_bc_object->isOverriddenTespy())
{
- DBUG(
- "Method `tespySolver' not overridden in Python "
- "script.");
+ DBUG("Method `tespySolver' not overridden in Python script.");
}
// update the Tin and flow rate
@@ -320,8 +318,8 @@ void HeatTransportBHEProcess::createBHEBoundaryConditionTopBottom(
{
INFO(
"For 1P-type BHE, the BHE inflow and outflow "
- "nodes are identified according to their mesh node "
- "id in ascending order");
+ "nodes are identified according to their mesh node id in "
+ "ascending order");
}
// for 1U, 2U, CXC, CXA type BHE
else
diff --git a/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp b/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp
index 43e06594027..c304174a32f 100644
--- a/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp
+++ b/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp
@@ -382,8 +382,8 @@ void HydroMechanicsProcess<DisplacementDim>::
if (_use_monolithic_scheme)
{
DBUG(
- "Assemble the Jacobian of HydroMechanics for the monolithic"
- " scheme.");
+ "Assemble the Jacobian of HydroMechanics for the monolithic "
+ "scheme.");
dof_tables.emplace_back(*_local_to_global_index_map);
}
else
diff --git a/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp b/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp
index 466082801e3..4f79279a69a 100644
--- a/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp
+++ b/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp
@@ -78,8 +78,7 @@ std::unique_ptr<Process> createHydroMechanicsProcess(
{
OGS_FATAL(
"Could not find process variable '{:s}' in the provided "
- "variables "
- "list for config tag <{:s}>.",
+ "variables list for config tag <{:s}>.",
pv_name, "process_variable");
}
DBUG("Found process variable '{:s}' for config tag <{:s}>.",
@@ -90,8 +89,8 @@ std::unique_ptr<Process> createHydroMechanicsProcess(
{
OGS_FATAL(
"Number of components of the process variable '{:s}' is "
- "different "
- "from the displacement dimension: got {:d}, expected {:d}",
+ "different from the displacement dimension: got {:d}, expected "
+ "{:d}",
variable->getName(),
variable->getNumberOfGlobalComponents(),
GlobalDim);
diff --git a/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.cpp b/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.cpp
index 2160d28b039..9f74d56d3a4 100644
--- a/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.cpp
+++ b/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.cpp
@@ -494,8 +494,7 @@ void HydroMechanicsProcess<GlobalDim>::postTimestepConcreteProcess(
if (it == pvs.end())
{
OGS_FATAL(
- "Didn't find expected 'displacement_jump1' process "
- "variable.");
+ "Didn't find expected 'displacement_jump1' process variable.");
}
g_variable_id = static_cast<int>(std::distance(pvs.begin(), it));
}
diff --git a/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.cpp b/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.cpp
index 89b644f2b78..fdf824e4127 100644
--- a/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.cpp
+++ b/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.cpp
@@ -169,8 +169,7 @@ std::unique_ptr<Process> createSmallDeformationProcess(
{
OGS_FATAL(
"The number of displacement jumps and the number of "
- "<fracture_properties> "
- "are not consistent");
+ "<fracture_properties> are not consistent");
}
// Reference temperature
diff --git a/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp
index 3c14d7368a7..a6186f4f643 100644
--- a/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp
+++ b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp
@@ -58,8 +58,7 @@ SmallDeformationProcess<DisplacementDim>::SmallDeformationProcess(
{
OGS_FATAL(
"The number of the given fracture properties ({:d}) are not "
- "consistent"
- " with the number of fracture groups in a mesh ({:d}).",
+ "consistent with the number of fracture groups in a mesh ({:d}).",
_process_data.fracture_properties.size(),
_vec_fracture_mat_IDs.size());
}
diff --git a/ProcessLib/LocalAssemblerInterface.cpp b/ProcessLib/LocalAssemblerInterface.cpp
index ecb95106f95..e83130a6db3 100644
--- a/ProcessLib/LocalAssemblerInterface.cpp
+++ b/ProcessLib/LocalAssemblerInterface.cpp
@@ -68,8 +68,7 @@ void LocalAssemblerInterface::assembleWithJacobianForStaggeredScheme(
{
OGS_FATAL(
"The assembleWithJacobianForStaggeredScheme() function is not "
- "implemented in"
- " the local assembler.");
+ "implemented in the local assembler.");
}
void LocalAssemblerInterface::computeSecondaryVariable(
diff --git a/ProcessLib/Output/CreateOutput.cpp b/ProcessLib/Output/CreateOutput.cpp
index 9e02560bff8..c93ad98f6ba 100644
--- a/ProcessLib/Output/CreateOutput.cpp
+++ b/ProcessLib/Output/CreateOutput.cpp
@@ -86,8 +86,8 @@ std::unique_ptr<Output> createOutput(
{
OGS_FATAL(
"You have not given any pair (<repeat/>, <each_steps/>) that "
- "defines"
- " at which timesteps output shall be written. Aborting.");
+ "defines at which timesteps output shall be written. "
+ "Aborting.");
}
}
else
diff --git a/ProcessLib/Output/IntegrationPointWriter.cpp b/ProcessLib/Output/IntegrationPointWriter.cpp
index c18fe54ab9a..4494b4a5346 100644
--- a/ProcessLib/Output/IntegrationPointWriter.cpp
+++ b/ProcessLib/Output/IntegrationPointWriter.cpp
@@ -112,9 +112,9 @@ IntegrationPointMetaData getIntegrationPointMetaData(MeshLib::Mesh const& mesh,
"IntegrationPointMetaData"))
{
OGS_FATAL(
- "Integration point data '{:s}' is present in the vtk field "
- "data but the required 'IntegrationPointMetaData' array "
- "is not available.",
+ "Integration point data '{:s}' is present in the vtk field data "
+ "but the required 'IntegrationPointMetaData' array is not "
+ "available.",
name);
}
auto const& mesh_property_ip_meta_data =
diff --git a/ProcessLib/Output/Output.cpp b/ProcessLib/Output/Output.cpp
index 4dc9ace8fd0..8249b314ba9 100644
--- a/ProcessLib/Output/Output.cpp
+++ b/ProcessLib/Output/Output.cpp
@@ -40,8 +40,8 @@ int convertVtkDataMode(std::string const& data_mode)
return 2;
}
OGS_FATAL(
- "Unsupported vtk output file data mode '{:s}'. Expected Ascii, "
- "Binary, or Appended.",
+ "Unsupported vtk output file data mode '{:s}'. Expected Ascii, Binary, "
+ "or Appended.",
data_mode);
}
@@ -166,8 +166,8 @@ MeshLib::IO::PVDFile* Output::findPVDFile(
if (pvd_file == nullptr)
{
OGS_FATAL(
- "The given process is not contained in the output"
- " configuration. Aborting.");
+ "The given process is not contained in the output configuration. "
+ "Aborting.");
}
return pvd_file;
diff --git a/ProcessLib/Output/ProcessOutput.cpp b/ProcessLib/Output/ProcessOutput.cpp
index b207a96da18..1a82f4e16ba 100644
--- a/ProcessLib/Output/ProcessOutput.cpp
+++ b/ProcessLib/Output/ProcessOutput.cpp
@@ -71,8 +71,8 @@ static void addSecondaryVariableNodes(
if (nodal_values_mesh.size() != global_vector_size)
{
OGS_FATAL(
- "Secondary variable `{:s}' did not evaluate to the right "
- "number of components. Expected: {:d}, actual: {:d}.",
+ "Secondary variable `{:s}' did not evaluate to the right number of "
+ "components. Expected: {:d}, actual: {:d}.",
var.name, nodal_values_mesh.size(), global_vector_size);
}
@@ -104,8 +104,7 @@ static void addSecondaryVariableResiduals(
{
OGS_FATAL(
"Cell property `{:s}' does not have the right number of "
- "components. "
- "Expected: {:d}, actual: {:d}",
+ "components. Expected: {:d}, actual: {:d}",
property_name_res,
mesh.getNumberOfElements() * var.fcts.num_components,
residuals_mesh.size());
diff --git a/ProcessLib/PhaseField/CreatePhaseFieldProcess.cpp b/ProcessLib/PhaseField/CreatePhaseFieldProcess.cpp
index bf25f2fd238..77cad62bb23 100644
--- a/ProcessLib/PhaseField/CreatePhaseFieldProcess.cpp
+++ b/ProcessLib/PhaseField/CreatePhaseFieldProcess.cpp
@@ -96,8 +96,7 @@ std::unique_ptr<Process> createPhaseFieldProcess(
{
OGS_FATAL(
"Phasefield process variable '{:s}' is not a scalar variable but "
- "has "
- "{:d} components.",
+ "has {:d} components.",
variable_ph->getName(),
variable_ph->getNumberOfGlobalComponents());
}
@@ -178,8 +177,8 @@ std::unique_ptr<Process> createPhaseFieldProcess(
((*crack_scheme != "propagating") && (*crack_scheme != "static")))
{
OGS_FATAL(
- "hydro_crack_scheme must be 'propagating' or 'static' but "
- "'{:s}' was given",
+ "hydro_crack_scheme must be 'propagating' or 'static' but '{:s}' "
+ "was given",
crack_scheme->c_str());
}
diff --git a/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalProcess.cpp b/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalProcess.cpp
index 2321364c6a8..e931b4f186e 100644
--- a/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalProcess.cpp
+++ b/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalProcess.cpp
@@ -168,8 +168,7 @@ void SmallDeformationNonlocalProcess<DisplacementDim>::
{
OGS_FATAL(
"Different number of components in meta data ({:d}) than "
- "in "
- "the integration point field data for '{:s}': {:d}.",
+ "in the integration point field data for '{:s}': {:d}.",
ip_meta_data.n_components, name,
mesh_property.getNumberOfGlobalComponents());
}
diff --git a/ProcessLib/SourceTerms/CreateSourceTerm.cpp b/ProcessLib/SourceTerms/CreateSourceTerm.cpp
index efda2ba4875..a31c1ce3770 100644
--- a/ProcessLib/SourceTerms/CreateSourceTerm.cpp
+++ b/ProcessLib/SourceTerms/CreateSourceTerm.cpp
@@ -48,16 +48,15 @@ std::unique_ptr<SourceTerm> createSourceTerm(
.template existsPropertyVector<std::size_t>("bulk_node_ids"))
{
OGS_FATAL(
- "The required bulk node ids map does not exist in the "
- "source term mesh '{:s}'.",
+ "The required bulk node ids map does not exist in the source term "
+ "mesh '{:s}'.",
source_term_mesh.getName());
}
std::vector<MeshLib::Node*> const& source_term_nodes =
source_term_mesh.getNodes();
DBUG(
"Found {:d} nodes for source term at mesh '{:s}' for the variable {:d} "
- "and "
- "component {:d}",
+ "and component {:d}",
source_term_nodes.size(), source_term_mesh.getName(), variable_id,
*config.component_id);
diff --git a/ProcessLib/SourceTerms/Python/CreatePythonSourceTerm.cpp b/ProcessLib/SourceTerms/Python/CreatePythonSourceTerm.cpp
index 0124cc52c19..b795463fb09 100644
--- a/ProcessLib/SourceTerms/Python/CreatePythonSourceTerm.cpp
+++ b/ProcessLib/SourceTerms/Python/CreatePythonSourceTerm.cpp
@@ -45,8 +45,7 @@ std::unique_ptr<SourceTerm> createPythonSourceTerm(
{
OGS_FATAL(
"Function `{:s}' is not defined in the python script file, or "
- "there "
- "was no python script file specified.",
+ "there was no python script file specified.",
source_term_object);
}
diff --git a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.cpp b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.cpp
index 25f5daf2bf5..c8b90137c51 100644
--- a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.cpp
+++ b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.cpp
@@ -270,8 +270,8 @@ void ThermoHydroMechanicsProcess<DisplacementDim>::
if (_use_monolithic_scheme)
{
DBUG(
- "Assemble the Jacobian of ThermoHydroMechanics for the monolithic"
- " scheme.");
+ "Assemble the Jacobian of ThermoHydroMechanics for the monolithic "
+ "scheme.");
dof_tables.emplace_back(*_local_to_global_index_map);
}
else
diff --git a/ProcessLib/ThermoMechanicalPhaseField/CreateThermoMechanicalPhaseFieldProcess.cpp b/ProcessLib/ThermoMechanicalPhaseField/CreateThermoMechanicalPhaseFieldProcess.cpp
index 915053b2001..d9b146d4f00 100644
--- a/ProcessLib/ThermoMechanicalPhaseField/CreateThermoMechanicalPhaseFieldProcess.cpp
+++ b/ProcessLib/ThermoMechanicalPhaseField/CreateThermoMechanicalPhaseFieldProcess.cpp
@@ -96,8 +96,7 @@ std::unique_ptr<Process> createThermoMechanicalPhaseFieldProcess(
{
OGS_FATAL(
"Phasefield process variable '{:s}' is not a scalar variable but "
- "has "
- "{:d} components.",
+ "has {:d} components.",
variable_ph->getName(),
variable_ph->getNumberOfGlobalComponents());
}
@@ -108,8 +107,7 @@ std::unique_ptr<Process> createThermoMechanicalPhaseFieldProcess(
{
OGS_FATAL(
"Temperature process variable '{:s}' is not a scalar variable but "
- "has "
- "{:d} components.",
+ "has {:d} components.",
variable_T->getName(),
variable_T->getNumberOfGlobalComponents());
}
diff --git a/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess.cpp b/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess.cpp
index e8b1180c320..d8d1a1cc85d 100644
--- a/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess.cpp
+++ b/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess.cpp
@@ -222,26 +222,21 @@ void ThermoMechanicalPhaseFieldProcess<DisplacementDim>::
{
DBUG(
"Assemble the Jacobian equations of "
- "temperature-deformation in "
- "ThermoMechanicalPhaseFieldProcess for "
+ "temperature-deformation in ThermoMechanicalPhaseFieldProcess for "
"the staggered scheme.");
}
if (process_id == _phase_field_process_id)
{
DBUG(
- "Assemble the Jacobian equations of"
- "phase field in "
- "ThermoMechanicalPhaseFieldProcess for "
- "the staggered scheme.");
+ "Assemble the Jacobian equations ofphase field in "
+ "ThermoMechanicalPhaseFieldProcess for the staggered scheme.");
}
else
{
DBUG(
- "Assemble the Jacobian equations of "
- "heat conduction in "
- "ThermoMechanicalPhaseFieldProcess for "
- "the staggered scheme.");
+ "Assemble the Jacobian equations of heat conduction in "
+ "ThermoMechanicalPhaseFieldProcess for the staggered scheme.");
}
dof_tables.emplace_back(
getDOFTableByProcessID(_heat_conduction_process_id));
diff --git a/ProcessLib/ThermoRichardsMechanics/ThermoRichardsMechanicsProcess.cpp b/ProcessLib/ThermoRichardsMechanics/ThermoRichardsMechanicsProcess.cpp
index 20f982c1c81..ca869e11e62 100644
--- a/ProcessLib/ThermoRichardsMechanics/ThermoRichardsMechanicsProcess.cpp
+++ b/ProcessLib/ThermoRichardsMechanics/ThermoRichardsMechanicsProcess.cpp
@@ -397,8 +397,8 @@ void ThermoRichardsMechanicsProcess<DisplacementDim>::assembleConcreteProcess(
{
OGS_FATAL(
"The Picard method or the Newton-Raphson method with numerical "
- "Jacobian is not implemented for ThermoRichardsMechanics with "
- "the full monolithic coupling scheme");
+ "Jacobian is not implemented for ThermoRichardsMechanics with the full "
+ "monolithic coupling scheme");
}
template <int DisplacementDim>
@@ -413,9 +413,8 @@ void ThermoRichardsMechanicsProcess<DisplacementDim>::
dof_tables;
DBUG(
- "Assemble the Jacobian of ThermoRichardsMechanics for the "
- "monolithic"
- " scheme.");
+ "Assemble the Jacobian of ThermoRichardsMechanics for the monolithic "
+ "scheme.");
dof_tables.emplace_back(*_local_to_global_index_map);
ProcessLib::ProcessVariable const& pv = getProcessVariables(process_id)[0];
@@ -457,9 +456,7 @@ void ThermoRichardsMechanicsProcess<DisplacementDim>::
GlobalVector const& x_dot,
int const process_id)
{
- DBUG(
- "Compute the secondary variables for "
- "ThermoRichardsMechanicsProcess.");
+ DBUG("Compute the secondary variables for ThermoRichardsMechanicsProcess.");
auto const dof_tables = getDOFTables(x.size());
diff --git a/ProcessLib/TimeLoop.cpp b/ProcessLib/TimeLoop.cpp
index 8efa0c1a4be..d7e5947d2c2 100644
--- a/ProcessLib/TimeLoop.cpp
+++ b/ProcessLib/TimeLoop.cpp
@@ -468,8 +468,8 @@ double TimeLoop::computeTimeStepping(const double prev_dt, double& t,
OGS_FATAL(
"The new step size of {:g} is the same as that of the previous "
"rejected time step. \nPlease re-run ogs with a proper "
- "adjustment in the numerical settings, \ne.g those for "
- "time stepper, local or global non-linear solver.",
+ "adjustment in the numerical settings, \ne.g those for time "
+ "stepper, local or global non-linear solver.",
dt);
}
else
@@ -507,8 +507,8 @@ double TimeLoop::computeTimeStepping(const double prev_dt, double& t,
std::numeric_limits<double>::epsilon())
{
WARN(
- "Time step {:d} was rejected {:d} times "
- "and it will be repeated with a reduced step size.",
+ "Time step {:d} was rejected {:d} times and it will be "
+ "repeated with a reduced step size.",
accepted_steps + 1, _repeating_times_of_rejected_step);
MathLib::LinAlg::copy(x_prev, x); // popState
}
@@ -794,8 +794,8 @@ TimeLoop::solveCoupledEquationSystemsByStaggeredScheme(
process_data->nonlinear_solver_status = nonlinear_solver_status;
INFO(
- "[time] Solving process #{:d} took {:g} s in time step #{:d} "
- " coupling iteration #{:d}",
+ "[time] Solving process #{:d} took {:g} s in time step #{:d} "
+ "coupling iteration #{:d}",
process_id, time_timestep_process.elapsed(), timestep_id,
global_coupling_iteration);
@@ -844,7 +844,7 @@ TimeLoop::solveCoupledEquationSystemsByStaggeredScheme(
if (!coupling_iteration_converged)
{
WARN(
- "The coupling iterations reaches its maximum number in time step"
+ "The coupling iterations reaches its maximum number in time step "
"#{:d} at t = {:g} s",
timestep_id, t);
}
diff --git a/Tests/BaseLib/TestgetParenthesizedString.cpp b/Tests/BaseLib/TestgetParenthesizedString.cpp
index 1381e875735..b7b68c139dd 100644
--- a/Tests/BaseLib/TestgetParenthesizedString.cpp
+++ b/Tests/BaseLib/TestgetParenthesizedString.cpp
@@ -36,9 +36,7 @@ auto random_generator() -> T
auto generate_random_alphanumeric_string(std::size_t len) -> std::string
{
static constexpr auto chars =
- "123456788"
- "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
- "abcdefghijklmnopqrstuvwxyz";
+ "123456788ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
thread_local auto rng = random_generator<>();
auto dist = std::uniform_int_distribution{{}, std::strlen(chars)};
diff --git a/Tests/MaterialLib/TestMPLSoilThermalConductivitySomerton.cpp b/Tests/MaterialLib/TestMPLSoilThermalConductivitySomerton.cpp
index be08a96c100..5e3992d62de 100644
--- a/Tests/MaterialLib/TestMPLSoilThermalConductivitySomerton.cpp
+++ b/Tests/MaterialLib/TestMPLSoilThermalConductivitySomerton.cpp
@@ -111,8 +111,8 @@ TEST(MaterialPropertyLib, SoilThermalConductivitySomerton1D)
<< "for expected derivative of thermal conductivity with "
"respect to saturation "
<< 0.0
- << " and for computed derivative of thermal conductivity "
- "with respect to saturation."
+ << " and for computed derivative of thermal conductivity with "
+ "respect to saturation."
<< computed_dk_T_dS;
}
}
@@ -132,11 +132,11 @@ TEST(MaterialPropertyLib, SoilThermalConductivitySomerton1D)
pos, t, dt);
ASSERT_LE(std::fabs(0.0 - computed_dk_T_dS), 1e-10)
- << "for expected derivative of thermal conductivity with "
- "respect to saturation "
+ << "for expected derivative of thermal conductivity with respect "
+ "to saturation "
<< 0.0
- << " and for computed derivative of thermal conductivity "
- "with respect to saturation."
+ << " and for computed derivative of thermal conductivity with "
+ "respect to saturation."
<< computed_dk_T_dS;
}
@@ -176,11 +176,11 @@ TEST(MaterialPropertyLib, SoilThermalConductivitySomerton1D)
pos, t, dt);
ASSERT_LE(std::fabs(analytic_dk_T_dS - approximated_dk_T_dS), 1e-5)
- << "for expected derivative of thermal conductivity with "
- "respect to saturation "
+ << "for expected derivative of thermal conductivity with respect "
+ "to saturation "
<< analytic_dk_T_dS
- << " and for computed derivative of thermal conductivity "
- "with respect to saturation."
+ << " and for computed derivative of thermal conductivity with "
+ "respect to saturation."
<< approximated_dk_T_dS;
}
}
@@ -282,8 +282,8 @@ TEST(MaterialPropertyLib, SoilThermalConductivitySomerton3D)
<< "for expected derivative of thermal conductivity with "
"respect to saturation "
<< 0.0
- << " and for computed derivative of thermal conductivity "
- "with respect to saturation."
+ << " and for computed derivative of thermal conductivity with "
+ "respect to saturation."
<< computed_dk_T_dS(k, k);
}
}
@@ -335,8 +335,8 @@ TEST(MaterialPropertyLib, SoilThermalConductivitySomerton3D)
<< "for expected derivative of thermal conductivity with "
"respect to saturation "
<< analytic_dk_T_dS(k, k)
- << " and for computed derivative of thermal conductivity "
- "with respect to saturation."
+ << " and for computed derivative of thermal conductivity with "
+ "respect to saturation."
<< approximated_dk_T_dS;
}
}
diff --git a/Tests/MaterialLib/TestMPLWaterVapourDensity.cpp b/Tests/MaterialLib/TestMPLWaterVapourDensity.cpp
index 113c1685d1f..ad4c1fe8c45 100644
--- a/Tests/MaterialLib/TestMPLWaterVapourDensity.cpp
+++ b/Tests/MaterialLib/TestMPLWaterVapourDensity.cpp
@@ -87,8 +87,8 @@ TEST(MaterialPropertyLib, WaterVapourDensity)
<< "for expected derivative of water vapour density with "
"respect to temperature "
<< approximated_drho_wv_dT
- << " and for computed derivative of water vapour density "
- "with respect to temperature."
+ << " and for computed derivative of water vapour density with "
+ "respect to temperature."
<< analytic_drho_wv_dT;
}
}
diff --git a/Tests/MaterialLib/TestMPLWaterVapourLatentHeat.cpp b/Tests/MaterialLib/TestMPLWaterVapourLatentHeat.cpp
index b07370e4310..0e48936e1cd 100644
--- a/Tests/MaterialLib/TestMPLWaterVapourLatentHeat.cpp
+++ b/Tests/MaterialLib/TestMPLWaterVapourLatentHeat.cpp
@@ -73,8 +73,8 @@ TEST(MaterialPropertyLib, LinearWaterVapourLatentHeat)
<< "for expected derivative of water vapour latent heat with "
"respect to temperature "
<< approximated_dLw_dT
- << " and for computed derivative of water vapour latent heat "
- "with respect to temperature."
+ << " and for computed derivative of water vapour latent heat with "
+ "respect to temperature."
<< analytic_dLw_dT;
}
}
diff --git a/Tests/ParameterLib/Parameter.cpp b/Tests/ParameterLib/Parameter.cpp
index 96bd0845365..28e45c7b1b7 100644
--- a/Tests/ParameterLib/Parameter.cpp
+++ b/Tests/ParameterLib/Parameter.cpp
@@ -137,8 +137,7 @@ bool testNodalValuesOfElement(
if (expected_value != nodal_values(i, 0))
{
ERR("Mismatch for element {:d}, node {:d}; Expected {:g}, "
- "got "
- "{:g}.",
+ "got {:g}.",
e->getID(), i, expected_value, nodal_values(i, 0));
return false;
}
--
GitLab