diff --git a/Applications/ApplicationsLib/ProjectData.cpp b/Applications/ApplicationsLib/ProjectData.cpp index e4ff5913c6a6eee165483282a8887265761645d3..0bfce5b82ab3533c7441b227d4c437a674d3618b 100644 --- a/Applications/ApplicationsLib/ProjectData.cpp +++ b/Applications/ApplicationsLib/ProjectData.cpp @@ -107,7 +107,7 @@ namespace { void readGeometry(std::string const& fname, GeoLib::GEOObjects& geo_objects) { - DBUG("Reading geometry file \'%s\'.", fname.c_str()); + DBUG("Reading geometry file '%s'.", fname.c_str()); GeoLib::IO::BoostXmlGmlInterface gml_reader(geo_objects); gml_reader.readFile(fname); } @@ -118,13 +118,13 @@ std::unique_ptr<MeshLib::Mesh> readSingleMesh( { std::string const mesh_file = BaseLib::copyPathToFileName( mesh_config_parameter.getValue<std::string>(), project_directory); - DBUG("Reading mesh file \'%s\'.", mesh_file.c_str()); + DBUG("Reading mesh file '%s'.", mesh_file.c_str()); auto mesh = std::unique_ptr<MeshLib::Mesh>( MeshLib::IO::readMeshFromFile(mesh_file)); if (!mesh) { - OGS_FATAL("Could not read mesh from \'%s\' file. No mesh added.", + OGS_FATAL("Could not read mesh from '%s' file. No mesh added.", mesh_file.c_str()); } diff --git a/Applications/DataExplorer/DataView/GEOModels.cpp b/Applications/DataExplorer/DataView/GEOModels.cpp index bf39ea980dc65ee89af3d8839acd4c0fd3486ed5..6ff35f546f0d77e5b0f44d2ae89bcea9ab4fbcfd 100644 --- a/Applications/DataExplorer/DataView/GEOModels.cpp +++ b/Applications/DataExplorer/DataView/GEOModels.cpp @@ -70,7 +70,8 @@ void GEOModels::updateGeometry(const std::string &geo_name) } } else - ERR("GEOModels::updateGeometry() - Geometry \"%s\" not found.", geo_name.c_str()); + ERR("GEOModels::updateGeometry() - Geometry '%s' not found.", + geo_name.c_str()); } void GEOModels::removeGeometry(std::string const& geo_name, diff --git a/Applications/DataExplorer/DataView/GeoTreeModel.cpp b/Applications/DataExplorer/DataView/GeoTreeModel.cpp index 34c16e1bf5a82d9894ee25d6617d705914dfd895..03c62aeeee32f47f66d93914a7aec3172f9ed908 100644 --- a/Applications/DataExplorer/DataView/GeoTreeModel.cpp +++ b/Applications/DataExplorer/DataView/GeoTreeModel.cpp @@ -73,7 +73,8 @@ void GeoTreeModel::addPointList(QString geoName, GeoLib::PointVec const& pointVe for (auto pnt = pointVec.getNameIDMapBegin(); pnt != pointVec.getNameIDMapEnd(); ++pnt) QVariant pnt_data (pointList->child(pnt->second)->setData(4, QString::fromStdString(pnt->first))); - INFO("Geometry \"%s\" built. %d points added.", geoName.toStdString().c_str(), nPoints); + INFO("Geometry '%s' built. %d points added.", geoName.toStdString().c_str(), + nPoints); endResetModel(); } @@ -92,7 +93,9 @@ void GeoTreeModel::addPolylineList(QString geoName, GeoLib::PolylineVec const& p if (geo == nullptr) { - ERR("GeoTreeModel::addPolylineList(): No corresponding geometry for \"%s\" found.", geoName.toStdString().c_str()); + ERR("GeoTreeModel::addPolylineList(): No corresponding geometry for " + "'%s' found.", + geoName.toStdString().c_str()); return; } @@ -182,7 +185,9 @@ void GeoTreeModel::addSurfaceList(QString geoName, GeoLib::SurfaceVec const& sur if (geo == nullptr) { - ERR("GeoTreeModel::addSurfaceList(): No corresponding geometry for \"%s\" found.", geoName.toStdString().c_str()); + ERR("GeoTreeModel::addSurfaceList(): No corresponding geometry for " + "'%s' found.", + geoName.toStdString().c_str()); return; } diff --git a/Applications/DataExplorer/DataView/MeshLayerEditDialog.cpp b/Applications/DataExplorer/DataView/MeshLayerEditDialog.cpp index e3e664ff4e4138a46791597c93c5e8417f8fb798..fb45cf004efeb26cb0f1b076f3373b68ee380750 100644 --- a/Applications/DataExplorer/DataView/MeshLayerEditDialog.cpp +++ b/Applications/DataExplorer/DataView/MeshLayerEditDialog.cpp @@ -259,7 +259,8 @@ void MeshLayerEditDialog::accept() { if (this->_edits.isEmpty()) { - OGSError::box("Please specifiy the number and\n type of layers and press \"Next\""); + OGSError::box( + "Please specifiy the number and\n type of layers and press 'Next'"); return; } diff --git a/Applications/DataExplorer/DataView/MshEditDialog.cpp b/Applications/DataExplorer/DataView/MshEditDialog.cpp index 3ff4fe37a59a555412406d2a0a1982a3c9a5691c..03f826e88dc7cb695cf94c3edf9299bee7eeb2b7 100644 --- a/Applications/DataExplorer/DataView/MshEditDialog.cpp +++ b/Applications/DataExplorer/DataView/MshEditDialog.cpp @@ -32,7 +32,7 @@ MshEditDialog::MshEditDialog(const MeshLib::Mesh* mesh, QDialog* parent) _msh(mesh), _noDataDeleteBox(nullptr), _nLayerLabel(new QLabel("Please specify the number of layers to add:")), - _nLayerExplanation(new QLabel("(select \"0\" for surface mapping)")), + _nLayerExplanation(new QLabel("(select '0' for surface mapping)")), _layerEdit(new QLineEdit("0")), _nextButton(new QPushButton("Next")), _layerBox(nullptr), @@ -237,7 +237,8 @@ void MshEditDialog::accept() OGSError::box("Please specifiy raster files for all layers."); } else - OGSError::box("Please specifiy the number and\n type of layers and press \"Next\""); + OGSError::box( + "Please specifiy the number and\n type of layers and press 'Next'"); } void MshEditDialog::reject() diff --git a/Applications/DataExplorer/VtkVis/VtkStationSource.cpp b/Applications/DataExplorer/VtkVis/VtkStationSource.cpp index 6802a1a568b145b8f60a7fd68640af83d2b18d18..d2f6521e2a95c6be94d077c8002614d9f916c69d 100644 --- a/Applications/DataExplorer/VtkVis/VtkStationSource.cpp +++ b/Applications/DataExplorer/VtkVis/VtkStationSource.cpp @@ -210,7 +210,7 @@ std::size_t VtkStationSource::GetIndexByName( std::string const& name ) } vtkIdType new_index = (_id_map.empty()) ? 0 : (max_key+1); - INFO("Key \"%s\" has been assigned index %d.", name.c_str(), new_index); + INFO("Key '%s' has been assigned index %d.", name.c_str(), new_index); _id_map.insert(std::pair<std::string, vtkIdType>(name, new_index)); return new_index; } diff --git a/Applications/DataExplorer/VtkVis/VtkVisPipelineItem.cpp b/Applications/DataExplorer/VtkVis/VtkVisPipelineItem.cpp index df0ace5c3221791dc82d9db4366453bef3009c2d..c06a1571b2f0abfb54d65c040ca7e4c022db344c 100644 --- a/Applications/DataExplorer/VtkVis/VtkVisPipelineItem.cpp +++ b/Applications/DataExplorer/VtkVis/VtkVisPipelineItem.cpp @@ -148,8 +148,8 @@ int VtkVisPipelineItem::writeToFile(const std::string &filename) const QMessageBox::warning( nullptr, "Conversion to FBX not possible", "It is not possible to convert an vtkImageData based object \ - to FBX. If you want to convert raster data import it via \" \ - File / Import / Raster Files as PolyData\"!"); + to FBX. If you want to convert raster data import it via ' \ + File / Import / Raster Files as PolyData'!"); return 0; } #endif // VTKFBXCONVERTER_FOUND diff --git a/Applications/DataHolderLib/Color.cpp b/Applications/DataHolderLib/Color.cpp index 73b7a9f554ca5b649730fb48f7560ad403bc04a8..22308b4e403139e83167b4abd799a3e7b234fb1b 100644 --- a/Applications/DataHolderLib/Color.cpp +++ b/Applications/DataHolderLib/Color.cpp @@ -49,7 +49,7 @@ Color const getColor(const std::string &id, std::map<std::string, Color> &colors if (id == it->first) return it->second; } - WARN("Key \"%s\" not found in color lookup table.", id.c_str()); + WARN("Key '%s' not found in color lookup table.", id.c_str()); Color c = getRandomColor(); colors.insert(std::pair<std::string, Color>(id, c)); return c; diff --git a/Applications/FileIO/CsvInterface.cpp b/Applications/FileIO/CsvInterface.cpp index 99b3d5dd1d6038db728154c354494f1d1a5b057b..7d52c25bec6eda2dc90767d7d014e901d22d44a9 100644 --- a/Applications/FileIO/CsvInterface.cpp +++ b/Applications/FileIO/CsvInterface.cpp @@ -93,7 +93,8 @@ int CsvInterface::readPoints(std::string const& fname, char delim, for (std::size_t i=0; i<3; ++i) if (column_idx[i] == std::numeric_limits<std::size_t>::max()) { - ERR ("Column \"%s\" not found in file header.", column_names[i].c_str()); + ERR("Column '%s' not found in file header.", + column_names[i].c_str()); return -1; } diff --git a/Applications/FileIO/CsvInterface.h b/Applications/FileIO/CsvInterface.h index ac1502f5fd1f90efd04d44ce0119345ae57faa74..bd81ab0e527d33a44612816e0a487513b15bf546 100644 --- a/Applications/FileIO/CsvInterface.h +++ b/Applications/FileIO/CsvInterface.h @@ -157,7 +157,7 @@ public: std::size_t const column_idx = CsvInterface::findColumn(line, delim, column_name); if (column_idx == std::numeric_limits<std::size_t>::max()) { - ERR ("Column \"%s\" not found in file header.", column_name.c_str()); + ERR("Column '%s' not found in file header.", column_name.c_str()); return -1; } return readColumn<T>(in, delim, data_array, column_idx); diff --git a/Applications/FileIO/GMSInterface.cpp b/Applications/FileIO/GMSInterface.cpp index f2a2ace0a06dc585407ea4241fbf7bbd13a72687..9397aa984ce666a0ff62751d48a1c1244c9c9a0a 100644 --- a/Applications/FileIO/GMSInterface.cpp +++ b/Applications/FileIO/GMSInterface.cpp @@ -80,8 +80,10 @@ int GMSInterface::readBoreholesFromGMS(std::vector<GeoLib::Point*>* boreholes, depth = (*pnt)[2]; } else - WARN("GMSInterface::readBoreholeFromGMS(): Skipped layer \"%s\" in borehole \"%s\" because of thickness 0.0.", - sName.c_str(), cName.c_str()); + WARN( + "GMSInterface::readBoreholeFromGMS(): Skipped layer " + "'%s' in borehole '%s' because of thickness 0.0.", + sName.c_str(), cName.c_str()); } else // add new borehole { @@ -312,8 +314,10 @@ MeshLib::Mesh* GMSInterface::readGMS3DMMesh(const std::string &filename) continue; // skip because nodes have already been read else //default { - WARN("GMSInterface::readGMS3DMMesh() - Element type \"%s\" not recognised.", - element_id.c_str()); + WARN( + "GMSInterface::readGMS3DMMesh() - Element type '%s' not " + "recognised.", + element_id.c_str()); return nullptr; } } diff --git a/Applications/FileIO/PetrelInterface.cpp b/Applications/FileIO/PetrelInterface.cpp index 639003087bf470368e633173d6c36c20ddc8810f..57cf52b151b7ef53bec8729dbdb91fe235effc73 100644 --- a/Applications/FileIO/PetrelInterface.cpp +++ b/Applications/FileIO/PetrelInterface.cpp @@ -116,8 +116,10 @@ void PetrelInterface::readPetrelSurface(std::istream &in) idx++; } } else - WARN("PetrelInterface::readPetrelSurface(): problem reading petrel points from line\n\"%s\".", - line.c_str()); + WARN( + "PetrelInterface::readPetrelSurface(): problem reading petrel " + "points from line\n'%s'.", + line.c_str()); } void PetrelInterface::readPetrelWellTrace(std::istream &in) diff --git a/Applications/FileIO/SHPInterface.cpp b/Applications/FileIO/SHPInterface.cpp index ed4faa2346163c2aa5ba7d29e819b4a5a7337046..00d2eded9a0aa782de72c64559216ead15403983 100644 --- a/Applications/FileIO/SHPInterface.cpp +++ b/Applications/FileIO/SHPInterface.cpp @@ -274,7 +274,7 @@ bool SHPInterface::write2dMeshToSHP(const std::string &file_name, const MeshLib: SHPClose(hSHP); DBFClose(hDBF); - INFO ("Shape export of 2D mesh \"%s\" successful.", mesh.getName().c_str()); + INFO("Shape export of 2D mesh '%s' successful.", mesh.getName().c_str()); return true; } diff --git a/Applications/FileIO/SWMM/SWMMInterface.cpp b/Applications/FileIO/SWMM/SWMMInterface.cpp index b65907625eea6ce6d53bb62c45335959ed5c2536..46c89c8cbf90925580e47ffbe85411e35db6e528 100644 --- a/Applications/FileIO/SWMM/SWMMInterface.cpp +++ b/Applications/FileIO/SWMM/SWMMInterface.cpp @@ -606,7 +606,8 @@ bool SwmmInterface::readSubcatchments(std::ifstream &in, std::map< std::string, } if (sc.rain_gauge == std::numeric_limits<std::size_t>::max()) { - ERR ("Rain gauge for subcatchment \"%s\" not found.", split_str[0].c_str()); + ERR("Rain gauge for subcatchment '%s' not found.", + split_str[0].c_str()); return false; } @@ -614,7 +615,8 @@ bool SwmmInterface::readSubcatchments(std::ifstream &in, std::map< std::string, auto const it = name_id_map.find(split_str[2]); if (it == name_id_map.end()) { - ERR ("Outlet node for subcatchment \"%s\" not found.", split_str[0].c_str()); + ERR("Outlet node for subcatchment '%s' not found.", + split_str[0].c_str()); return false; } sc.outlet = it->second; @@ -828,7 +830,7 @@ bool SwmmInterface::matchSubcatchmentsWithPolygons(std::vector<GeoLib::Polyline* } if (found == false) { - ERR ("No match in subcatcments for outline \"%s\".", names[i].c_str()); + ERR("No match in subcatcments for outline '%s'.", names[i].c_str()); return false; } } @@ -980,7 +982,7 @@ bool SwmmInterface::addResultsToMesh(MeshLib::Mesh &mesh, SwmmObject const swmm_ MeshLib::getOrCreateMeshProperty<double>(mesh, vec_name, item_type, 1); if (!prop) { - ERR("Error fetching array \"%s\".", vec_name.c_str()); + ERR("Error fetching array '%s'.", vec_name.c_str()); return false; } std::copy(data.cbegin(), data.cend(), prop->begin()); @@ -1042,8 +1044,8 @@ std::vector<double> SwmmInterface::getArrayAtTimeStep(SwmmObject obj_type, std:: return data; } - INFO ("Fetching \"%s\"-data for time step %d...", - getArrayName(obj_type, var_idx, SWMM_Npolluts).c_str(), time_step); + INFO("Fetching '%s'-data for time step %d...", + getArrayName(obj_type, var_idx, SWMM_Npolluts).c_str(), time_step); for (std::size_t i=0; i<n_objects; ++i) { @@ -1200,7 +1202,8 @@ bool SwmmInterface::addRainGaugeTimeSeriesLocations(std::ifstream &in) for (auto const& stn : _rain_gauges) if (stn.second.empty()) - WARN ("No associated time series found for rain gauge \"%s\".", stn.first.getName().c_str()); + WARN("No associated time series found for rain gauge '%s'.", + stn.first.getName().c_str()); return true; } diff --git a/Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp b/Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp index 29fcbdf5439d34fa8bc7c1e75220f55ed62873ef..b35bce0a4487d83a5eb22deb197d6246491b3d31 100644 --- a/Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp +++ b/Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp @@ -349,7 +349,7 @@ bool XmlPrjInterface::write() geo_tag.appendChild(filename_text); } else - ERR("XmlGmlInterface::writeFile(): Error writing gml-file \"%s\".", + ERR("XmlGmlInterface::writeFile(): Error writing gml-file '%s'.", name.c_str()); } @@ -372,7 +372,7 @@ bool XmlPrjInterface::write() stn_tag.appendChild(filename_text); } else - ERR("XmlStnInterface::writeFile(): Error writing stn-file \"%s\".", + ERR("XmlStnInterface::writeFile(): Error writing stn-file '%s'.", name.c_str()); } diff --git a/Applications/Utils/FileConverter/TecPlotTools.cpp b/Applications/Utils/FileConverter/TecPlotTools.cpp index e0583076f3bbeefe94410993fdc94afcad0adaab..ce965a5970f5624ba714787b1008d7d643c439c7 100644 --- a/Applications/Utils/FileConverter/TecPlotTools.cpp +++ b/Applications/Utils/FileConverter/TecPlotTools.cpp @@ -112,7 +112,8 @@ bool dataCountError(std::string const& name, { if (current != total) { - ERR("Data rows found do not fit specified dimensions for section \"%s\".", name.c_str()); + ERR("Data rows found do not fit specified dimensions for section '%s'.", + name.c_str()); return true; } return false; @@ -205,7 +206,7 @@ int writeDataToMesh(std::string const& file_name, vec_names[i], MeshLib::MeshItemType::Cell, 1); if (!prop) { - ERR("Error creating array \"%s\".", vec_names[i].c_str()); + ERR("Error creating array '%s'.", vec_names[i].c_str()); return -5; } prop->reserve(scalars[i].size()); diff --git a/Applications/Utils/FileConverter/generateMatPropsFromMatID.cpp b/Applications/Utils/FileConverter/generateMatPropsFromMatID.cpp index 24d0743225f2ac032ea8c4c0ac9ffdddfa90f31b..028a73aab24bb81592e4ac2ec23bc697645f3ed9 100644 --- a/Applications/Utils/FileConverter/generateMatPropsFromMatID.cpp +++ b/Applications/Utils/FileConverter/generateMatPropsFromMatID.cpp @@ -57,7 +57,8 @@ int main (int argc, char* argv[]) if (!mesh) { - INFO("Could not read mesh from file \"%s\".", mesh_arg.getValue().c_str()); + INFO("Could not read mesh from file '%s'.", + mesh_arg.getValue().c_str()); return EXIT_FAILURE; } @@ -83,17 +84,17 @@ int main (int argc, char* argv[]) } else { - ERR("Could not create property \"%s\" file.", new_matname.c_str()); + ERR("Could not create property '%s' file.", new_matname.c_str()); return EXIT_FAILURE; } mesh->getProperties().removePropertyVector("MaterialIDs"); std::string const new_mshname(name + "_new.vtu"); - INFO("Writing mesh to file \"%s\".", new_mshname.c_str()); + INFO("Writing mesh to file '%s'.", new_mshname.c_str()); MeshLib::IO::writeMeshToFile(*mesh, new_mshname); - INFO("New files \"%s\" and \"%s\" written.", new_mshname.c_str(), + INFO("New files '%s' and '%s' written.", new_mshname.c_str(), new_matname.c_str()); return EXIT_SUCCESS; diff --git a/Applications/Utils/GeoTools/TriangulatePolyline.cpp b/Applications/Utils/GeoTools/TriangulatePolyline.cpp index 99cc3941cbe154edcdd220d9657fede65f92b825..fbe9dc26a3a9fb0ad5fc11e9784702ef57718cb1 100644 --- a/Applications/Utils/GeoTools/TriangulatePolyline.cpp +++ b/Applications/Utils/GeoTools/TriangulatePolyline.cpp @@ -86,7 +86,8 @@ int main(int argc, char *argv[]) // check if line exists if (line == nullptr) { - ERR ("No polyline found with name \"%s\". Aborting...", polyline_name.c_str()); + ERR("No polyline found with name '%s'. Aborting...", + polyline_name.c_str()); return EXIT_FAILURE; } diff --git a/Applications/Utils/MeshEdit/AddTopLayer.cpp b/Applications/Utils/MeshEdit/AddTopLayer.cpp index d7fcf3d995858ea5662a90c5f73819e0eb6c0940..16d8e060b51dce42e7a871203d8cdc21a2e54551 100644 --- a/Applications/Utils/MeshEdit/AddTopLayer.cpp +++ b/Applications/Utils/MeshEdit/AddTopLayer.cpp @@ -51,11 +51,11 @@ int main (int argc, char* argv[]) cmd.parse(argc, argv); - INFO("Reading mesh \"%s\" ... ", mesh_arg.getValue().c_str()); + INFO("Reading mesh '%s' ... ", mesh_arg.getValue().c_str()); auto subsfc_mesh = std::unique_ptr<MeshLib::Mesh>( MeshLib::IO::readMeshFromFile(mesh_arg.getValue())); if (!subsfc_mesh) { - ERR("Error reading mesh \"%s\".", mesh_arg.getValue().c_str()); + ERR("Error reading mesh '%s'.", mesh_arg.getValue().c_str()); return EXIT_FAILURE; } INFO("done."); @@ -67,7 +67,7 @@ int main (int argc, char* argv[]) return EXIT_FAILURE; } - INFO("Writing mesh \"%s\" ... ", mesh_out_arg.getValue().c_str()); + INFO("Writing mesh '%s' ... ", mesh_out_arg.getValue().c_str()); MeshLib::IO::writeMeshToFile(*result, mesh_out_arg.getValue()); INFO("done."); diff --git a/Applications/Utils/MeshEdit/CreateBoundaryConditionsAlongPolylines.cpp b/Applications/Utils/MeshEdit/CreateBoundaryConditionsAlongPolylines.cpp index 399296fe927cceb6ebadfeef810ef791f48bd21d..e3347f00eadc640827abee1170191ab408f97ae4 100644 --- a/Applications/Utils/MeshEdit/CreateBoundaryConditionsAlongPolylines.cpp +++ b/Applications/Utils/MeshEdit/CreateBoundaryConditionsAlongPolylines.cpp @@ -90,7 +90,7 @@ void writeBCsAndGeometry(GeoLib::GEOObjects& geometry_sets, std::string const& bc_type, bool write_gml) { if (write_gml) { - INFO("write points to \"%s.gml\".", geo_name.c_str()); + INFO("write points to '%s.gml'.", geo_name.c_str()); FileIO::writeGeometryToFile(geo_name, geometry_sets, out_fname+".gml"); } FileIO::writeGeometryToFile(geo_name, geometry_sets, out_fname+".gli"); @@ -168,12 +168,12 @@ int main (int argc, char* argv[]) cmd.parse(argc, argv); // *** read mesh - INFO("Reading mesh \"%s\" ... ", mesh_arg.getValue().c_str()); + INFO("Reading mesh '%s' ... ", mesh_arg.getValue().c_str()); std::unique_ptr<MeshLib::Mesh> subsurface_mesh( MeshLib::IO::readMeshFromFile(mesh_arg.getValue())); INFO("done."); - INFO("Extracting top surface of mesh \"%s\" ... ", - mesh_arg.getValue().c_str()); + INFO("Extracting top surface of mesh '%s' ... ", + mesh_arg.getValue().c_str()); const MathLib::Vector3 dir(0,0,-1); double const angle(90); std::unique_ptr<MeshLib::Mesh> surface_mesh( @@ -197,7 +197,7 @@ int main (int argc, char* argv[]) // *** get vector of polylines std::vector<GeoLib::Polyline*> const* plys(geometries.getPolylineVec(geo_name)); if (!plys) { - ERR("Could not get vector of polylines out of geometry \"%s\".", + ERR("Could not get vector of polylines out of geometry '%s'.", geo_name.c_str()); return EXIT_FAILURE; } diff --git a/Applications/Utils/MeshEdit/MapGeometryToMeshSurface.cpp b/Applications/Utils/MeshEdit/MapGeometryToMeshSurface.cpp index 9f01eca36aba3e035773fedd24e19a170e8c2ad5..76a4384c37f446eec1fd576aad82ec160db45aba 100644 --- a/Applications/Utils/MeshEdit/MapGeometryToMeshSurface.cpp +++ b/Applications/Utils/MeshEdit/MapGeometryToMeshSurface.cpp @@ -61,8 +61,8 @@ int main (int argc, char* argv[]) { GeoLib::IO::BoostXmlGmlInterface xml_io(geometries); if (xml_io.readFile(input_geometry_fname.getValue())) { - INFO("Read geometry from file \"%s\".", - input_geometry_fname.getValue().c_str()); + INFO("Read geometry from file '%s'.", + input_geometry_fname.getValue().c_str()); } else { return EXIT_FAILURE; } diff --git a/Applications/Utils/MeshEdit/MoveMesh.cpp b/Applications/Utils/MeshEdit/MoveMesh.cpp index 98c663436601479444f4c0936a93f444fe68443c..2f02f3387f675d4e093a0cc76ceb3cd0d7225e44 100644 --- a/Applications/Utils/MeshEdit/MoveMesh.cpp +++ b/Applications/Utils/MeshEdit/MoveMesh.cpp @@ -64,7 +64,7 @@ int main(int argc, char *argv[]) std::unique_ptr<MeshLib::Mesh> mesh(MeshLib::IO::readMeshFromFile(fname)); if (!mesh) { - ERR("Could not read mesh from file \"%s\".", fname.c_str()); + ERR("Could not read mesh from file '%s'.", fname.c_str()); return EXIT_FAILURE; } diff --git a/Applications/Utils/MeshEdit/ResetPropertiesInPolygonalRegion.cpp b/Applications/Utils/MeshEdit/ResetPropertiesInPolygonalRegion.cpp index e90c5a83484867d0b9e30125947a9bc4afb766cc..ee08889af29f865163eae8095364d7a0b23928de 100644 --- a/Applications/Utils/MeshEdit/ResetPropertiesInPolygonalRegion.cpp +++ b/Applications/Utils/MeshEdit/ResetPropertiesInPolygonalRegion.cpp @@ -90,7 +90,7 @@ int main (int argc, char* argv[]) // *** get vector of polylines GeoLib::PolylineVec const* plys(geometries.getPolylineVecObj(geo_name)); if (!plys) { - ERR("Could not get vector of polylines out of geometry \"%s\".", + ERR("Could not get vector of polylines out of geometry '%s'.", geo_name.c_str()); return EXIT_FAILURE; } @@ -100,7 +100,7 @@ int main (int argc, char* argv[]) plys->getElementByName(polygon_name_arg.getValue()) ); if (! ply) { - ERR("Polyline \"%s\" not found.", polygon_name_arg.getValue().c_str()); + ERR("Polyline '%s' not found.", polygon_name_arg.getValue().c_str()); return EXIT_FAILURE; } @@ -108,8 +108,9 @@ int main (int argc, char* argv[]) bool closed (ply->isClosed()); if (!closed) { - ERR("Polyline \"%s\" is not closed, i.e. does not describe a\ - region.", polygon_name_arg.getValue().c_str()); + ERR("Polyline '%s' is not closed, i.e. does not describe a\ + region.", + polygon_name_arg.getValue().c_str()); return EXIT_FAILURE; } diff --git a/Applications/Utils/MeshEdit/UnityPreprocessing.cpp b/Applications/Utils/MeshEdit/UnityPreprocessing.cpp index 7ccda7ffb2becc3a3d32d8aec8ef026b68892a36..18ad3ddbdad563b19c2247521d0d8e759be4ed91 100644 --- a/Applications/Utils/MeshEdit/UnityPreprocessing.cpp +++ b/Applications/Utils/MeshEdit/UnityPreprocessing.cpp @@ -66,7 +66,7 @@ bool fillPropVec(MeshLib::Properties const& props, MeshLib::PropertyVector<T> const*const vec = props.getPropertyVector<T>(name); if (vec->getNumberOfComponents() != 1) { - INFO("Ignoring array \"%s\" (more than one component).", name.c_str()); + INFO("Ignoring array '%s' (more than one component).", name.c_str()); return false; } @@ -75,7 +75,8 @@ bool fillPropVec(MeshLib::Properties const& props, new_vec->resize(total_nodes); if (vec->getMeshItemType() == MeshLib::MeshItemType::Node) { - INFO("Migrating node array \"%s\" to new mesh structure...", name.c_str()); + INFO("Migrating node array '%s' to new mesh structure...", + name.c_str()); std::size_t const n_nodes (node_map.size()); for (std::size_t i = 0; i<n_nodes; ++i) { @@ -86,7 +87,7 @@ bool fillPropVec(MeshLib::Properties const& props, } else if (vec->getMeshItemType() == MeshLib::MeshItemType::Cell) { - INFO("Transforming cell array \"%s\" into node array...", name.c_str()); + INFO("Transforming cell array '%s' into node array...", name.c_str()); std::size_t const n_elems (vec->size()); for (std::size_t i = 0; i<n_elems; ++i) { @@ -178,7 +179,7 @@ int main (int argc, char* argv[]) cmd.parse(argc, argv); - INFO("Reading mesh \"%s\" ... ", mesh_arg.getValue().c_str()); + INFO("Reading mesh '%s' ... ", mesh_arg.getValue().c_str()); std::unique_ptr<MeshLib::Mesh> mesh {MeshLib::IO::readMeshFromFile(mesh_arg.getValue())}; if (!mesh) return EXIT_FAILURE; @@ -212,7 +213,7 @@ int main (int argc, char* argv[]) else INFO("No cell arrays found, keeping mesh structure.\n"); - INFO("Writing mesh \"%s\" ... ", mesh_out_arg.getValue().c_str()); + INFO("Writing mesh '%s' ... ", mesh_out_arg.getValue().c_str()); MeshLib::IO::VtuInterface writer(result.get(), vtkXMLWriter::Ascii, false); writer.writeToFile(mesh_out_arg.getValue()); INFO("done."); diff --git a/Applications/Utils/MeshEdit/appendLinesAlongPolyline.cpp b/Applications/Utils/MeshEdit/appendLinesAlongPolyline.cpp index f477f2d3687c22c62b9233204b532c29bcdb8a1e..dd636af7d39c45b1fd2dbafbee7bd708658860b2 100644 --- a/Applications/Utils/MeshEdit/appendLinesAlongPolyline.cpp +++ b/Applications/Utils/MeshEdit/appendLinesAlongPolyline.cpp @@ -64,7 +64,7 @@ int main (int argc, char* argv[]) const GeoLib::PolylineVec* ply_vec (geo_objs.getPolylineVecObj(geo_names[0])); if (!ply_vec) { - ERR("Could not find polylines in geometry \"%s\".", + ERR("Could not find polylines in geometry '%s'.", geo_names.front().c_str()); return EXIT_FAILURE; } @@ -73,7 +73,7 @@ int main (int argc, char* argv[]) MeshLib::Mesh const*const mesh (MeshLib::IO::readMeshFromFile(mesh_in.getValue())); if (!mesh) { - ERR("Mesh file \"%s\" not found", mesh_in.getValue().c_str()); + ERR("Mesh file '%s' not found", mesh_in.getValue().c_str()); return EXIT_FAILURE; } INFO("Mesh read: %d nodes, %d elements.", mesh->getNumberOfNodes(), mesh->getNumberOfElements()); diff --git a/Applications/Utils/MeshEdit/createLayeredMeshFromRasters.cpp b/Applications/Utils/MeshEdit/createLayeredMeshFromRasters.cpp index d6f626e8daa2eecac0ae02e6310e759c8ebb0fc0..a1cda76cadec3d67d62a7ba9a8e290df469cc3a8 100644 --- a/Applications/Utils/MeshEdit/createLayeredMeshFromRasters.cpp +++ b/Applications/Utils/MeshEdit/createLayeredMeshFromRasters.cpp @@ -101,10 +101,10 @@ int main (int argc, char* argv[]) } } - INFO("Reading mesh \"%s\" ... ", mesh_arg.getValue().c_str()); + INFO("Reading mesh '%s' ... ", mesh_arg.getValue().c_str()); std::unique_ptr<MeshLib::Mesh> const sfc_mesh (MeshLib::IO::readMeshFromFile(mesh_arg.getValue())); if (!sfc_mesh) { - ERR("Error reading mesh \"%s\".", mesh_arg.getValue().c_str()); + ERR("Error reading mesh '%s'.", mesh_arg.getValue().c_str()); return EXIT_FAILURE; } if (sfc_mesh->getDimension() != 2) { @@ -129,7 +129,7 @@ int main (int argc, char* argv[]) std::string output_name (mesh_out_arg.getValue()); if (!BaseLib::hasFileExtension("vtu", output_name)) output_name.append(".vtu"); - INFO("Writing mesh \"%s\" ... ", output_name.c_str()); + INFO("Writing mesh '%s' ... ", output_name.c_str()); MeshLib::IO::writeMeshToFile(*(mapper.getMesh("SubsurfaceMesh").release()), output_name); INFO("done."); diff --git a/Applications/Utils/MeshEdit/removeMeshElements.cpp b/Applications/Utils/MeshEdit/removeMeshElements.cpp index 36091a5da3fb209b3c40df8fd5928f0f7d2fbae1..df1094d822f08db7db5d5baa20a8cd639b3fb53d 100644 --- a/Applications/Utils/MeshEdit/removeMeshElements.cpp +++ b/Applications/Utils/MeshEdit/removeMeshElements.cpp @@ -177,7 +177,7 @@ int main (int argc, char* argv[]) if (property_name_arg.isSet() && !((min_property_arg.isSet() && max_property_arg.isSet()) || property_arg.isSet())) { - ERR("Specify a value or range (\"-min-value\" and \"-max_value\") " + 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 a62609cf2bad2163fff440a85c691e00badc5d43..bc7597f5adf93f6b5873312729594a3ce0182a62 100644 --- a/Applications/Utils/MeshEdit/swapNodeCoordinateAxes.cpp +++ b/Applications/Utils/MeshEdit/swapNodeCoordinateAxes.cpp @@ -55,7 +55,8 @@ static bool parseNewOrder(std::string const& str_order, std::array<int, 3> &new_ else if (str_order[i] == 'z') new_axes_indices[i] = 2; else { - ERR("Invalid argument for the new order. The given argument contains a character other than \"x\", \"y\", \"z\"."); + ERR("Invalid argument for the new order. The given argument " + "contains a character other than 'x', 'y', 'z'."); return false; } } @@ -90,9 +91,11 @@ int main(int argc, char *argv[]) cmd.add( input_arg ); TCLAP::ValueArg<std::string> output_arg("o", "output-mesh-file","output mesh file",true,"","string"); 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)", - true, "", "string"); + 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)", + true, "", "string"); cmd.add( new_order_arg ); cmd.parse( argc, argv ); diff --git a/Applications/Utils/MeshGeoTools/ComputeSurfaceNodeIDsInPolygonalRegion.cpp b/Applications/Utils/MeshGeoTools/ComputeSurfaceNodeIDsInPolygonalRegion.cpp index 39386d8e48ad90d92c719b83279694019ee3f4be..fac53b8cec5eaf55b1a7d597c00ace9bdd5bfe2c 100644 --- a/Applications/Utils/MeshGeoTools/ComputeSurfaceNodeIDsInPolygonalRegion.cpp +++ b/Applications/Utils/MeshGeoTools/ComputeSurfaceNodeIDsInPolygonalRegion.cpp @@ -36,11 +36,13 @@ void writeToFile(std::string const& id_area_fname, std::string const& csv_fname, { std::ofstream ids_and_area_out(id_area_fname); if (!ids_and_area_out) { - OGS_FATAL("Unable to open the file \"%s\" - aborting.", id_area_fname.c_str()); + OGS_FATAL("Unable to open the file '%s' - aborting.", + id_area_fname.c_str()); } std::ofstream csv_out(csv_fname); if (!csv_out) { - OGS_FATAL("Unable to open the file \"%s\" - aborting.", csv_fname.c_str()); + OGS_FATAL("Unable to open the file '%s' - aborting.", + csv_fname.c_str()); } ids_and_area_out << std::setprecision(20); @@ -95,10 +97,10 @@ int main (int argc, char* argv[]) FileIO::readGeometryFromFile(geo_in.getValue(), geo_objs); std::vector<std::string> geo_names; geo_objs.getGeometryNames(geo_names); - INFO("Geometry \"%s\" read: %u points, %u polylines.", - geo_names[0].c_str(), - geo_objs.getPointVec(geo_names[0])->size(), - geo_objs.getPolylineVec(geo_names[0])->size()); + INFO("Geometry '%s' read: %u points, %u polylines.", + geo_names[0].c_str(), + geo_objs.getPointVec(geo_names[0])->size(), + geo_objs.getPolylineVec(geo_names[0])->size()); MathLib::Vector3 const dir(0.0, 0.0, -1.0); double angle(90); @@ -145,8 +147,9 @@ int main (int argc, char* argv[]) } } if (ids_and_areas.empty()) { - ERR("Polygonal part of surface \"%s\" doesn't contains nodes. No " - "output will be generated.", polygon_name.c_str()); + ERR("Polygonal part of surface '%s' doesn't contains nodes. No " + "output will be generated.", + polygon_name.c_str()); continue; } @@ -155,13 +158,13 @@ int main (int argc, char* argv[]) std::string csv_fname(out_path + polygon_name); 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" - " files \"%s\" and \"%s\".", + INFO( + "Polygonal part of surface '%s' contains %ul nodes. Writting to" + " files '%s' and '%s'.", polygon_name.c_str(), ids_and_areas.size(), id_and_area_fname.c_str(), - csv_fname.c_str() - ); + csv_fname.c_str()); writeToFile(id_and_area_fname, csv_fname, ids_and_areas, mesh_nodes); } diff --git a/Applications/Utils/MeshGeoTools/ConstructMeshesFromGeometry.cpp b/Applications/Utils/MeshGeoTools/ConstructMeshesFromGeometry.cpp index 6af90fa5cd9bbb52255b31fc2937f95ef226e7e3..151932330e97791f90b427024b6faa903e0651ce 100644 --- a/Applications/Utils/MeshGeoTools/ConstructMeshesFromGeometry.cpp +++ b/Applications/Utils/MeshGeoTools/ConstructMeshesFromGeometry.cpp @@ -24,7 +24,7 @@ std::unique_ptr<GeoLib::GEOObjects> readGeometry(std::string const& filename) auto geo_objects = std::make_unique<GeoLib::GEOObjects>(); GeoLib::IO::BoostXmlGmlInterface gml_reader(*geo_objects); - DBUG("Reading geometry file \'%s\'.", filename.c_str()); + DBUG("Reading geometry file '%s'.", filename.c_str()); gml_reader.readFile(filename); return geo_objects; } diff --git a/Applications/Utils/ModelPreparation/ComputeNodeAreasFromSurfaceMesh.cpp b/Applications/Utils/ModelPreparation/ComputeNodeAreasFromSurfaceMesh.cpp index fd23b6e470f989716a9e977f3994eb439ef879bb..42d670366dad1e264089a091fe47eb1a76138379 100644 --- a/Applications/Utils/ModelPreparation/ComputeNodeAreasFromSurfaceMesh.cpp +++ b/Applications/Utils/ModelPreparation/ComputeNodeAreasFromSurfaceMesh.cpp @@ -32,11 +32,13 @@ void writeToFile(std::string const& id_area_fname, std::string const& csv_fname, { std::ofstream ids_and_area_out(id_area_fname); if (!ids_and_area_out) { - OGS_FATAL("Unable to open the file \"%s\" - aborting.", id_area_fname.c_str()); + OGS_FATAL("Unable to open the file '%s' - aborting.", + id_area_fname.c_str()); } std::ofstream csv_out(csv_fname); if (!csv_out) { - OGS_FATAL("Unable to open the file \"%s\" - aborting.", csv_fname.c_str()); + OGS_FATAL("Unable to open the file '%s' - aborting.", + csv_fname.c_str()); } ids_and_area_out.precision(std::numeric_limits<double>::digits10); diff --git a/Applications/Utils/ModelPreparation/createNeumannBc.cpp b/Applications/Utils/ModelPreparation/createNeumannBc.cpp index 80c131ff60f153b62eb18a3ee6073d07fc373beb..f86ddb9082aa963e70ab233c7b07ac7b29d648c1 100644 --- a/Applications/Utils/ModelPreparation/createNeumannBc.cpp +++ b/Applications/Utils/ModelPreparation/createNeumannBc.cpp @@ -40,7 +40,7 @@ std::vector<double> getSurfaceIntegratedValuesForNodes( if (!mesh.getProperties().existsPropertyVector<double>(prop_name)) { - ERR("Need element property, but the property \"%s\" is not " + ERR("Need element property, but the property '%s' is not " "available.", prop_name.c_str()); return std::vector<double>(); @@ -79,7 +79,7 @@ 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 " + "'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 " + diff --git a/Applications/Utils/OGSFileConverter/OGSFileConverter.cpp b/Applications/Utils/OGSFileConverter/OGSFileConverter.cpp index dbcda6beab56113efb4dbe5353d8392f89973b97..adb8431db278678f75529ac4aca2fa2a991f8fac 100644 --- a/Applications/Utils/OGSFileConverter/OGSFileConverter.cpp +++ b/Applications/Utils/OGSFileConverter/OGSFileConverter.cpp @@ -213,7 +213,10 @@ bool OGSFileConverter::fileExists(const std::string &file_name) const if (file) { QString const name = QString::fromStdString(BaseLib::extractBaseName(file_name)); - return !OGSError::question("The file \'" + name + "\' already exists.\n Do you want to overwrite it?", "Warning"); + return !OGSError::question( + "The file '" + name + + "' already exists.\n Do you want to overwrite it?", + "Warning"); } return false; } diff --git a/Applications/Utils/SimpleMeshCreation/generateStructuredMesh.cpp b/Applications/Utils/SimpleMeshCreation/generateStructuredMesh.cpp index bd50e0ee4ab2783bdcee1ea3962e93268453e3aa..cedf1811be8ff7ac97667e6bc7c03e51254ed194 100644 --- a/Applications/Utils/SimpleMeshCreation/generateStructuredMesh.cpp +++ b/Applications/Utils/SimpleMeshCreation/generateStructuredMesh.cpp @@ -190,7 +190,7 @@ int main (int argc, char* argv[]) if (vec_d0Arg[i]->isSet()) { OGS_FATAL( "Specifying all of --m?, --d?0 and --n? for coordinate " - "\"?\" is not supported."); + "'?' is not supported."); } vec_div.emplace_back(new BaseLib::GradualSubdivisionFixedNum( length[i], vec_ndivArg[i]->getValue(), diff --git a/BaseLib/ConfigTree-impl.h b/BaseLib/ConfigTree-impl.h index 0d233614521ad0884073a44ce1f4394b60256b60..e89e51d7748668fe1e0038d818bf4180bad70ca7 100644 --- a/BaseLib/ConfigTree-impl.h +++ b/BaseLib/ConfigTree-impl.h @@ -186,7 +186,7 @@ getConfigAttribute(std::string const& attr) const if (auto a = getConfigAttributeOptional<T>(attr)) return *a; - error("Did not find XML attribute with name \"" + attr + "\"."); + error("Did not find XML attribute with name '" + attr + "'."); } template <typename T> @@ -213,7 +213,7 @@ getConfigAttributeOptional(std::string const& attr) const if (auto v = a->get_value_optional<T>()) { return v; } - error("Value for XML attribute \"" + attr + "\" `" + + error("Value for XML attribute '" + attr + "' `" + shortString(a->data()) + "' not convertible to the desired type."); } @@ -238,8 +238,9 @@ markVisited(std::string const& key, Attr const is_attr, if (v.type == type) { if (!peek_only) ++v.count; } else { - error("There already was an attempt to obtain key <" + key - + "> with type \"" + v.type.name() + "\" (now: \"" + type.name() + "\")."); + error("There already was an attempt to obtain key <" + key + + "> with type '" + v.type.name() + "' (now: '" + type.name() + + "')."); } } diff --git a/BaseLib/ConfigTree.cpp b/BaseLib/ConfigTree.cpp index 67c561f99f1b05d53cfca1e81c0b7f8ae518d8fd..4afc7151c103cc05cdb62fbda8cf62745d653a9b 100644 --- a/BaseLib/ConfigTree.cpp +++ b/BaseLib/ConfigTree.cpp @@ -321,7 +321,7 @@ void ConfigTree::checkUniqueAttr(const std::string &attr) const } if (_visited_params.find({Attr::ATTR, attr}) != _visited_params.end()) { - error("Attribute \"" + attr + "\" has already been processed."); + error("Attribute '" + attr + "' has already been processed."); } } @@ -394,11 +394,15 @@ ConfigTree::checkAndInvalidate() switch (p.first.first) { case Attr::ATTR: if (count > 0) { - warning("XML attribute \"" + tag + "\" has been read " + std::to_string(count) - + " time(s) more than it was present in the configuration tree."); + warning("XML attribute '" + tag + "' has been read " + + std::to_string(count) + + " time(s) more than it was present in the " + "configuration tree."); } else if (count < 0) { - warning("XML attribute \"" + tag + "\" has been read " + std::to_string(-count) - + " time(s) less than it was present in the configuration tree."); + warning("XML attribute '" + tag + "' has been read " + + std::to_string(-count) + + " time(s) less than it was present in the " + "configuration tree."); } break; case Attr::TAG: diff --git a/BaseLib/ConfigTreeUtil.cpp b/BaseLib/ConfigTreeUtil.cpp index e64f8ae4dbc6b7be1b0d02ad4b5ead3c63b951fa..76802d57e2acb252b1030156212c1ba293760744 100644 --- a/BaseLib/ConfigTreeUtil.cpp +++ b/BaseLib/ConfigTreeUtil.cpp @@ -66,7 +66,7 @@ makeConfigTree(const std::string& filepath, const bool be_ruthless, e.filename().c_str(), e.line(), e.message().c_str()); } - DBUG("Project configuration from file \'%s\' read.", filepath.c_str()); + DBUG("Project configuration from file '%s' read.", filepath.c_str()); if (auto child = ptree.get_child_optional(toplevel_tag)) { return ConfigTreeTopLevel(filepath, be_ruthless, std::move(*child)); diff --git a/BaseLib/FileTools.h b/BaseLib/FileTools.h index 6fa60a54e6d283c4e8852d25ca1dfeb4161c0652..631befef9eab42099b75e2dfcf5020700e67b8ea 100644 --- a/BaseLib/FileTools.h +++ b/BaseLib/FileTools.h @@ -73,8 +73,9 @@ std::vector<T> readBinaryArray(std::string const& filename, std::size_t const n) { std::ifstream in(filename.c_str()); if (!in) { - ERR("readBinaryArray(): Error while reading from file \"%s\".", filename.c_str()); - ERR("Could not open file \"%s\" for input.", filename.c_str()); + ERR("readBinaryArray(): Error while reading from file '%s'.", + filename.c_str()); + ERR("Could not open file '%s' for input.", filename.c_str()); in.close(); return std::vector<T>(); } @@ -88,7 +89,8 @@ std::vector<T> readBinaryArray(std::string const& filename, std::size_t const n) if (result.size() == n) return result; - ERR("readBinaryArray(): Error while reading from file \"%s\".", filename.c_str()); + ERR("readBinaryArray(): Error while reading from file '%s'.", + filename.c_str()); ERR("Read different number of values. Expected %d, got %d.", n, result.size()); if (!in.eof()) diff --git a/BaseLib/IO/Writer.cpp b/BaseLib/IO/Writer.cpp index 3f94c168b0f4bd67577a8e3e764132d7d3b64349..dd53342fb4a23ce69056e9797451333bbba72477 100644 --- a/BaseLib/IO/Writer.cpp +++ b/BaseLib/IO/Writer.cpp @@ -52,7 +52,7 @@ int Writer::writeToFile(std::string const& filename) // check file stream if (!fileStream) { - ERR("Could not open file \"%s\"!", filename.c_str()); + ERR("Could not open file '%s'!", filename.c_str()); return 0; } diff --git a/GeoLib/DuplicateGeometry.cpp b/GeoLib/DuplicateGeometry.cpp index 246dc74609a7535dc5a820121e489a02b4a0fba0..c7b8193c5c950c6787e0c47ab51331fef58b66dd 100644 --- a/GeoLib/DuplicateGeometry.cpp +++ b/GeoLib/DuplicateGeometry.cpp @@ -34,7 +34,7 @@ void DuplicateGeometry::duplicate(std::string const& input_name) std::vector<GeoLib::Point*> const*const pnts (_geo_objects.getPointVec(input_name)); if (pnts == nullptr) { - ERR("Geometry \"%s\" not found.", input_name.c_str()); + ERR("Geometry '%s' not found.", input_name.c_str()); return; } diff --git a/GeoLib/GEOObjects.cpp b/GeoLib/GEOObjects.cpp index 8e51fa3c47f0d732aad525d1388edb6c6bafe9cb..fd4989706e73ae654803be99c6e463f98d4a0cc4 100644 --- a/GeoLib/GEOObjects.cpp +++ b/GeoLib/GEOObjects.cpp @@ -60,7 +60,8 @@ const std::vector<Point*>* GEOObjects::getPointVec(const std::string &name) cons if (idx != std::numeric_limits<std::size_t>::max()) return _pnt_vecs[idx]->getVector(); - DBUG("GEOObjects::getPointVec() - No entry found with name \"%s\".", name.c_str()); + DBUG("GEOObjects::getPointVec() - No entry found with name '%s'.", + name.c_str()); return nullptr; } @@ -70,7 +71,8 @@ const PointVec* GEOObjects::getPointVecObj(const std::string &name) const if (idx != std::numeric_limits<std::size_t>::max()) return _pnt_vecs[idx]; - DBUG("GEOObjects::getPointVecObj() - No entry found with name \"%s\".", name.c_str()); + DBUG("GEOObjects::getPointVecObj() - No entry found with name '%s'.", + name.c_str()); return nullptr; } @@ -90,7 +92,8 @@ bool GEOObjects::removePointVec(std::string const& name) _pnt_vecs.erase(it); return true; } - DBUG("GEOObjects::removePointVec() - No entry found with name \"%s\".", name.c_str()); + DBUG("GEOObjects::removePointVec() - No entry found with name '%s'.", + name.c_str()); return false; } @@ -113,7 +116,8 @@ const std::vector<GeoLib::Point*>* GEOObjects::getStationVec( return point->getVector(); } } - DBUG("GEOObjects::getStationVec() - No entry found with name \"%s\".", name.c_str()); + DBUG("GEOObjects::getStationVec() - No entry found with name '%s'.", + name.c_str()); return nullptr; } @@ -174,7 +178,8 @@ const std::vector<Polyline*>* GEOObjects::getPolylineVec(const std::string &name if (_ply_vecs[i]->getName() == name) return _ply_vecs[i]->getVector(); - DBUG("GEOObjects::getPolylineVec() - No entry found with name \"%s\".", name.c_str()); + DBUG("GEOObjects::getPolylineVec() - No entry found with name '%s'.", + name.c_str()); return nullptr; } @@ -185,7 +190,8 @@ const PolylineVec* GEOObjects::getPolylineVecObj(const std::string &name) const if (_ply_vecs[i]->getName() == name) return _ply_vecs[i]; - DBUG("GEOObjects::getPolylineVecObj() - No entry found with name \"%s\".", name.c_str()); + DBUG("GEOObjects::getPolylineVecObj() - No entry found with name '%s'.", + name.c_str()); return nullptr; } @@ -200,7 +206,8 @@ bool GEOObjects::removePolylineVec(std::string const& name) return true; } - DBUG("GEOObjects::removePolylineVec() - No entry found with name \"%s\".", name.c_str()); + DBUG("GEOObjects::removePolylineVec() - No entry found with name '%s'.", + name.c_str()); return false; } @@ -251,7 +258,8 @@ const std::vector<Surface*>* GEOObjects::getSurfaceVec(const std::string &name) for (std::size_t i = 0; i < size; i++) if (_sfc_vecs[i]->getName() == name) return _sfc_vecs[i]->getVector(); - DBUG("GEOObjects::getSurfaceVec() - No entry found with name \"%s\".", name.c_str()); + DBUG("GEOObjects::getSurfaceVec() - No entry found with name '%s'.", + name.c_str()); return nullptr; } @@ -266,7 +274,8 @@ bool GEOObjects::removeSurfaceVec(const std::string &name) return true; } - DBUG("GEOObjects::removeSurfaceVec() - No entry found with name \"%s\".", name.c_str()); + DBUG("GEOObjects::removeSurfaceVec() - No entry found with name '%s'.", + name.c_str()); return false; } @@ -276,7 +285,8 @@ const SurfaceVec* GEOObjects::getSurfaceVecObj(const std::string &name) const for (std::size_t i = 0; i < size; i++) if (_sfc_vecs[i]->getName() == name) return _sfc_vecs[i]; - DBUG("GEOObjects::getSurfaceVecObj() - No entry found with name \"%s\".", name.c_str()); + DBUG("GEOObjects::getSurfaceVecObj() - No entry found with name '%s'.", + name.c_str()); return nullptr; } @@ -577,8 +587,9 @@ const GeoLib::GeoObject* GEOObjects::getGeoObject(const std::string &geo_name, }; if (!geo_obj) { - DBUG("GEOObjects::getGeoObject(): Could not find %s \"%s\" in geometry.", - GeoLib::convertGeoTypeToString(type).c_str(), geo_obj_name.c_str()); + DBUG("GEOObjects::getGeoObject(): Could not find %s '%s' in geometry.", + GeoLib::convertGeoTypeToString(type).c_str(), + geo_obj_name.c_str()); } return geo_obj; } @@ -598,8 +609,8 @@ GeoLib::GeoObject const* GEOObjects::getGeoObject( geo_obj = getGeoObject(geo_name, GeoLib::GEOTYPE::SURFACE, geo_obj_name); if (!geo_obj) { - DBUG("GEOObjects::getGeoObject(): Could not find \"%s\" in geometry %s.", - geo_obj_name.c_str(), geo_name.c_str()); + DBUG("GEOObjects::getGeoObject(): Could not find '%s' in geometry %s.", + geo_obj_name.c_str(), geo_name.c_str()); } return geo_obj; } diff --git a/GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.cpp b/GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.cpp index 4db9cc4ad5a083a2527f4669f810c1b1fc09d2ef..d2d2d4aad5815bb84ef8cd6bba17227a1d40d353 100644 --- a/GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.cpp +++ b/GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.cpp @@ -261,19 +261,22 @@ bool BoostXmlGmlInterface::write() GeoLib::PointVec const*const pnt_vec(_geo_objects.getPointVecObj(_exportName)); if (! pnt_vec) { - ERR("BoostXmlGmlInterface::write(): No PointVec within the geometry \"%s\".", + ERR("BoostXmlGmlInterface::write(): No PointVec within the geometry " + "'%s'.", _exportName.c_str()); return false; } std::vector<GeoLib::Point*> const*const pnts(pnt_vec->getVector()); if (! pnts) { - ERR("BoostXmlGmlInterface::write(): No vector of points within the geometry \"%s\".", + ERR("BoostXmlGmlInterface::write(): No vector of points within the " + "geometry '%s'.", _exportName.c_str()); return false; } if (pnts->empty()) { - ERR("BoostXmlGmlInterface::write(): No points within the geometry \"%s\".", + ERR("BoostXmlGmlInterface::write(): No points within the geometry " + "'%s'.", _exportName.c_str()); return false; } @@ -313,8 +316,10 @@ void BoostXmlGmlInterface::addSurfacesToPropertyTree( { GeoLib::SurfaceVec const*const sfc_vec(_geo_objects.getSurfaceVecObj(_exportName)); if (!sfc_vec) { - INFO("BoostXmlGmlInterface::addSurfacesToPropertyTree(): " - "No surfaces within the geometry \"%s\".", _exportName.c_str()); + INFO( + "BoostXmlGmlInterface::addSurfacesToPropertyTree(): " + "No surfaces within the geometry '%s'.", + _exportName.c_str()); return; } @@ -323,7 +328,7 @@ void BoostXmlGmlInterface::addSurfacesToPropertyTree( { INFO( "BoostXmlGmlInterface::addSurfacesToPropertyTree(): " - "No surfaces within the geometry \"%s\".", + "No surfaces within the geometry '%s'.", _exportName.c_str()); return; } @@ -351,8 +356,10 @@ void BoostXmlGmlInterface::addPolylinesToPropertyTree( { GeoLib::PolylineVec const*const vec(_geo_objects.getPolylineVecObj(_exportName)); if (!vec) { - INFO("BoostXmlGmlInterface::addPolylinesToPropertyTree(): " - "No polylines within the geometry \"%s\".", _exportName.c_str()); + INFO( + "BoostXmlGmlInterface::addPolylinesToPropertyTree(): " + "No polylines within the geometry '%s'.", + _exportName.c_str()); return; } @@ -361,7 +368,7 @@ void BoostXmlGmlInterface::addPolylinesToPropertyTree( { INFO( "BoostXmlGmlInterface::addPolylinesToPropertyTree(): " - "No polylines within the geometry \"%s\".", + "No polylines within the geometry '%s'.", _exportName.c_str()); return; } diff --git a/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp b/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp index f900282ac0fb7e4a807f0971069cafaa9fb41c06..64f2c23087d3214934a988f1e057a56e92c5a10e 100644 --- a/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp +++ b/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp @@ -214,8 +214,10 @@ void XmlGmlInterface::readPolylines( if (it == ply_names->end()) { ply_names->insert(std::pair<std::string, std::size_t>(ply_name, idx)); } else { - WARN("Polyline \"%s\" exists already. The polyline will be " - "inserted without a name.", ply_name.c_str()); + WARN( + "Polyline '%s' exists already. The polyline will be " + "inserted without a name.", + ply_name.c_str()); } } diff --git a/GeoLib/IO/XmlIO/Qt/XmlStnInterface.cpp b/GeoLib/IO/XmlIO/Qt/XmlStnInterface.cpp index 25d33cf38ee20c78632480978b8592813c18ff0d..04564d621655e3ce4be29093eae6951cae508c89 100644 --- a/GeoLib/IO/XmlIO/Qt/XmlStnInterface.cpp +++ b/GeoLib/IO/XmlIO/Qt/XmlStnInterface.cpp @@ -184,8 +184,10 @@ void XmlStnInterface::readStratigraphy( const QDomNode &stratRoot, depth_check = depth; } else - WARN("XmlStnInterface::readStratigraphy(): Skipped layer \"%s\" in borehole \"%s\" because of thickness 0.0.", - horizonName.c_str(), borehole->getName().c_str()); + WARN( + "XmlStnInterface::readStratigraphy(): Skipped layer '%s' " + "in borehole '%s' because of thickness 0.0.", + horizonName.c_str(), borehole->getName().c_str()); } else WARN("XmlStnInterface::readStratigraphy(): Attribute missing in <horizon> tag."); @@ -481,9 +483,10 @@ void XmlStnInterface::rapidReadStratigraphy( const rapidxml::xml_node<>* strat_r } else WARN( - "XmlStnInterface::rapidReadStratigraphy(): Skipped layer \"%s\" in borehole \"%s\" because of thickness 0.0.", - horizon_name.c_str(), - borehole->getName().c_str()); + "XmlStnInterface::rapidReadStratigraphy(): Skipped layer " + "'%s' in borehole '%s' because of thickness 0.0.", + horizon_name.c_str(), + borehole->getName().c_str()); } else WARN("XmlStnInterface::rapidReadStratigraphy(): Attribute missing in <horizon> tag."); diff --git a/GeoLib/IO/XmlIO/Rapid/RapidStnInterface.cpp b/GeoLib/IO/XmlIO/Rapid/RapidStnInterface.cpp index e002c9840eead9597d604d467dfd83f4085ae7ad..d043cf353e8d8779a845bf9204a774aa844e7d5b 100644 --- a/GeoLib/IO/XmlIO/Rapid/RapidStnInterface.cpp +++ b/GeoLib/IO/XmlIO/Rapid/RapidStnInterface.cpp @@ -239,7 +239,7 @@ void RapidStnInterface::readStratigraphy( const rapidxml::xml_node<>* strat_root else { WARN( - "Warning: Skipped layer \"%s\" in borehole \"%s\" because " + "Warning: Skipped layer '%s' in borehole '%s' because " "of thickness 0.0.", horizon_name.c_str(), borehole->getName().c_str()); } diff --git a/GeoLib/SensorData.cpp b/GeoLib/SensorData.cpp index d7ff5c62f0bc108cf9e9dcbc1c2ca34308b2ef07..cf7e2be3143c671ea72c6c066dde510cac025f3c 100644 --- a/GeoLib/SensorData.cpp +++ b/GeoLib/SensorData.cpp @@ -81,7 +81,8 @@ const std::vector<float>* SensorData::getTimeSeries(SensorDataType time_series_n if (time_series_name == _vec_names[i]) return _data_vecs[i]; } - ERR("Error in SensorData::getTimeSeries() - Time series \"%d\" not found.", time_series_name); + ERR("Error in SensorData::getTimeSeries() - Time series '%d' not found.", + time_series_name); return nullptr; } @@ -92,7 +93,8 @@ std::string SensorData::getDataUnit(SensorDataType time_series_name) const if (time_series_name == _vec_names[i]) return _data_unit_string[i]; } - ERR("Error in SensorData::getDataUnit() - Time series \"%d\" not found.", time_series_name); + ERR("Error in SensorData::getDataUnit() - Time series '%d' not found.", + time_series_name); return ""; } diff --git a/GeoLib/TemplateVec.h b/GeoLib/TemplateVec.h index 0a3b495e6c927275ac5c597496c4fc5bdda2e22a..81ba009cd8a2f0ce3d39ff290fcd5e853a00ae1f 100644 --- a/GeoLib/TemplateVec.h +++ b/GeoLib/TemplateVec.h @@ -191,8 +191,10 @@ public: if (it == _name_id_map->end()) { _name_id_map->insert(NameIdPair(*name, _data_vec->size() - 1)); } else { - WARN("Name \"%s\" exists already. The object will be inserted " - "without a name", name->c_str()); + WARN( + "Name '%s' exists already. The object will be inserted " + "without a name", + name->c_str()); } } diff --git a/MaterialLib/SolidModels/CreateConstitutiveRelation.cpp b/MaterialLib/SolidModels/CreateConstitutiveRelation.cpp index 72f3babc14dfccdc6249337ca77f95c38f9ba5cf..1192fb46fc04e7f2e26ba854ae8b26cd3297cce5 100644 --- a/MaterialLib/SolidModels/CreateConstitutiveRelation.cpp +++ b/MaterialLib/SolidModels/CreateConstitutiveRelation.cpp @@ -64,7 +64,7 @@ createConstitutiveRelation( return MaterialLib::Solids::MFront::createMFront<DisplacementDim>( parameters, config); } - OGS_FATAL("Cannot construct constitutive relation of given type \'%s\'.", + OGS_FATAL("Cannot construct constitutive relation of given type '%s'.", type.c_str()); } diff --git a/MaterialLib/SolidModels/CreateEhlers.h b/MaterialLib/SolidModels/CreateEhlers.h index 405a51429ed1a3d5895977a8ff6e281f37524afe..0b6a6430519c7da197e38694b12e94d6ffd322f0 100644 --- a/MaterialLib/SolidModels/CreateEhlers.h +++ b/MaterialLib/SolidModels/CreateEhlers.h @@ -27,18 +27,18 @@ inline std::unique_ptr<DamagePropertiesParameters> createDamageProperties( auto& alpha_d = ProcessLib::findParameter<double>(config, "alpha_d", parameters, 1); - DBUG("Use \'%s\' as alpha_d.", alpha_d.name.c_str()); + DBUG("Use '%s' as alpha_d.", alpha_d.name.c_str()); //! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__damage_properties__beta_d} auto& beta_d = ProcessLib::findParameter<double>(config, "beta_d", parameters, 1); - DBUG("Use \'%s\' as beta_d.", beta_d.name.c_str()); + DBUG("Use '%s' as beta_d.", beta_d.name.c_str()); //! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__damage_properties__h_d} auto& h_d = ProcessLib::findParameter<double>(config, "h_d", parameters, 1); - DBUG("Use \'%s\' as h_d.", h_d.name.c_str()); + DBUG("Use '%s' as h_d.", h_d.name.c_str()); return std::make_unique<DamagePropertiesParameters>( DamagePropertiesParameters{alpha_d, beta_d, h_d}); @@ -57,96 +57,96 @@ std::unique_ptr<SolidEhlers<DisplacementDim>> createEhlers( auto& shear_modulus = ProcessLib::findParameter<double>( config, "shear_modulus", parameters, 1); - DBUG("Use \'%s\' as shear modulus parameter.", shear_modulus.name.c_str()); + DBUG("Use '%s' as shear modulus parameter.", shear_modulus.name.c_str()); //! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__bulk_modulus} auto& bulk_modulus = ProcessLib::findParameter<double>( config, "bulk_modulus", parameters, 1); - DBUG("Use \'%s\' as bulk modulus parameter.", bulk_modulus.name.c_str()); + DBUG("Use '%s' as bulk modulus parameter.", bulk_modulus.name.c_str()); //! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__kappa} auto& kappa = ProcessLib::findParameter<double>(config, "kappa", parameters, 1); - DBUG("Use \'%s\' as kappa.", kappa.name.c_str()); + DBUG("Use '%s' as kappa.", kappa.name.c_str()); //! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__beta} auto& beta = ProcessLib::findParameter<double>(config, "beta", parameters, 1); - DBUG("Use \'%s\' as beta.", beta.name.c_str()); + DBUG("Use '%s' as beta.", beta.name.c_str()); //! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__gamma} auto& gamma = ProcessLib::findParameter<double>(config, "gamma", parameters, 1); - DBUG("Use \'%s\' as gamma.", gamma.name.c_str()); + DBUG("Use '%s' as gamma.", gamma.name.c_str()); //! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__hardening_modulus} auto& hardening_modulus = ProcessLib::findParameter<double>( config, "hardening_modulus", parameters, 1); - DBUG("Use \'%s\' as hardening modulus parameter.", + DBUG("Use '%s' as hardening modulus parameter.", hardening_modulus.name.c_str()); //! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__alpha} auto& alpha = ProcessLib::findParameter<double>(config, "alpha", parameters, 1); - DBUG("Use \'%s\' as alpha.", alpha.name.c_str()); + DBUG("Use '%s' as alpha.", alpha.name.c_str()); //! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__delta} auto& delta = ProcessLib::findParameter<double>(config, "delta", parameters, 1); - DBUG("Use \'%s\' as delta.", delta.name.c_str()); + DBUG("Use '%s' as delta.", delta.name.c_str()); //! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__eps} auto& eps = ProcessLib::findParameter<double>(config, "eps", parameters, 1); - DBUG("Use \'%s\' as eps.", eps.name.c_str()); + DBUG("Use '%s' as eps.", eps.name.c_str()); //! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__m} auto& m = ProcessLib::findParameter<double>(config, "m", parameters, 1); - DBUG("Use \'%s\' as m.", m.name.c_str()); + DBUG("Use '%s' as m.", m.name.c_str()); //! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__alphap} auto& alphap = ProcessLib::findParameter<double>(config, "alphap", parameters, 1); - DBUG("Use \'%s\' as alphap.", alphap.name.c_str()); + DBUG("Use '%s' as alphap.", alphap.name.c_str()); //! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__deltap} auto& deltap = ProcessLib::findParameter<double>(config, "deltap", parameters, 1); - DBUG("Use \'%s\' as deltap.", deltap.name.c_str()); + DBUG("Use '%s' as deltap.", deltap.name.c_str()); //! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__epsp} auto& epsp = ProcessLib::findParameter<double>(config, "epsp", parameters, 1); - DBUG("Use \'%s\' as epsp.", epsp.name.c_str()); + DBUG("Use '%s' as epsp.", epsp.name.c_str()); //! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__mp} auto& paremeter_mp = ProcessLib::findParameter<double>(config, "mp", parameters, 1); - DBUG("Use \'%s\' as mp.", paremeter_mp.name.c_str()); + DBUG("Use '%s' as mp.", paremeter_mp.name.c_str()); //! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__betap} auto& betap = ProcessLib::findParameter<double>(config, "betap", parameters, 1); - DBUG("Use \'%s\' as betap.", betap.name.c_str()); + DBUG("Use '%s' as betap.", betap.name.c_str()); //! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__gammap} auto& gammap = ProcessLib::findParameter<double>(config, "gammap", parameters, 1); - DBUG("Use \'%s\' as gammap.", gammap.name.c_str()); + DBUG("Use '%s' as gammap.", gammap.name.c_str()); //! \ogs_file_param_special{material__solid__constitutive_relation__Ehlers__tangent_type} auto tangent_type = diff --git a/MathLib/LinAlg/Lis/LisOption.h b/MathLib/LinAlg/Lis/LisOption.h index 39cd870ebf15aa2cbdecc51b8e78d72ed6a49cb4..b932b0b9bf23b57d7f0643ba7c31530131ac2dbd 100644 --- a/MathLib/LinAlg/Lis/LisOption.h +++ b/MathLib/LinAlg/Lis/LisOption.h @@ -47,7 +47,7 @@ struct LisOption if (auto s = options->getConfigParameterOptional<std::string>("lis")) { if (!s->empty()) { _option_string += " " + *s; - INFO("Lis options: \"%s\"", _option_string.c_str()); + INFO("Lis options: '%s'", _option_string.c_str()); } } } diff --git a/MeshGeoToolsLib/GeoMapper.cpp b/MeshGeoToolsLib/GeoMapper.cpp index 71282e188f07199f85143afb21e7ec585749e741..44275d84e7c3e544c1e0423cd05a4e3bac8a41bc 100644 --- a/MeshGeoToolsLib/GeoMapper.cpp +++ b/MeshGeoToolsLib/GeoMapper.cpp @@ -53,7 +53,7 @@ void GeoMapper::mapOnDEM(std::unique_ptr<GeoLib::Raster const> raster) { std::vector<GeoLib::Point*> const* pnts(_geo_objects.getPointVec(_geo_name)); if (! pnts) { - ERR("Geometry \"%s\" does not exist.", _geo_name.c_str()); + ERR("Geometry '%s' does not exist.", _geo_name.c_str()); return; } _raster = std::move(raster); @@ -69,7 +69,7 @@ void GeoMapper::mapOnMesh(MeshLib::Mesh const*const mesh) { std::vector<GeoLib::Point*> const* pnts(_geo_objects.getPointVec(_geo_name)); if (! pnts) { - ERR("Geometry \"%s\" does not exist.", _geo_name.c_str()); + ERR("Geometry '%s' does not exist.", _geo_name.c_str()); return; } @@ -113,7 +113,7 @@ void GeoMapper::mapToConstantValue(double value) std::vector<GeoLib::Point*> const* points (this->_geo_objects.getPointVec(this->_geo_name)); if (points == nullptr) { - ERR ("Geometry \"%s\" not found.", this->_geo_name.c_str()); + ERR("Geometry '%s' not found.", this->_geo_name.c_str()); return; } std::for_each(points->begin(), points->end(), [value](GeoLib::Point* pnt){ (*pnt)[2] = value; }); diff --git a/MeshGeoToolsLib/HeuristicSearchLength.cpp b/MeshGeoToolsLib/HeuristicSearchLength.cpp index 420d16a63ffc73bad2c6d8ea12bc044fa958fae1..22274fd0f05c95ebb7f6f2feec1e049e9fa5e827 100644 --- a/MeshGeoToolsLib/HeuristicSearchLength.cpp +++ b/MeshGeoToolsLib/HeuristicSearchLength.cpp @@ -65,8 +65,10 @@ HeuristicSearchLength::HeuristicSearchLength(MeshLib::Mesh const& mesh, LengthTy _search_length = std::numeric_limits<double>::epsilon(); } - DBUG("[MeshNodeSearcher::MeshNodeSearcher] Calculated search length for mesh \"%s\" is %f.", - _mesh.getName().c_str(), _search_length); + DBUG( + "[MeshNodeSearcher::MeshNodeSearcher] Calculated search length for " + "mesh '%s' is %f.", + _mesh.getName().c_str(), _search_length); } } // end namespace MeshGeoToolsLib diff --git a/MeshGeoToolsLib/MeshNodeSearcher.cpp b/MeshGeoToolsLib/MeshNodeSearcher.cpp index 7d7e5f551d8fc393374216bf771f543ba58d2de1..4f42375f000ea97dcc566e1afce697e8e06e7829 100644 --- a/MeshGeoToolsLib/MeshNodeSearcher.cpp +++ b/MeshGeoToolsLib/MeshNodeSearcher.cpp @@ -40,8 +40,8 @@ MeshNodeSearcher::MeshNodeSearcher( _search_length_algorithm(std::move(search_length_algorithm)), _search_all_nodes(search_all_nodes) { - DBUG("The search length for mesh \"%s\" is %e.", - _mesh.getName().c_str(), _search_length_algorithm->getSearchLength()); + DBUG("The search length for mesh '%s' is %e.", _mesh.getName().c_str(), + _search_length_algorithm->getSearchLength()); } MeshNodeSearcher::~MeshNodeSearcher() diff --git a/MeshLib/Elements/Element.cpp b/MeshLib/Elements/Element.cpp index e59ce1ba887b10cfb2563266c8ff198bdb5a61df..699fa11bd0ada46021be8339e0791c73221eb676 100644 --- a/MeshLib/Elements/Element.cpp +++ b/MeshLib/Elements/Element.cpp @@ -235,7 +235,7 @@ bool isPointInElementXY(MathLib::Point3d const& p, Element const& e) MathLib::isPointInTriangleXY(p, n0, n2, n3); } - WARN("isPointInElementXY: element type \"%s\" is not supported.", + WARN("isPointInElementXY: element type '%s' is not supported.", MeshLib::MeshElemType2String(e.getGeomType()).c_str()); return false; } diff --git a/MeshLib/IO/Legacy/MeshIO.cpp b/MeshLib/IO/Legacy/MeshIO.cpp index e19abe6d59d5b3d28ee0e0d6a91431d0b80a0332..fc092ce3e91ed1fd5bd30c788374ffaf2d93b8fa 100644 --- a/MeshLib/IO/Legacy/MeshIO.cpp +++ b/MeshLib/IO/Legacy/MeshIO.cpp @@ -102,8 +102,8 @@ MeshLib::Mesh* MeshIO::loadMeshFromFile(const std::string& file_name) materials.push_back(readMaterialID(ss)); MeshLib::Element *elem(readElement(ss,nodes)); if (elem == nullptr) { - ERR("Reading mesh element %d from file \"%s\" failed.", - i, file_name.c_str()); + ERR("Reading mesh element %d from file '%s' failed.", i, + file_name.c_str()); // clean up the elements vector std::for_each(elements.begin(), elements.end(), std::default_delete<MeshLib::Element>()); diff --git a/MeshLib/IO/VtkIO/VtuInterface.cpp b/MeshLib/IO/VtkIO/VtuInterface.cpp index 2891eca47e9cbdc937d9d1e6bd2166289b075571..7406c1f48695639729195d33acd9a9f67645b226 100644 --- a/MeshLib/IO/VtkIO/VtuInterface.cpp +++ b/MeshLib/IO/VtkIO/VtuInterface.cpp @@ -50,7 +50,7 @@ VtuInterface::VtuInterface(const MeshLib::Mesh* mesh, int dataMode, bool compres MeshLib::Mesh* VtuInterface::readVTUFile(std::string const &file_name) { if (!BaseLib::IsFileExisting(file_name)) { - ERR("File \"%s\" does not exist.", file_name.c_str()); + ERR("File '%s' does not exist.", file_name.c_str()); return nullptr; } @@ -62,7 +62,7 @@ MeshLib::Mesh* VtuInterface::readVTUFile(std::string const &file_name) vtkUnstructuredGrid* vtkGrid = reader->GetOutput(); if (vtkGrid->GetNumberOfPoints() == 0) { - ERR("Mesh \"%s\" contains zero points.", file_name.c_str()); + ERR("Mesh '%s' contains zero points.", file_name.c_str()); return nullptr; } diff --git a/MeshLib/Mesh.h b/MeshLib/Mesh.h index de0b088e02992cd461647a473fe129b1b2950c60..77ccfe6da78c53d7e911d20772ee94902dd3b194 100644 --- a/MeshLib/Mesh.h +++ b/MeshLib/Mesh.h @@ -226,7 +226,7 @@ void addPropertyToMesh(MeshLib::Mesh& mesh, std::string const& name, name, item_type, number_of_components); if (!property) { - OGS_FATAL("Error while creating PropertyVector \"%s\".", name.c_str()); + OGS_FATAL("Error while creating PropertyVector '%s'.", name.c_str()); } property->reserve(values.size()); std::copy(values.cbegin(), values.cend(), std::back_inserter(*property)); diff --git a/MeshLib/MeshEditing/AddLayerToMesh.cpp b/MeshLib/MeshEditing/AddLayerToMesh.cpp index 005478483f9aa57ba3b7feaa93c316d83a8cf459..8b943f5512120a6eab6a8782ec35f9265068be3a 100644 --- a/MeshLib/MeshEditing/AddLayerToMesh.cpp +++ b/MeshLib/MeshEditing/AddLayerToMesh.cpp @@ -94,7 +94,7 @@ MeshLib::Mesh* addLayerToMesh(MeshLib::Mesh const& mesh, double thickness, std::string const& name, bool on_top) { - INFO("Extracting top surface of mesh \"%s\" ... ", mesh.getName().c_str()); + INFO("Extracting top surface of mesh '%s' ... ", mesh.getName().c_str()); int const flag = (on_top) ? -1 : 1; const MathLib::Vector3 dir(0, 0, flag); double const angle(90); @@ -136,8 +136,7 @@ MeshLib::Mesh* addLayerToMesh(MeshLib::Mesh const& mesh, double thickness, if (!sfc_mesh->getProperties().existsPropertyVector<std::size_t>(prop_name)) { - ERR( - "Need subsurface node ids, but the property \"%s\" is not " + ERR("Need subsurface node ids, but the property '%s' is not " "available.", prop_name.c_str()); return nullptr; @@ -168,7 +167,7 @@ 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 " + ERR("Could not copy the property 'MaterialIDs' since the original " "mesh does not contain such a property."); return new_mesh; } diff --git a/MeshLib/MeshEditing/ElementValueModification.cpp b/MeshLib/MeshEditing/ElementValueModification.cpp index 096ddd63fc74756fea6aeed3b66dd3fb76a1b04b..31418a346bdcf89b0b108869f36986d9886c5b23 100644 --- a/MeshLib/MeshEditing/ElementValueModification.cpp +++ b/MeshLib/MeshEditing/ElementValueModification.cpp @@ -51,7 +51,7 @@ bool ElementValueModification::replace(MeshLib::Mesh &mesh, { WARN( "ElementValueModification::replaceElementValue() " - "- Replacement value \"%d\" is already taken, " + "- 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 8baed87075b3a87278373c817cbdc37fd5fcc467..55d70ad0de9ba2f48a96e9adc584ed12494ba5d9 100644 --- a/MeshLib/MeshEditing/Mesh2MeshPropertyInterpolation.cpp +++ b/MeshLib/MeshEditing/Mesh2MeshPropertyInterpolation.cpp @@ -59,7 +59,7 @@ bool Mesh2MeshPropertyInterpolation::setPropertiesForMesh(Mesh& dest_mesh) const } else { - INFO("Create new PropertyVector \"%s\" of type double.", + INFO("Create new PropertyVector '%s' of type double.", _property_name.c_str()); dest_properties = dest_mesh.getProperties().createNewPropertyVector<double>( @@ -68,7 +68,7 @@ bool Mesh2MeshPropertyInterpolation::setPropertiesForMesh(Mesh& dest_mesh) const { WARN( "Could not get or create a PropertyVector of type double" - " using the given name \"%s\".", + " using the given name '%s'.", _property_name.c_str()); return false; } @@ -146,7 +146,7 @@ void Mesh2MeshPropertyInterpolation::interpolateElementPropertiesToNodePropertie // fetch the source of property values if (!_src_mesh.getProperties().existsPropertyVector<double>(_property_name)) { - WARN("Did not find PropertyVector<double> \"%s\".", + WARN("Did not find PropertyVector<double> '%s'.", _property_name.c_str()); return; } diff --git a/MeshLib/MeshGenerators/MeshLayerMapper.cpp b/MeshLib/MeshGenerators/MeshLayerMapper.cpp index 47500682008809ddad7c93b16c5407597dca314c..8227483c09aedc39a4a06050a5a9f8764e84873e 100644 --- a/MeshLib/MeshGenerators/MeshLayerMapper.cpp +++ b/MeshLib/MeshGenerators/MeshLayerMapper.cpp @@ -64,7 +64,7 @@ MeshLib::Mesh* MeshLayerMapper::createStaticLayers(MeshLib::Mesh const& mesh, st "MaterialIDs", MeshLib::MeshItemType::Cell); if (!materials) { - ERR("Could not create PropertyVector object \"MaterialIDs\"."); + ERR("Could not create PropertyVector object 'MaterialIDs'."); return nullptr; } diff --git a/MeshLib/MeshGenerators/VtkMeshConverter.cpp b/MeshLib/MeshGenerators/VtkMeshConverter.cpp index 1ca07434b9da6ca26c94804303b71a5d89fc784d..f2208aff7ed40d3f6e91955a013471b6af337b85 100644 --- a/MeshLib/MeshGenerators/VtkMeshConverter.cpp +++ b/MeshLib/MeshGenerators/VtkMeshConverter.cpp @@ -219,7 +219,7 @@ MeshLib::Mesh* VtkMeshConverter::convertUnstructuredGrid( } default: ERR("VtkMeshConverter::convertUnstructuredGrid(): Unknown mesh " - "element type \"%d\".", + "element type '%d'.", cell_type); return nullptr; } diff --git a/MeshLib/MeshInformation.h b/MeshLib/MeshInformation.h index 6cab631700d22c8255d553a104199b6c25d83158..1934fc16b998cfffe0aab1d0906c542c3515acb8 100644 --- a/MeshLib/MeshInformation.h +++ b/MeshLib/MeshInformation.h @@ -42,7 +42,8 @@ public: auto const* const data_vec = mesh.getProperties().getPropertyVector<T>(name); if (data_vec->empty()) { - INFO("Mesh does not contain values for the property \"%s\".", name.c_str()); + INFO("Mesh does not contain values for the property '%s'.", + name.c_str()); return {std::numeric_limits<T>::max(), std::numeric_limits<T>::max()}; } auto vec_bounds = std::minmax_element(data_vec->cbegin(), data_vec->cend()); diff --git a/MeshLib/Properties.cpp b/MeshLib/Properties.cpp index 1e6aaf6b4d3cd55da8c20864b87cfa6a87c6887c..d3d6f6e799ad48687568b5c38c226cabfc58ba17 100644 --- a/MeshLib/Properties.cpp +++ b/MeshLib/Properties.cpp @@ -22,8 +22,7 @@ void Properties::removePropertyVector(std::string const& name) _properties.find(name) ); if (it == _properties.end()) { - WARN("A property of the name \"%s\" does not exist.", - name.c_str()); + WARN("A property of the name '%s' does not exist.", name.c_str()); return; } delete it->second; diff --git a/MeshLib/Vtk/VtkMappedMeshSource.cpp b/MeshLib/Vtk/VtkMappedMeshSource.cpp index 6f390619694a5cb664ecfa5b1dccc2812bd2a41b..7253f750cdc70aa8e8edce5224e028114e8ff8fe 100644 --- a/MeshLib/Vtk/VtkMappedMeshSource.cpp +++ b/MeshLib/Vtk/VtkMappedMeshSource.cpp @@ -144,7 +144,7 @@ int VtkMappedMeshSource::RequestData(vtkInformation*, if (addProperty<char>(properties, *name)) continue; - DBUG("Mesh property \"%s\" with unknown data type.", *name->c_str()); + DBUG("Mesh property '%s' with unknown data type.", *name->c_str()); } output->GetPointData()->ShallowCopy(this->PointData.GetPointer()); diff --git a/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp b/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp index a5c3f2663c0f7e06b704b8457fad750925a297d5..d2533473a5ad3aeaf7d622bc4aba00f94bf619b0 100644 --- a/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp +++ b/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp @@ -93,7 +93,7 @@ std::unique_ptr<Process> createComponentTransportProcess( config, //! \ogs_file_param_special{prj__processes__process__ComponentTransport__fluid_reference_density} "fluid_reference_density", parameters, 1); - DBUG("Use \'%s\' as fluid_reference_density parameter.", + DBUG("Use '%s' as fluid_reference_density parameter.", fluid_reference_density.name.c_str()); // Parameter for the longitudinal molecular diffusion coefficient. @@ -101,7 +101,7 @@ std::unique_ptr<Process> createComponentTransportProcess( config, //! \ogs_file_param_special{prj__processes__process__ComponentTransport__molecular_diffusion_coefficient} "molecular_diffusion_coefficient", parameters, 1); - DBUG("Use \'%s\' as molecular diffusion coefficient parameter.", + DBUG("Use '%s' as molecular diffusion coefficient parameter.", molecular_diffusion_coefficient.name.c_str()); // Parameter for the longitudinal solute dispersivity. @@ -109,7 +109,7 @@ std::unique_ptr<Process> createComponentTransportProcess( config, //! \ogs_file_param_special{prj__processes__process__ComponentTransport__solute_dispersivity_longitudinal} "solute_dispersivity_longitudinal", parameters, 1); - DBUG("Use \'%s\' as longitudinal solute dispersivity parameter.", + DBUG("Use '%s' as longitudinal solute dispersivity parameter.", solute_dispersivity_longitudinal.name.c_str()); // Parameter for the transverse solute dispersivity. @@ -117,7 +117,7 @@ std::unique_ptr<Process> createComponentTransportProcess( config, //! \ogs_file_param_special{prj__processes__process__ComponentTransport__solute_dispersivity_transverse} "solute_dispersivity_transverse", parameters, 1); - DBUG("Use \'%s\' as transverse solute dispersivity parameter.", + DBUG("Use '%s' as transverse solute dispersivity parameter.", solute_dispersivity_transverse.name.c_str()); // Parameter for the retardation factor. diff --git a/ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.cpp b/ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.cpp index 679bfb411b24239fd7d7703ee20bbf76b60e9022..5685019165389b9a47cd6dcbe73903858cce9b21 100644 --- a/ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.cpp +++ b/ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.cpp @@ -55,7 +55,7 @@ std::unique_ptr<Process> createGroundwaterFlowProcess( //! \ogs_file_param_special{prj__processes__process__GROUNDWATER_FLOW__hydraulic_conductivity} "hydraulic_conductivity", parameters, 1); - DBUG("Use \'%s\' as hydraulic conductivity parameter.", + DBUG("Use '%s' as hydraulic conductivity parameter.", hydraulic_conductivity.name.c_str()); GroundwaterFlowProcessData process_data{hydraulic_conductivity}; diff --git a/ProcessLib/HT/CreateHTProcess.cpp b/ProcessLib/HT/CreateHTProcess.cpp index dc3e8733a23e49edbdafd06c4b44544f96f2bcaf..082c81f553f83ea24a98220ec3f886564e257a62 100644 --- a/ProcessLib/HT/CreateHTProcess.cpp +++ b/ProcessLib/HT/CreateHTProcess.cpp @@ -90,14 +90,14 @@ std::unique_ptr<Process> createHTProcess( config, //! \ogs_file_param_special{prj__processes__process__HT__density_solid} "density_solid", parameters, 1); - DBUG("Use \'%s\' as density_solid parameter.", density_solid.name.c_str()); + DBUG("Use '%s' as density_solid parameter.", density_solid.name.c_str()); // Parameter for the specific heat capacity of the solid. auto& specific_heat_capacity_solid = findParameter<double>( config, //! \ogs_file_param_special{prj__processes__process__HT__specific_heat_capacity_solid} "specific_heat_capacity_solid", parameters, 1); - DBUG("Use \'%s\' as specific_heat_capacity_solid parameter.", + DBUG("Use '%s' as specific_heat_capacity_solid parameter.", specific_heat_capacity_solid.name.c_str()); // Parameter for the thermal conductivity of the solid (only one scalar per @@ -123,7 +123,7 @@ std::unique_ptr<Process> createHTProcess( *dispersion_config, //! \ogs_file_param_special{prj__processes__process__HT__thermal_dispersivity__longitudinal} "longitudinal", parameters, 1); - DBUG("Use \'%s\' as thermal_dispersivity_longitudinal parameter.", + DBUG("Use '%s' as thermal_dispersivity_longitudinal parameter.", thermal_dispersivity_longitudinal->name.c_str()); // Parameter for the thermal conductivity of the solid (only one scalar @@ -133,7 +133,7 @@ std::unique_ptr<Process> createHTProcess( *dispersion_config, //! \ogs_file_param_special{prj__processes__process__HT__thermal_dispersivity__transversal} "transversal", parameters, 1); - DBUG("Use \'%s\' as thermal_dispersivity_transversal parameter.", + DBUG("Use '%s' as thermal_dispersivity_transversal parameter.", thermal_dispersivity_transversal->name.c_str()); } @@ -143,7 +143,7 @@ std::unique_ptr<Process> createHTProcess( config, //! \ogs_file_param_special{prj__processes__process__HT__thermal_conductivity_solid} "thermal_conductivity_solid", parameters, 1); - DBUG("Use \'%s\' as thermal_conductivity_solid parameter.", + DBUG("Use '%s' as thermal_conductivity_solid parameter.", thermal_conductivity_solid.name.c_str()); // Parameter for the thermal conductivity of the fluid. @@ -151,7 +151,7 @@ std::unique_ptr<Process> createHTProcess( config, //! \ogs_file_param_special{prj__processes__process__HT__thermal_conductivity_fluid} "thermal_conductivity_fluid", parameters, 1); - DBUG("Use \'%s\' as thermal_conductivity_fluid parameter.", + DBUG("Use '%s' as thermal_conductivity_fluid parameter.", thermal_conductivity_fluid.name.c_str()); // Specific body force parameter. @@ -191,12 +191,12 @@ std::unique_ptr<Process> createHTProcess( solid_thermal_expansion = &findParameter<double>( //! \ogs_file_param_special{prj__processes__process__HT__solid_thermal_expansion__thermal_expansion} *solid_config, "thermal_expansion", parameters, 1); - DBUG("Use \'%s\' as solid thermal expansion.", + DBUG("Use '%s' as solid thermal expansion.", solid_thermal_expansion->name.c_str()); biot_constant = &findParameter<double>( //! \ogs_file_param_special{prj__processes__process__HT__solid_thermal_expansion__biot_constant} *solid_config, "biot_constant", parameters, 1); - DBUG("Use \'%s\' as Biot's constant.", biot_constant->name.c_str()); + DBUG("Use '%s' as Biot's constant.", biot_constant->name.c_str()); } std::unique_ptr<ProcessLib::SurfaceFluxData> surfaceflux; diff --git a/ProcessLib/HeatConduction/CreateHeatConductionProcess.cpp b/ProcessLib/HeatConduction/CreateHeatConductionProcess.cpp index 62a959fad2fe7a124aefe473af493ec2be0d66f0..5ccdcad69aaefad75ed7432de40d8101d228932e 100644 --- a/ProcessLib/HeatConduction/CreateHeatConductionProcess.cpp +++ b/ProcessLib/HeatConduction/CreateHeatConductionProcess.cpp @@ -50,7 +50,7 @@ std::unique_ptr<Process> createHeatConductionProcess( //! \ogs_file_param_special{prj__processes__process__HEAT_CONDUCTION__thermal_conductivity} "thermal_conductivity", parameters, 1); - DBUG("Use \'%s\' as thermal conductivity parameter.", + DBUG("Use '%s' as thermal conductivity parameter.", thermal_conductivity.name.c_str()); // heat capacity parameter. @@ -59,7 +59,7 @@ std::unique_ptr<Process> createHeatConductionProcess( //! \ogs_file_param_special{prj__processes__process__HEAT_CONDUCTION__heat_capacity} "heat_capacity", parameters, 1); - DBUG("Use \'%s\' as heat capacity parameter.", heat_capacity.name.c_str()); + DBUG("Use '%s' as heat capacity parameter.", heat_capacity.name.c_str()); // density parameter. auto& density = findParameter<double>( @@ -67,7 +67,7 @@ std::unique_ptr<Process> createHeatConductionProcess( //! \ogs_file_param_special{prj__processes__process__HEAT_CONDUCTION__density} "density", parameters, 1); - DBUG("Use \'%s\' as density parameter.", density.name.c_str()); + DBUG("Use '%s' as density parameter.", density.name.c_str()); HeatConductionProcessData process_data{thermal_conductivity, heat_capacity, density}; diff --git a/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp b/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp index db6148965ebd88eb58975090ef558ff84451405c..24b3224ccca3c60dfece05d235fafbeaced5345e 100644 --- a/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp +++ b/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp @@ -75,7 +75,7 @@ std::unique_ptr<Process> createHeatTransportBHEProcess( "list for config tag <%s>.", pv_name.c_str(), "process_variable"); } - DBUG("Found process variable \'%s\' for config tag <%s>.", + DBUG("Found process variable '%s' for config tag <%s>.", variable->getName().c_str(), "process_variable"); per_process_variables.emplace_back( @@ -91,7 +91,7 @@ std::unique_ptr<Process> createHeatTransportBHEProcess( //! \ogs_file_param_special{prj__processes__process__HEAT_TRANSPORT_BHE__thermal_conductivity_solid} "thermal_conductivity_solid", parameters, 1); - DBUG("Use \'%s\' as solid phase thermal conductivity parameter.", + DBUG("Use '%s' as solid phase thermal conductivity parameter.", thermal_conductivity_solid.name.c_str()); // solid phase thermal conductivity parameter. @@ -100,7 +100,7 @@ std::unique_ptr<Process> createHeatTransportBHEProcess( //! \ogs_file_param_special{prj__processes__process__HEAT_TRANSPORT_BHE__thermal_conductivity_fluid} "thermal_conductivity_fluid", parameters, 1); - DBUG("Use \'%s\' as fluid phase thermal conductivity parameter.", + DBUG("Use '%s' as fluid phase thermal conductivity parameter.", thermal_conductivity_fluid.name.c_str()); // gas phase thermal conductivity parameter. @@ -109,7 +109,7 @@ std::unique_ptr<Process> createHeatTransportBHEProcess( //! \ogs_file_param_special{prj__processes__process__HEAT_TRANSPORT_BHE__thermal_conductivity_gas} "thermal_conductivity_gas", parameters, 1); - DBUG("Use \'%s\' as gas phase thermal conductivity parameter.", + DBUG("Use '%s' as gas phase thermal conductivity parameter.", thermal_conductivity_gas.name.c_str()); // solid phase heat capacity parameter. @@ -118,7 +118,7 @@ std::unique_ptr<Process> createHeatTransportBHEProcess( //! \ogs_file_param_special{prj__processes__process__HEAT_TRANSPORT_BHE__heat_capacity_solid} "heat_capacity_solid", parameters, 1); - DBUG("Use \'%s\' as solid phase heat capacity parameter.", + DBUG("Use '%s' as solid phase heat capacity parameter.", heat_capacity_solid.name.c_str()); // fluid phase heat capacity parameter. @@ -127,7 +127,7 @@ std::unique_ptr<Process> createHeatTransportBHEProcess( //! \ogs_file_param_special{prj__processes__process__HEAT_TRANSPORT_BHE__heat_capacity_fluid} "heat_capacity_fluid", parameters, 1); - DBUG("Use \'%s\' as fluid phase heat capacity parameter.", + DBUG("Use '%s' as fluid phase heat capacity parameter.", heat_capacity_fluid.name.c_str()); // gas phase heat capacity parameter. @@ -136,7 +136,7 @@ std::unique_ptr<Process> createHeatTransportBHEProcess( //! \ogs_file_param_special{prj__processes__process__HEAT_TRANSPORT_BHE__heat_capacity_gas} "heat_capacity_gas", parameters, 1); - DBUG("Use \'%s\' as gas phase heat capacity parameter.", + DBUG("Use '%s' as gas phase heat capacity parameter.", heat_capacity_gas.name.c_str()); // solid phase density parameter. @@ -145,7 +145,7 @@ std::unique_ptr<Process> createHeatTransportBHEProcess( //! \ogs_file_param_special{prj__processes__process__HEAT_TRANSPORT_BHE__density_solid} "density_solid", parameters, 1); - DBUG("Use \'%s\' as solid phase density parameter.", + DBUG("Use '%s' as solid phase density parameter.", density_solid.name.c_str()); // fluid phase density parameter. @@ -154,7 +154,7 @@ std::unique_ptr<Process> createHeatTransportBHEProcess( //! \ogs_file_param_special{prj__processes__process__HEAT_TRANSPORT_BHE__density_fluid} "density_fluid", parameters, 1); - DBUG("Use \'%s\' as fluid phase density parameter.", + DBUG("Use '%s' as fluid phase density parameter.", density_fluid.name.c_str()); // gas phase density parameter. @@ -163,8 +163,7 @@ std::unique_ptr<Process> createHeatTransportBHEProcess( //! \ogs_file_param_special{prj__processes__process__HEAT_TRANSPORT_BHE__density_gas} "density_gas", parameters, 1); - DBUG("Use \'%s\' as gas phase density parameter.", - density_gas.name.c_str()); + DBUG("Use '%s' as gas phase density parameter.", density_gas.name.c_str()); // reading BHE parameters -------------------------------------------------- std::vector<BHE::BHETypes> bhes; diff --git a/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp b/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp index ad862c4a53be0f5d39c445ccd96703446433245c..7612e7fdd99d0ced090ee839bc1734012794b6ad 100644 --- a/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp +++ b/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp @@ -77,7 +77,7 @@ std::unique_ptr<Process> createHydroMechanicsProcess( variable_u = &process_variables[1][0].get(); } - DBUG("Associate displacement with process variable \'%s\'.", + DBUG("Associate displacement with process variable '%s'.", variable_u->getName().c_str()); if (variable_u->getNumberOfComponents() != DisplacementDim) @@ -90,7 +90,7 @@ std::unique_ptr<Process> createHydroMechanicsProcess( DisplacementDim); } - DBUG("Associate pressure with process variable \'%s\'.", + DBUG("Associate pressure with process variable '%s'.", variable_p->getName().c_str()); if (variable_p->getNumberOfComponents() != 1) { @@ -111,7 +111,7 @@ std::unique_ptr<Process> createHydroMechanicsProcess( //! \ogs_file_param_special{prj__processes__process__HYDRO_MECHANICS__intrinsic_permeability} "intrinsic_permeability", parameters, 1); - DBUG("Use \'%s\' as intrinsic conductivity parameter.", + DBUG("Use '%s' as intrinsic conductivity parameter.", intrinsic_permeability.name.c_str()); // Storage coefficient @@ -120,7 +120,7 @@ std::unique_ptr<Process> createHydroMechanicsProcess( //! \ogs_file_param_special{prj__processes__process__HYDRO_MECHANICS__specific_storage} "specific_storage", parameters, 1); - DBUG("Use \'%s\' as storage coefficient parameter.", + DBUG("Use '%s' as storage coefficient parameter.", specific_storage.name.c_str()); // Fluid viscosity @@ -128,7 +128,7 @@ std::unique_ptr<Process> createHydroMechanicsProcess( config, //! \ogs_file_param_special{prj__processes__process__HYDRO_MECHANICS__fluid_viscosity} "fluid_viscosity", parameters, 1); - DBUG("Use \'%s\' as fluid viscosity parameter.", + DBUG("Use '%s' as fluid viscosity parameter.", fluid_viscosity.name.c_str()); // Fluid density @@ -136,14 +136,14 @@ std::unique_ptr<Process> createHydroMechanicsProcess( config, //! \ogs_file_param_special{prj__processes__process__HYDRO_MECHANICS__fluid_density} "fluid_density", parameters, 1); - DBUG("Use \'%s\' as fluid density parameter.", fluid_density.name.c_str()); + DBUG("Use '%s' as fluid density parameter.", fluid_density.name.c_str()); // Biot coefficient auto& biot_coefficient = findParameter<double>( config, //! \ogs_file_param_special{prj__processes__process__HYDRO_MECHANICS__biot_coefficient} "biot_coefficient", parameters, 1); - DBUG("Use \'%s\' as Biot coefficient parameter.", + DBUG("Use '%s' as Biot coefficient parameter.", biot_coefficient.name.c_str()); // Porosity @@ -151,14 +151,14 @@ std::unique_ptr<Process> createHydroMechanicsProcess( config, //! \ogs_file_param_special{prj__processes__process__HYDRO_MECHANICS__porosity} "porosity", parameters, 1); - DBUG("Use \'%s\' as porosity parameter.", porosity.name.c_str()); + DBUG("Use '%s' as porosity parameter.", porosity.name.c_str()); // Solid density auto& solid_density = findParameter<double>( config, //! \ogs_file_param_special{prj__processes__process__HYDRO_MECHANICS__solid_density} "solid_density", parameters, 1); - DBUG("Use \'%s\' as solid density parameter.", solid_density.name.c_str()); + DBUG("Use '%s' as solid density parameter.", solid_density.name.c_str()); // Specific body force Eigen::Matrix<double, DisplacementDim, 1> specific_body_force; diff --git a/ProcessLib/HydroMechanics/HydroMechanicsFEM.h b/ProcessLib/HydroMechanics/HydroMechanicsFEM.h index a00bdc1a0b23c3f96e1cc5c55ba0f0c6b0d79275..98602f0b1ebeae3853112578ad9180c01d3400f9 100644 --- a/ProcessLib/HydroMechanics/HydroMechanicsFEM.h +++ b/ProcessLib/HydroMechanics/HydroMechanicsFEM.h @@ -93,7 +93,7 @@ struct IntegrationPointData final EIGEN_MAKE_ALIGNED_OPERATOR_NEW; }; -/// Used by for extrapolation of the integration point values. It is ordered +/// Used for the extrapolation of the integration point values. It is ordered /// (and stored) by integration points. template <typename ShapeMatrixType> struct SecondaryData diff --git a/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp b/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp index 71c6d8964ddc54aa759c7c01470dc106b998c023..2f75f3bbc23e12579573a7f9d2cb41d54a00b6fb 100644 --- a/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp +++ b/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp @@ -79,7 +79,7 @@ std::unique_ptr<Process> createHydroMechanicsProcess( "list for config tag <%s>.", pv_name.c_str(), "process_variable"); } - DBUG("Found process variable \'%s\' for config tag <%s>.", + DBUG("Found process variable '%s' for config tag <%s>.", variable->getName().c_str(), "process_variable"); if (pv_name.find("displacement") != std::string::npos && @@ -139,7 +139,7 @@ std::unique_ptr<Process> createHydroMechanicsProcess( //! \ogs_file_param_special{prj__processes__process__HYDRO_MECHANICS_WITH_LIE__intrinsic_permeability} "intrinsic_permeability", parameters, 1); - DBUG("Use \'%s\' as intrinsic permeabiltiy parameter.", + DBUG("Use '%s' as intrinsic permeabiltiy parameter.", intrinsic_permeability.name.c_str()); // Storage coefficient @@ -148,7 +148,7 @@ std::unique_ptr<Process> createHydroMechanicsProcess( //! \ogs_file_param_special{prj__processes__process__HYDRO_MECHANICS_WITH_LIE__specific_storage} "specific_storage", parameters, 1); - DBUG("Use \'%s\' as specific storage parameter.", + DBUG("Use '%s' as specific storage parameter.", specific_storage.name.c_str()); // Fluid viscosity @@ -156,7 +156,7 @@ std::unique_ptr<Process> createHydroMechanicsProcess( config, //! \ogs_file_param_special{prj__processes__process__HYDRO_MECHANICS_WITH_LIE__fluid_viscosity} "fluid_viscosity", parameters, 1); - DBUG("Use \'%s\' as fluid viscosity parameter.", + DBUG("Use '%s' as fluid viscosity parameter.", fluid_viscosity.name.c_str()); // Fluid density @@ -164,14 +164,14 @@ std::unique_ptr<Process> createHydroMechanicsProcess( config, //! \ogs_file_param_special{prj__processes__process__HYDRO_MECHANICS_WITH_LIE__fluid_density} "fluid_density", parameters, 1); - DBUG("Use \'%s\' as fluid density parameter.", fluid_density.name.c_str()); + DBUG("Use '%s' as fluid density parameter.", fluid_density.name.c_str()); // Biot coefficient auto& biot_coefficient = findParameter<double>( config, //! \ogs_file_param_special{prj__processes__process__HYDRO_MECHANICS_WITH_LIE__biot_coefficient} "biot_coefficient", parameters, 1); - DBUG("Use \'%s\' as Biot coefficient parameter.", + DBUG("Use '%s' as Biot coefficient parameter.", biot_coefficient.name.c_str()); // Porosity @@ -179,14 +179,14 @@ std::unique_ptr<Process> createHydroMechanicsProcess( config, //! \ogs_file_param_special{prj__processes__process__HYDRO_MECHANICS_WITH_LIE__porosity} "porosity", parameters, 1); - DBUG("Use \'%s\' as porosity parameter.", porosity.name.c_str()); + DBUG("Use '%s' as porosity parameter.", porosity.name.c_str()); // Solid density auto& solid_density = findParameter<double>( config, //! \ogs_file_param_special{prj__processes__process__HYDRO_MECHANICS_WITH_LIE__solid_density} "solid_density", parameters, 1); - DBUG("Use \'%s\' as solid density parameter.", solid_density.name.c_str()); + DBUG("Use '%s' as solid density parameter.", solid_density.name.c_str()); // Specific body force Eigen::Matrix<double, GlobalDim, 1> specific_body_force; @@ -243,7 +243,7 @@ std::unique_ptr<Process> createHydroMechanicsProcess( { OGS_FATAL( "Cannot construct fracture constitutive relation of given type " - "\'%s\'.", + "'%s'.", frac_type.c_str()); } } @@ -285,7 +285,7 @@ std::unique_ptr<Process> createHydroMechanicsProcess( //! \ogs_file_param_special{prj__processes__process__HYDRO_MECHANICS_WITH_LIE__initial_effective_stress} "initial_effective_stress", parameters, MathLib::KelvinVector::KelvinVectorDimensions<GlobalDim>::value); - DBUG("Use \'%s\' as initial effective stress parameter.", + DBUG("Use '%s' as initial effective stress parameter.", initial_effective_stress.name.c_str()); // initial effective stress in fracture @@ -293,7 +293,7 @@ std::unique_ptr<Process> createHydroMechanicsProcess( config, //! \ogs_file_param_special{prj__processes__process__HYDRO_MECHANICS_WITH_LIE__initial_fracture_effective_stress} "initial_fracture_effective_stress", parameters, GlobalDim); - DBUG("Use \'%s\' as initial fracture effective stress parameter.", + DBUG("Use '%s' as initial fracture effective stress parameter.", initial_fracture_effective_stress.name.c_str()); // deactivation of matrix elements in flow diff --git a/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.cpp b/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.cpp index 79af9a356b582d70d62c3ea07edc0272a2e29cd8..7f85a7daa9b6c324a6f359274fb7d7ba281143b0 100644 --- a/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.cpp +++ b/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.cpp @@ -468,7 +468,7 @@ void HydroMechanicsProcess<GlobalDim>::computeSecondaryVariableConcrete( if (it == pvs.end()) { OGS_FATAL( - "Didn't find expected \"displacement_jump1\" process " + "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 bc0f18daee8ca584c36bd1936a545b48296807d8..d3e15c01e3d2d11e69626a608131e85334650362 100644 --- a/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.cpp +++ b/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.cpp @@ -77,7 +77,7 @@ std::unique_ptr<Process> createSmallDeformationProcess( "list for config tag <%s>.", pv_name.c_str(), "process_variable"); } - DBUG("Found process variable \'%s\' for config tag <%s>.", + DBUG("Found process variable '%s' for config tag <%s>.", variable->getName().c_str(), "process_variable"); per_process_variables.emplace_back( @@ -89,7 +89,7 @@ std::unique_ptr<Process> createSmallDeformationProcess( OGS_FATAL("No displacement jump variables are specified"); } - DBUG("Associate displacement with process variable \'%s\'.", + DBUG("Associate displacement with process variable '%s'.", per_process_variables.back().get().getName().c_str()); if (per_process_variables.back().get().getNumberOfComponents() != @@ -143,7 +143,7 @@ std::unique_ptr<Process> createSmallDeformationProcess( { OGS_FATAL( "Cannot construct fracture constitutive relation of given type " - "\'%s\'.", + "'%s'.", frac_type.c_str()); } diff --git a/ProcessLib/LIE/SmallDeformation/LocalAssembler/SecondaryData.h b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SecondaryData.h index 804efe03754a388ec0fa3b858a062442b20f383d..acc3ba987842edeb46a691e245be1f28038c4beb 100644 --- a/ProcessLib/LIE/SmallDeformation/LocalAssembler/SecondaryData.h +++ b/ProcessLib/LIE/SmallDeformation/LocalAssembler/SecondaryData.h @@ -21,7 +21,7 @@ namespace LIE { namespace SmallDeformation { -/// Used by for extrapolation of the integration point values. It is ordered +/// Used for the extrapolation of the integration point values. It is ordered /// (and stored) by integration points. template <typename ShapeMatrixType> struct SecondaryData diff --git a/ProcessLib/Output/IntegrationPointWriter.cpp b/ProcessLib/Output/IntegrationPointWriter.cpp index 5fca5b463826710a9ab8e65261bac1e6895ceab5..2137bd0b1cc00a16976fb6f284d5cd522aa93768 100644 --- a/ProcessLib/Output/IntegrationPointWriter.cpp +++ b/ProcessLib/Output/IntegrationPointWriter.cpp @@ -83,7 +83,7 @@ static ProcessLib::IntegrationPointMetaData extractIntegrationPointMetaData( return {name, md["number_of_components"], md["integration_order"]}; } } - OGS_FATAL("No integration point meta data with name \"%s\" found.", + OGS_FATAL("No integration point meta data with name '%s' found.", name.c_str()); } @@ -113,7 +113,7 @@ IntegrationPointMetaData getIntegrationPointMetaData(MeshLib::Mesh const& mesh, { OGS_FATAL( "Integration point data '%s' is present in the vtk field " - "data but the required \"IntegrationPointMetaData\" array " + "data but the required 'IntegrationPointMetaData' array " "is not available.", name.c_str()); } diff --git a/ProcessLib/Output/Output.cpp b/ProcessLib/Output/Output.cpp index 11eef4fc911c542d94bf38552497e21a8c2a46f5..6a47eca166d8530d158951ae45b71e37c5577d75 100644 --- a/ProcessLib/Output/Output.cpp +++ b/ProcessLib/Output/Output.cpp @@ -39,7 +39,7 @@ int convertVtkDataMode(std::string const& data_mode) return 2; } OGS_FATAL( - "Unsupported vtk output file data mode \"%s\". Expected Ascii, " + "Unsupported vtk output file data mode '%s'. Expected Ascii, " "Binary, or Appended.", data_mode.c_str()); } diff --git a/ProcessLib/Output/ProcessOutput.cpp b/ProcessLib/Output/ProcessOutput.cpp index 939143ffe19d5605b3b079b3052012d01430ceb4..808b1434226e285f7a5de9376fe30e3894cbb9c5 100644 --- a/ProcessLib/Output/ProcessOutput.cpp +++ b/ProcessLib/Output/ProcessOutput.cpp @@ -241,7 +241,7 @@ void makeOutput(std::string const& file_name, MeshLib::Mesh& mesh, bool const compress_output, int const data_mode) { // Write output file - DBUG("Writing output to \'%s\'.", file_name.c_str()); + DBUG("Writing output to '%s'.", file_name.c_str()); MeshLib::IO::VtuInterface vtu_interface(&mesh, data_mode, compress_output); vtu_interface.writeToFile(file_name); } diff --git a/ProcessLib/Parameter/Parameter.cpp b/ProcessLib/Parameter/Parameter.cpp index 2e8b3678419d54724ea27fc3f38e3e6cf1d45f8b..e096aa283e7775d2a3938d19de4e252fa359a853 100644 --- a/ProcessLib/Parameter/Parameter.cpp +++ b/ProcessLib/Parameter/Parameter.cpp @@ -64,8 +64,7 @@ std::unique_ptr<ParameterBase> createParameter( return param; } - OGS_FATAL("Cannot construct a parameter of given type \'%s\'.", - type.c_str()); + OGS_FATAL("Cannot construct a parameter of given type '%s'.", type.c_str()); } } // ProcessLib diff --git a/ProcessLib/PhaseField/CreatePhaseFieldProcess.cpp b/ProcessLib/PhaseField/CreatePhaseFieldProcess.cpp index 63dad638ad686b30a365c4ba8e0fac62bfbd3846..2ce1d9298116ee0c2a581e847094f592f71cf800 100644 --- a/ProcessLib/PhaseField/CreatePhaseFieldProcess.cpp +++ b/ProcessLib/PhaseField/CreatePhaseFieldProcess.cpp @@ -76,7 +76,7 @@ std::unique_ptr<Process> createPhaseFieldProcess( variable_ph = &process_variables[1][0].get(); } - DBUG("Associate displacement with process variable \'%s\'.", + DBUG("Associate displacement with process variable '%s'.", variable_u->getName().c_str()); if (variable_u->getNumberOfComponents() != DisplacementDim) @@ -89,7 +89,7 @@ std::unique_ptr<Process> createPhaseFieldProcess( DisplacementDim); } - DBUG("Associate phase field with process variable \'%s\'.", + DBUG("Associate phase field with process variable '%s'.", variable_ph->getName().c_str()); if (variable_ph->getNumberOfComponents() != 1) { @@ -113,43 +113,42 @@ std::unique_ptr<Process> createPhaseFieldProcess( phasefield_parameters_config, //! \ogs_file_param_special{prj__processes__process__PHASE_FIELD__phasefield_parameters__residual_stiffness} "residual_stiffness", parameters, 1); - DBUG("Use \'%s\' as residual stiffness.", residual_stiffness.name.c_str()); + DBUG("Use '%s' as residual stiffness.", residual_stiffness.name.c_str()); // Crack resistance auto& crack_resistance = findParameter<double>( phasefield_parameters_config, //! \ogs_file_param_special{prj__processes__process__PHASE_FIELD__phasefield_parameters__crack_resistance} "crack_resistance", parameters, 1); - DBUG("Use \'%s\' as crack resistance.", crack_resistance.name.c_str()); + DBUG("Use '%s' as crack resistance.", crack_resistance.name.c_str()); // Crack length scale auto& crack_length_scale = findParameter<double>( phasefield_parameters_config, //! \ogs_file_param_special{prj__processes__process__PHASE_FIELD__phasefield_parameters__crack_length_scale} "crack_length_scale", parameters, 1); - DBUG("Use \'%s\' as crack length scale.", crack_length_scale.name.c_str()); + DBUG("Use '%s' as crack length scale.", crack_length_scale.name.c_str()); // Kinetic coefficient auto& kinetic_coefficient = findParameter<double>( phasefield_parameters_config, //! \ogs_file_param_special{prj__processes__process__PHASE_FIELD__phasefield_parameters__kinetic_coefficient} "kinetic_coefficient", parameters, 1); - DBUG("Use \'%s\' as kinetic coefficient.", - kinetic_coefficient.name.c_str()); + DBUG("Use '%s' as kinetic coefficient.", kinetic_coefficient.name.c_str()); // Solid density auto& solid_density = findParameter<double>( config, //! \ogs_file_param_special{prj__processes__process__PHASE_FIELD__solid_density} "solid_density", parameters, 1); - DBUG("Use \'%s\' as solid density parameter.", solid_density.name.c_str()); + DBUG("Use '%s' as solid density parameter.", solid_density.name.c_str()); // History field auto& history_field = findParameter<double>( phasefield_parameters_config, //! \ogs_file_param_special{prj__processes__process__PHASE_FIELD__phasefield_parameters__history_field} "history_field", parameters, 1); - DBUG("Use \'%s\' as history field.", history_field.name.c_str()); + DBUG("Use '%s' as history field.", history_field.name.c_str()); // Specific body force Eigen::Matrix<double, DisplacementDim, 1> specific_body_force; @@ -175,8 +174,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/PhaseField/PhaseFieldFEM.h b/ProcessLib/PhaseField/PhaseFieldFEM.h index 32466594ff33e7be0aa24aeb0e7597186bfd45b5..50fb98c75034f452e580e98d662769de391ecbf6 100644 --- a/ProcessLib/PhaseField/PhaseFieldFEM.h +++ b/ProcessLib/PhaseField/PhaseFieldFEM.h @@ -94,7 +94,7 @@ struct IntegrationPointData final MathLib::KelvinVector::KelvinVectorDimensions<DisplacementDim>::value; }; -/// Used by for extrapolation of the integration point values. It is ordered +/// Used for the extrapolation of the integration point values. It is ordered /// (and stored) by integration points. template <typename ShapeMatrixType> struct SecondaryData diff --git a/ProcessLib/RichardsComponentTransport/CreateRichardsComponentTransportProcess.cpp b/ProcessLib/RichardsComponentTransport/CreateRichardsComponentTransportProcess.cpp index a651b8cc97757323861c85b901b77c14b1dfc698..bc18d68240f2307b6e50e1011b322f7f4c6343f3 100644 --- a/ProcessLib/RichardsComponentTransport/CreateRichardsComponentTransportProcess.cpp +++ b/ProcessLib/RichardsComponentTransport/CreateRichardsComponentTransportProcess.cpp @@ -88,7 +88,7 @@ std::unique_ptr<Process> createRichardsComponentTransportProcess( config, //! \ogs_file_param_special{prj__processes__process__RichardsComponentTransport__fluid_reference_density} "fluid_reference_density", parameters, 1); - DBUG("Use \'%s\' as fluid_reference_density parameter.", + DBUG("Use '%s' as fluid_reference_density parameter.", fluid_reference_density.name.c_str()); // Parameter for the longitudinal solute dispersivity. @@ -96,7 +96,7 @@ std::unique_ptr<Process> createRichardsComponentTransportProcess( config, //! \ogs_file_param_special{prj__processes__process__RichardsComponentTransport__molecular_diffusion_coefficient} "molecular_diffusion_coefficient", parameters, 1); - DBUG("Use \'%s\' as molecular diffusion coefficient parameter.", + DBUG("Use '%s' as molecular diffusion coefficient parameter.", molecular_diffusion_coefficient.name.c_str()); // Parameter for the longitudinal solute dispersivity. @@ -104,7 +104,7 @@ std::unique_ptr<Process> createRichardsComponentTransportProcess( config, //! \ogs_file_param_special{prj__processes__process__RichardsComponentTransport__solute_dispersivity_longitudinal} "solute_dispersivity_longitudinal", parameters, 1); - DBUG("Use \'%s\' as longitudinal solute dispersivity parameter.", + DBUG("Use '%s' as longitudinal solute dispersivity parameter.", solute_dispersivity_longitudinal.name.c_str()); // Parameter for the transverse solute dispersivity. @@ -112,7 +112,7 @@ std::unique_ptr<Process> createRichardsComponentTransportProcess( config, //! \ogs_file_param_special{prj__processes__process__RichardsComponentTransport__solute_dispersivity_transverse} "solute_dispersivity_transverse", parameters, 1); - DBUG("Use \'%s\' as transverse solute dispersivity parameter.", + DBUG("Use '%s' as transverse solute dispersivity parameter.", solute_dispersivity_transverse.name.c_str()); // Parameter for the retardation factor. diff --git a/ProcessLib/RichardsMechanics/CreateRichardsMechanicsProcess.cpp b/ProcessLib/RichardsMechanics/CreateRichardsMechanicsProcess.cpp index 7234773c662a7cf2d2fd12961b59f70fc032d59a..64ff6796a351d3d3f88c60bfc937750e8f3de255 100644 --- a/ProcessLib/RichardsMechanics/CreateRichardsMechanicsProcess.cpp +++ b/ProcessLib/RichardsMechanics/CreateRichardsMechanicsProcess.cpp @@ -77,7 +77,7 @@ std::unique_ptr<Process> createRichardsMechanicsProcess( variable_u = &process_variables[1][0].get(); } - DBUG("Associate displacement with process variable \'%s\'.", + DBUG("Associate displacement with process variable '%s'.", variable_u->getName().c_str()); if (variable_u->getNumberOfComponents() != DisplacementDim) @@ -90,7 +90,7 @@ std::unique_ptr<Process> createRichardsMechanicsProcess( DisplacementDim); } - DBUG("Associate pressure with process variable \'%s\'.", + DBUG("Associate pressure with process variable '%s'.", variable_p->getName().c_str()); if (variable_p->getNumberOfComponents() != 1) { @@ -111,7 +111,7 @@ std::unique_ptr<Process> createRichardsMechanicsProcess( //! \ogs_file_param_special{prj__processes__process__RICHARDS_MECHANICS__intrinsic_permeability} "intrinsic_permeability", parameters, 1); - DBUG("Use \'%s\' as intrinsic conductivity parameter.", + DBUG("Use '%s' as intrinsic conductivity parameter.", intrinsic_permeability.name.c_str()); // Fluid bulk modulus @@ -119,7 +119,7 @@ std::unique_ptr<Process> createRichardsMechanicsProcess( config, //! \ogs_file_param_special{prj__processes__process__RICHARDS_MECHANICS__fluid_bulk_modulus} "fluid_bulk_modulus", parameters, 1); - DBUG("Use \'%s\' as fluid bulk modulus parameter.", + DBUG("Use '%s' as fluid bulk modulus parameter.", fluid_bulk_modulus.name.c_str()); // Biot coefficient @@ -127,7 +127,7 @@ std::unique_ptr<Process> createRichardsMechanicsProcess( config, //! \ogs_file_param_special{prj__processes__process__RICHARDS_MECHANICS__biot_coefficient} "biot_coefficient", parameters, 1); - DBUG("Use \'%s\' as Biot coefficient parameter.", + DBUG("Use '%s' as Biot coefficient parameter.", biot_coefficient.name.c_str()); // Solid density @@ -135,14 +135,14 @@ std::unique_ptr<Process> createRichardsMechanicsProcess( config, //! \ogs_file_param_special{prj__processes__process__RICHARDS_MECHANICS__solid_density} "solid_density", parameters, 1); - DBUG("Use \'%s\' as solid density parameter.", solid_density.name.c_str()); + DBUG("Use '%s' as solid density parameter.", solid_density.name.c_str()); // Solid bulk modulus auto& solid_bulk_modulus = findParameter<double>( config, //! \ogs_file_param_special{prj__processes__process__RICHARDS_MECHANICS__solid_bulk_modulus} "solid_bulk_modulus", parameters, 1); - DBUG("Use \'%s\' as solid bulk modulus parameter.", + DBUG("Use '%s' as solid bulk modulus parameter.", solid_bulk_modulus.name.c_str()); // Specific body force diff --git a/ProcessLib/RichardsMechanics/RichardsMechanicsFEM.h b/ProcessLib/RichardsMechanics/RichardsMechanicsFEM.h index ca91e763e88f150772a0056eb80827889779e930..dda52d152bf335213c343ada300c0abf9a572ca2 100644 --- a/ProcessLib/RichardsMechanics/RichardsMechanicsFEM.h +++ b/ProcessLib/RichardsMechanics/RichardsMechanicsFEM.h @@ -31,7 +31,7 @@ namespace ProcessLib { namespace RichardsMechanics { -/// Used by for extrapolation of the integration point values. It is ordered +/// Used for the extrapolation of the integration point values. It is ordered /// (and stored) by integration points. template <typename ShapeMatrixType> struct SecondaryData diff --git a/ProcessLib/SmallDeformation/CreateSmallDeformationProcess.cpp b/ProcessLib/SmallDeformation/CreateSmallDeformationProcess.cpp index ddb267a395797e29aad419c995b7958534728f35..63d0b7ed0154135d8c8103fbe70055e8d54e77c0 100644 --- a/ProcessLib/SmallDeformation/CreateSmallDeformationProcess.cpp +++ b/ProcessLib/SmallDeformation/CreateSmallDeformationProcess.cpp @@ -47,7 +47,7 @@ createSmallDeformationProcess( {//! \ogs_file_param_special{prj__processes__process__SMALL_DEFORMATION__process_variables__process_variable} "process_variable"}); - DBUG("Associate displacement with process variable \'%s\'.", + DBUG("Associate displacement with process variable '%s'.", per_process_variables.back().get().getName().c_str()); if (per_process_variables.back().get().getNumberOfComponents() != @@ -73,7 +73,7 @@ createSmallDeformationProcess( config, //! \ogs_file_param_special{prj__processes__process__SMALL_DEFORMATION__solid_density} "solid_density", parameters, 1); - DBUG("Use \'%s\' as solid density parameter.", solid_density.name.c_str()); + DBUG("Use '%s' as solid density parameter.", solid_density.name.c_str()); // Specific body force Eigen::Matrix<double, DisplacementDim, 1> specific_body_force; diff --git a/ProcessLib/SmallDeformation/SmallDeformationFEM.h b/ProcessLib/SmallDeformation/SmallDeformationFEM.h index f15ad75ede39695bcd23a81cc616517503636d7e..19554fbc6436ea8b41696b1bbd1d3ade38f377f7 100644 --- a/ProcessLib/SmallDeformation/SmallDeformationFEM.h +++ b/ProcessLib/SmallDeformation/SmallDeformationFEM.h @@ -69,7 +69,7 @@ struct IntegrationPointData final EIGEN_MAKE_ALIGNED_OPERATOR_NEW; }; -/// Used by for extrapolation of the integration point values. It is ordered +/// Used for the extrapolation of the integration point values. It is ordered /// (and stored) by integration points. template <typename ShapeMatrixType> struct SecondaryData diff --git a/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp b/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp index 20cb7734353c852f7e48a3461512ebedf994f0f6..560cb5f5537f76c04cd24f77f290a46f1b7a08dd 100644 --- a/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp +++ b/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp @@ -202,7 +202,7 @@ void SmallDeformationProcess<DisplacementDim>::initializeConcreteProcess( { OGS_FATAL( "Different number of components in meta data (%d) than in " - "the integration point field data for \"%s\": %d.", + "the integration point field data for '%s': %d.", ip_meta_data.n_components, name.c_str(), mesh_property.getNumberOfComponents()); } diff --git a/ProcessLib/SurfaceFlux/SurfaceFluxData.h b/ProcessLib/SurfaceFlux/SurfaceFluxData.h index d1f799a08c4fbe957a530e1f4563b6912efb0e25..30f21635ae28c6dc808a04f787d36588a6762e64 100644 --- a/ProcessLib/SurfaceFlux/SurfaceFluxData.h +++ b/ProcessLib/SurfaceFlux/SurfaceFluxData.h @@ -42,8 +42,8 @@ struct SurfaceFluxData { DBUG( "read surfaceflux meta data:\n\tsurfaceflux " - "mesh:\"%s\"\n\tproperty name: " - "\"%s\"\n\toutput to: \"%s\"", + "mesh:'%s'\n\tproperty name: " + "'%s'\n\toutput to: '%s'", mesh_name.c_str(), property_vector_name.c_str(), output_mesh_file_name.c_str()); } diff --git a/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPProcess.cpp b/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPProcess.cpp index 9595d13dca24b3d961f324f6b6fd254e87000639..b098659d6ceaf6e6c0222e74fbcef8adea5a4e64 100644 --- a/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPProcess.cpp +++ b/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPProcess.cpp @@ -90,14 +90,14 @@ std::unique_ptr<Process> createThermalTwoPhaseFlowWithPPProcess( config, //! \ogs_file_param_special{prj__processes__process__TWOPHASE_FLOW_THERMAL__density_solid} "density_solid", parameters, 1); - DBUG("Use \'%s\' as density_solid parameter.", density_solid.name.c_str()); + DBUG("Use '%s' as density_solid parameter.", density_solid.name.c_str()); // Parameter for the latent heat of evaporation. auto& latent_heat_evaporation = findParameter<double>( config, //! \ogs_file_param_special{prj__processes__process__TWOPHASE_FLOW_THERMAL__latent_heat_evaporation} "latent_heat_evaporation", parameters, 1); - DBUG("Use \'%s\' as latent_heat_evaporation parameter.", + DBUG("Use '%s' as latent_heat_evaporation parameter.", latent_heat_evaporation.name.c_str()); //! \ogs_file_param{prj__processes__process__TWOPHASE_FLOW_THERMAL__material_property} diff --git a/ProcessLib/ThermoMechanicalPhaseField/CreateThermoMechanicalPhaseFieldProcess.cpp b/ProcessLib/ThermoMechanicalPhaseField/CreateThermoMechanicalPhaseFieldProcess.cpp index 2deccc667b4c8c298298261b3168ba70814161d1..82025f3dda57a36f425d56942a1f9c1f9cdf1f83 100644 --- a/ProcessLib/ThermoMechanicalPhaseField/CreateThermoMechanicalPhaseFieldProcess.cpp +++ b/ProcessLib/ThermoMechanicalPhaseField/CreateThermoMechanicalPhaseFieldProcess.cpp @@ -73,7 +73,7 @@ std::unique_ptr<Process> createThermoMechanicalPhaseFieldProcess( ProcessVariable* variable_ph = &process_variables[process_variables.size() - 1][0].get(); - DBUG("Associate displacement with process variable \'%s\'.", + DBUG("Associate displacement with process variable '%s'.", variable_u->getName().c_str()); if (variable_u->getNumberOfComponents() != DisplacementDim) @@ -86,7 +86,7 @@ std::unique_ptr<Process> createThermoMechanicalPhaseFieldProcess( DisplacementDim); } - DBUG("Associate phase field with process variable \'%s\'.", + DBUG("Associate phase field with process variable '%s'.", variable_ph->getName().c_str()); if (variable_ph->getNumberOfComponents() != 1) { @@ -97,7 +97,7 @@ std::unique_ptr<Process> createThermoMechanicalPhaseFieldProcess( variable_ph->getNumberOfComponents()); } - DBUG("Associate temperature with process variable \'%s\'.", + DBUG("Associate temperature with process variable '%s'.", variable_T->getName().c_str()); if (variable_T->getNumberOfComponents() != 1) { @@ -126,43 +126,42 @@ std::unique_ptr<Process> createThermoMechanicalPhaseFieldProcess( phasefield_parameters_config, //! \ogs_file_param_special{prj__processes__process__THERMO_MECHANICAL_PHASE_FIELD__phasefield_parameters__residual_stiffness} "residual_stiffness", parameters, 1); - DBUG("Use \'%s\' as residual stiffness.", residual_stiffness.name.c_str()); + DBUG("Use '%s' as residual stiffness.", residual_stiffness.name.c_str()); // Crack resistance auto& crack_resistance = findParameter<double>( phasefield_parameters_config, //! \ogs_file_param_special{prj__processes__process__THERMO_MECHANICAL_PHASE_FIELD__phasefield_parameters__crack_resistance} "crack_resistance", parameters, 1); - DBUG("Use \'%s\' as crack resistance.", crack_resistance.name.c_str()); + DBUG("Use '%s' as crack resistance.", crack_resistance.name.c_str()); // Crack length scale auto& crack_length_scale = findParameter<double>( phasefield_parameters_config, //! \ogs_file_param_special{prj__processes__process__THERMO_MECHANICAL_PHASE_FIELD__phasefield_parameters__crack_length_scale} "crack_length_scale", parameters, 1); - DBUG("Use \'%s\' as crack length scale.", crack_length_scale.name.c_str()); + DBUG("Use '%s' as crack length scale.", crack_length_scale.name.c_str()); // Kinetic coefficient auto& kinetic_coefficient = findParameter<double>( phasefield_parameters_config, //! \ogs_file_param_special{prj__processes__process__THERMO_MECHANICAL_PHASE_FIELD__phasefield_parameters__kinetic_coefficient} "kinetic_coefficient", parameters, 1); - DBUG("Use \'%s\' as kinetic coefficient.", - kinetic_coefficient.name.c_str()); + DBUG("Use '%s' as kinetic coefficient.", kinetic_coefficient.name.c_str()); // Solid density auto& solid_density = findParameter<double>( config, //! \ogs_file_param_special{prj__processes__process__THERMO_MECHANICAL_PHASE_FIELD__reference_solid_density} "solid_density", parameters, 1); - DBUG("Use \'%s\' as solid density parameter.", solid_density.name.c_str()); + DBUG("Use '%s' as solid density parameter.", solid_density.name.c_str()); // Linear thermal expansion coefficient auto& linear_thermal_expansion_coefficient = findParameter<double>( thermal_parameters_config, //! \ogs_file_param_special{prj__processes__process__THERMO_MECHANICAL_PHASE_FIELD__thermal_parameters__linear_thermal_expansion_coefficient} "linear_thermal_expansion_coefficient", parameters, 1); - DBUG("Use \'%s\' as linear thermal expansion coefficient.", + DBUG("Use '%s' as linear thermal expansion coefficient.", linear_thermal_expansion_coefficient.name.c_str()); // Specific heat capacity @@ -170,7 +169,7 @@ std::unique_ptr<Process> createThermoMechanicalPhaseFieldProcess( thermal_parameters_config, //! \ogs_file_param_special{prj__processes__process__THERMO_MECHANICAL_PHASE_FIELD__thermal_parameters__specific_heat_capacity} "specific_heat_capacity", parameters, 1); - DBUG("Use \'%s\' as specific heat capacity.", + DBUG("Use '%s' as specific heat capacity.", specific_heat_capacity.name.c_str()); // Thermal conductivity @@ -178,14 +177,14 @@ std::unique_ptr<Process> createThermoMechanicalPhaseFieldProcess( thermal_parameters_config, //! \ogs_file_param_special{prj__processes__process__THERMO_MECHANICAL_PHASE_FIELD__thermal_parameters__thermal_conductivity} "thermal_conductivity", parameters, 1); - DBUG("Use \'%s\' as thermal conductivity parameter.", + DBUG("Use '%s' as thermal conductivity parameter.", thermal_conductivity.name.c_str()); // Residual thermal conductivity auto& residual_thermal_conductivity = findParameter<double>( thermal_parameters_config, //! \ogs_file_param_special{prj__processes__process__THERMO_MECHANICAL_PHASE_FIELD__thermal_parameters__residual_thermal_conductivity} "residual_thermal_conductivity", parameters, 1); - DBUG("Use \'%s\' as residual thermal conductivity parameter.", + DBUG("Use '%s' as residual thermal conductivity parameter.", residual_thermal_conductivity.name.c_str()); // Reference temperature const double reference_temperature = diff --git a/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldFEM.h b/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldFEM.h index 774b7fc7fe79c9856c398de875050b98fcb981e1..e7b4e849fd63c8c369a46a1d0acbbc0d8ec30333 100644 --- a/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldFEM.h +++ b/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldFEM.h @@ -97,7 +97,7 @@ struct IntegrationPointData final EIGEN_MAKE_ALIGNED_OPERATOR_NEW; }; -/// Used by for extrapolation of the integration point values. It is ordered +/// Used for the extrapolation of the integration point values. It is ordered /// (and stored) by integration points. template <typename ShapeMatrixType> struct SecondaryData diff --git a/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.cpp b/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.cpp index c7e3435c9078b7afcfe5fb350127db18388fbe97..1103263aa8be815e9afd64abde70855a37ee6dbd 100644 --- a/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.cpp +++ b/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.cpp @@ -76,7 +76,7 @@ std::unique_ptr<Process> createThermoMechanicsProcess( variable_u = &process_variables[1][0].get(); } - DBUG("Associate displacement with process variable \'%s\'.", + DBUG("Associate displacement with process variable '%s'.", variable_u->getName().c_str()); if (variable_u->getNumberOfComponents() != DisplacementDim) @@ -89,7 +89,7 @@ std::unique_ptr<Process> createThermoMechanicsProcess( DisplacementDim); } - DBUG("Associate temperature with process variable \'%s\'.", + DBUG("Associate temperature with process variable '%s'.", variable_T->getName().c_str()); if (variable_T->getNumberOfComponents() != 1) { @@ -111,7 +111,7 @@ std::unique_ptr<Process> createThermoMechanicsProcess( config, //! \ogs_file_param_special{prj__processes__process__THERMO_MECHANICS__reference_solid_density} "reference_solid_density", parameters, 1); - DBUG("Use \'%s\' as solid density parameter.", + DBUG("Use '%s' as solid density parameter.", reference_solid_density.name.c_str()); // Linear thermal expansion coefficient @@ -119,21 +119,21 @@ std::unique_ptr<Process> createThermoMechanicsProcess( config, //! \ogs_file_param_special{prj__processes__process__THERMO_MECHANICS__linear_thermal_expansion_coefficient} "linear_thermal_expansion_coefficient", parameters, 1); - DBUG("Use \'%s\' as linear thermal expansion coefficient.", + DBUG("Use '%s' as linear thermal expansion coefficient.", linear_thermal_expansion_coefficient.name.c_str()); // Specific heat capacity auto& specific_heat_capacity = findParameter<double>( config, //! \ogs_file_param_special{prj__processes__process__THERMO_MECHANICS__specific_heat_capacity} "specific_heat_capacity", parameters, 1); - DBUG("Use \'%s\' as specific heat capacity parameter.", + DBUG("Use '%s' as specific heat capacity parameter.", specific_heat_capacity.name.c_str()); // Thermal conductivity // TODO To be changed as tensor input. auto& thermal_conductivity = findParameter<double>( config, //! \ogs_file_param_special{prj__processes__process__THERMO_MECHANICS__thermal_conductivity} "thermal_conductivity", parameters, 1); - DBUG("Use \'%s\' as thermal conductivity parameter.", + DBUG("Use '%s' as thermal conductivity parameter.", thermal_conductivity.name.c_str()); // Specific body force diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h b/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h index aff008fe98599b7ae36ade3bb97e67efff9481d7..3c85df81d2a54a766c6de6f3f6e1329ec78ddfb0 100644 --- a/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h +++ b/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h @@ -75,7 +75,7 @@ struct IntegrationPointData final EIGEN_MAKE_ALIGNED_OPERATOR_NEW; }; -/// Used by for extrapolation of the integration point values. It is ordered +/// Used for the extrapolation of the integration point values. It is ordered /// (and stored) by integration points. template <typename ShapeMatrixType> struct SecondaryData diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.cpp b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.cpp index cf73f8ca353c6154e81e45b3abe21e46b2395526..128b055f0c411c68f7123475f081daa24fe94b95 100644 --- a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.cpp +++ b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.cpp @@ -127,7 +127,7 @@ void ThermoMechanicsProcess<DisplacementDim>::initializeConcreteProcess( { OGS_FATAL( "Different number of components in meta data (%d) than in " - "the integration point field data for \"%s\": %d.", + "the integration point field data for '%s': %d.", ip_meta_data.n_components, name.c_str(), mesh_property.getNumberOfComponents()); } diff --git a/ProcessLib/Utils/ProcessUtils.cpp b/ProcessLib/Utils/ProcessUtils.cpp index 93f509975bb2dd7f06c30cafb611cb5c4e580bbb..80237f0ff2cee3bf67df22e40ca5499faf1c538c 100644 --- a/ProcessLib/Utils/ProcessUtils.cpp +++ b/ProcessLib/Utils/ProcessUtils.cpp @@ -32,7 +32,7 @@ ProcessVariable& findProcessVariable( "list for config tag <%s>.", name.c_str(), tag.c_str()); } - DBUG("Found process variable \'%s\' for config tag <%s>.", + DBUG("Found process variable '%s' for config tag <%s>.", variable->getName().c_str(), tag.c_str()); // Const cast is needed because of variables argument constness.