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/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/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/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/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/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/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/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/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 8aa7382d43257df1e2fd9721dc705b529e068061..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; 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/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/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/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/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.