Merge pull request #589 from sebproell/cstr

Remove unnecessary c_str() in exceptions

Author: sebproell

apps/create_rtdfiles/4C_create_rtdfiles_wrapper.cpp

@@ -37,7 +37,7 @@ namespace RTD
     // open ascii file for writing the cell type information
     std::ofstream elementinformationfile(elementinformationfilename.c_str());
     if (!elementinformationfile)
-      FOUR_C_THROW("failed to open file: {}", elementinformationfilename.c_str());
+      FOUR_C_THROW("failed to open file: {}", elementinformationfilename);
     elementinformationfile << "# yaml file created using 4C version (git SHA1):\n";
     elementinformationfile << "# " << VersionControl::git_hash << "\n#\n";
 
@@ -52,7 +52,7 @@ namespace RTD
     // open ascii file for writing all header parameters
     std::ofstream headerdocumentationfile(headerdocumentationfilename.c_str());
     if (!headerdocumentationfile)
-      FOUR_C_THROW("failed to open file: {}", headerdocumentationfilename.c_str());
+      FOUR_C_THROW("failed to open file: {}", headerdocumentationfilename);
     headerdocumentationfile << "..\n   Created using 4C version (git SHA1):\n";
     headerdocumentationfile << "   " << VersionControl::git_hash << "\n\n";
     headerdocumentationfile << ".. _headerparameters:\n\n";
@@ -87,7 +87,7 @@ namespace RTD
     // open ascii file for writing all header parameters
     std::ofstream celltypeocumentationfile(celltypedocumentationfilename.c_str());
     if (!celltypeocumentationfile)
-      FOUR_C_THROW("failed to open file: {}", celltypedocumentationfilename.c_str());
+      FOUR_C_THROW("failed to open file: {}", celltypedocumentationfilename);
     celltypeocumentationfile << "..\n   Created using 4C version (git SHA1):\n";
     celltypeocumentationfile << "   " << VersionControl::git_hash << "\n\n";
 
@@ -102,7 +102,7 @@ namespace RTD
     // open ascii file for writing all material parameters
     std::ofstream materialdocumentationfile(materialdocumentationfilename.c_str());
     if (!materialdocumentationfile)
-      FOUR_C_THROW("failed to open file: {}", materialdocumentationfilename.c_str());
+      FOUR_C_THROW("failed to open file: {}", materialdocumentationfilename);
     materialdocumentationfile << "..\n   Created using 4C version (git SHA1):\n";
     materialdocumentationfile << "   " << VersionControl::git_hash << "\n\n";
     write_material_reference(materialdocumentationfile, Global::valid_materials());
@@ -116,7 +116,7 @@ namespace RTD
     // open ascii file for writing all constrains / conditions parameters
     std::ofstream conditiondocumentationfile(conditiondocumentationfilename.c_str());
     if (!conditiondocumentationfile)
-      FOUR_C_THROW("failed to open file: {}", conditiondocumentationfilename.c_str());
+      FOUR_C_THROW("failed to open file: {}", conditiondocumentationfilename);
     conditiondocumentationfile << "..\n   Created using 4C version (git SHA1):\n";
     conditiondocumentationfile << "   " << VersionControl::git_hash << "\n\n";
     write_conditions_reference(conditiondocumentationfile, Input::valid_conditions());
@@ -133,7 +133,7 @@ namespace RTD
     // open ascii file for writing other (non header) parameters
     std::ofstream variousdocumentationfile(variousdocumentationfilename.c_str());
     if (!variousdocumentationfile)
-      FOUR_C_THROW("failed to open file: {}", variousdocumentationfilename.c_str());
+      FOUR_C_THROW("failed to open file: {}", variousdocumentationfilename);
     variousdocumentationfile << "..\n   Created using 4C version (git SHA1):\n";
     variousdocumentationfile << "   " << VersionControl::git_hash << "\n\n";
     write_various_reference(variousdocumentationfile);

apps/global_full/4C_global_full_main.cpp

@@ -263,7 +263,7 @@ namespace
         FOUR_C_THROW("4C produced an unknown floating point exception.");
         break;
     }
-    FOUR_C_THROW("4C produced a {} floating point exception.", exception_string.c_str());
+    FOUR_C_THROW("4C produced a {} floating point exception.", exception_string);
   }
 #endif
 

apps/post_monitor/4C_post_monitor.cpp

@@ -163,7 +163,7 @@ void MonWriter::write_mon_stress_file(
 {
   // stop it now
   if ((stresstype != "none") and (stresstype != "ndxyz"))
-    FOUR_C_THROW("Cannot deal with requested stress output type: {}", stresstype.c_str());
+    FOUR_C_THROW("Cannot deal with requested stress output type: {}", stresstype);
 
   // write stress
   if (stresstype != "none")
@@ -187,7 +187,7 @@ void MonWriter::write_mon_strain_file(
 {
   // stop it now
   if ((straintype != "none") and (straintype != "ndxyz"))
-    FOUR_C_THROW("Cannot deal with requested strain output type: {}", straintype.c_str());
+    FOUR_C_THROW("Cannot deal with requested strain output type: {}", straintype);
 
   if (straintype != "none")
   {
@@ -213,7 +213,7 @@ void MonWriter::write_mon_pl_strain_file(
 {
   // stop it now
   if ((straintype != "none") and (straintype != "ndxyz"))
-    FOUR_C_THROW("Cannot deal with requested plastic strain output type: {}", straintype.c_str());
+    FOUR_C_THROW("Cannot deal with requested plastic strain output type: {}", straintype);
 
   if (straintype != "none")
   {
@@ -329,7 +329,7 @@ void MonWriter::write_mon_heatflux_file(
 {
   // stop it now
   if ((heatfluxtype != "none") and (heatfluxtype != "ndxyz"))
-    FOUR_C_THROW("Cannot deal with requested heatflux output type: {}", heatfluxtype.c_str());
+    FOUR_C_THROW("Cannot deal with requested heatflux output type: {}", heatfluxtype);
 
   // write heatflux
   if (heatfluxtype != "none")
@@ -357,8 +357,7 @@ void MonWriter::write_mon_tempgrad_file(
 {
   // stop it now
   if ((tempgradtype != "none") and (tempgradtype != "ndxyz"))
-    FOUR_C_THROW(
-        "Cannot deal with requested temperature gradient output type: {}", tempgradtype.c_str());
+    FOUR_C_THROW("Cannot deal with requested temperature gradient output type: {}", tempgradtype);
 
   if (tempgradtype != "none")
   {
@@ -1851,8 +1850,8 @@ int main(int argc, char** argv)
         mymonwriter.write_mon_file(problem, infieldtype, node);
       }
       else
-        FOUR_C_THROW("Unsupported field type {} for problem-type Multiphase_Poroelasticity",
-            infieldtype.c_str());
+        FOUR_C_THROW(
+            "Unsupported field type {} for problem-type Multiphase_Poroelasticity", infieldtype);
       break;
     }
     case Core::ProblemType::poromultiphasescatra:
@@ -1879,7 +1878,7 @@ int main(int argc, char** argv)
       }
       else
         FOUR_C_THROW("Unsupported field type {} for problem-type Multiphase_Poroelasticity_ScaTra",
-            infieldtype.c_str());
+            infieldtype);
       break;
     }
     default:

apps/post_processor/4C_post_processor.cpp

@@ -627,7 +627,7 @@ int main(int argc, char** argv)
     if (filter == "ensight" || filter == "vtu" || filter == "vtu_node_based" || filter == "vti")
       run_ensight_vtu_filter(problem);
     else
-      FOUR_C_THROW("Unknown filter {} given, supported filters: [ensight|vtu|vti]", filter.c_str());
+      FOUR_C_THROW("Unknown filter {} given, supported filters: [ensight|vtu|vti]", filter);
 
   }  // try
   catch (Core::Exception& err)

apps/pre_exodus/4C_pre_exodus.cpp

@@ -48,7 +48,7 @@ namespace
 
     // open default bc specification file
     std::ofstream defaultbc(defaultbcfilename.c_str());
-    if (!defaultbc) FOUR_C_THROW("failed to open file: {}", defaultbcfilename.c_str());
+    if (!defaultbc) FOUR_C_THROW("failed to open file: {}", defaultbcfilename);
 
     // write mesh verbosely
     defaultbc << "----------- Mesh contents -----------" << std::endl << std::endl;
@@ -303,7 +303,7 @@ int main(int argc, char** argv)
 
       // open default header file
       std::ofstream defaulthead(defaultheadfilename.c_str());
-      if (!defaulthead) FOUR_C_THROW("failed to open file: {}", defaultheadfilename.c_str());
+      if (!defaulthead) FOUR_C_THROW("failed to open file: {}", defaultheadfilename);
 
       // get valid input parameters
       auto parameters = Input::valid_parameters();

apps/pre_exodus/4C_pre_exodus_writedat.cpp

@@ -25,7 +25,7 @@ int EXODUS::write_dat_file(const std::string& datfile, const EXODUS::Mesh& mymes
 {
   // open datfile
   std::ofstream dat(datfile.c_str());
-  if (!dat) FOUR_C_THROW("failed to open file: {}", datfile.c_str());
+  if (!dat) FOUR_C_THROW("failed to open file: {}", datfile);
 
   // write dat-file intro
   EXODUS::write_dat_intro(headfile, mymesh, dat);
@@ -259,8 +259,7 @@ std::vector<double> EXODUS::calc_normal_surf_locsys(const int ns_id, const EXODU
   }
   if (normaltangent.size() == 1)
   {
-    FOUR_C_THROW(
-        "Warning! No normal defined for SurfLocsys within nodeset '{}'!", (ns.get_name()).c_str());
+    FOUR_C_THROW("Warning! No normal defined for SurfLocsys within nodeset '{}'!", (ns.get_name()));
   }
 
   // find tangent by Gram-Schmidt

src/adapter/4C_adapter_ale.cpp

@@ -142,7 +142,7 @@ void Adapter::AleBaseAlgorithm::setup_ale(
     default:
     {
       FOUR_C_THROW("Decide, whether ALE_TYPE = '{}' is linear or nonlinear.",
-          adyn->get<std::string>("ALE_TYPE").c_str());
+          adyn->get<std::string>("ALE_TYPE"));
       break;
     }
   }

src/adapter/4C_adapter_scatra_base_algorithm.cpp

@@ -63,7 +63,7 @@ Adapter::ScaTraBaseAlgorithm::ScaTraBaseAlgorithm(const Teuchos::ParameterList&
   // -------------------------------------------------------------------
   auto output = discret->writer();
   if (discret->num_global_elements() == 0)
-    FOUR_C_THROW("No elements in discretization {}", discret->name().c_str());
+    FOUR_C_THROW("No elements in discretization {}", discret->name());
   output->write_mesh(0, 0.0);
 
   // -------------------------------------------------------------------

src/ale/4C_ale_ale2_evaluate.cpp

@@ -49,7 +49,7 @@ int Discret::Elements::Ale2::evaluate(Teuchos::ParameterList& params,
   else if (action == "calc_jacobian_determinant")
     act = Ale2::calc_det_jac;
   else
-    FOUR_C_THROW("{} is an unknown type of action for Ale2", action.c_str());
+    FOUR_C_THROW("{} is an unknown type of action for Ale2", action);
 
   bool spatialconfiguration = true;
   if (params.isParameter("use spatial configuration"))

src/ale/4C_ale_ale3_input.cpp

@@ -54,7 +54,7 @@ bool Discret::Elements::Ale3::read_element(const std::string& eletype, const std
       break;
     }
     default:
-      FOUR_C_THROW("Unknown distype {} for ALE3 element", distype.c_str());
+      FOUR_C_THROW("Unknown distype {} for ALE3 element", distype);
       // just set to something to shutup compiler
       gaussrule = Core::FE::GaussRule3D::undefined;
       break;