diff --git a/ChemistryLib/PhreeqcIO.cpp b/ChemistryLib/PhreeqcIO.cpp index 7664ac36ea91ab8458b1f9ac710c9cf58777f7fd..f5f11f26ef4ae5fc42defa05fb8c12c5774cf90e 100644 --- a/ChemistryLib/PhreeqcIO.cpp +++ b/ChemistryLib/PhreeqcIO.cpp @@ -412,7 +412,9 @@ std::istream& operator>>(std::istream& in, PhreeqcIO& phreeqc_io) { // Skip equilibrium calculation result of initial solution for (int i = 0; i < num_skipped_lines; ++i) + { in.ignore(std::numeric_limits<std::streamsize>::max(), '\n'); + } // Get calculation result of the solution after the reaction if (!std::getline(in, line)) diff --git a/ChemistryLib/PhreeqcIOData/CreateSurface.cpp b/ChemistryLib/PhreeqcIOData/CreateSurface.cpp index 258c862a34662abadc125cadcfa40414933f687c..5c173e998e1a1f74728741647bc6981a3ec7db04 100644 --- a/ChemistryLib/PhreeqcIOData/CreateSurface.cpp +++ b/ChemistryLib/PhreeqcIOData/CreateSurface.cpp @@ -20,7 +20,9 @@ std::vector<SurfaceSite> createSurface( boost::optional<BaseLib::ConfigTree> const& config) { if (!config) + { return {}; + } std::vector<SurfaceSite> surface; for (auto const& site_config : diff --git a/ChemistryLib/PhreeqcIOData/CreateUserPunch.cpp b/ChemistryLib/PhreeqcIOData/CreateUserPunch.cpp index 9fd59e131dacca96b98ca4bf5307e58aba2308d4..fa1f5e70687806ac8e0a9c40d2dfbbe3a1455a39 100644 --- a/ChemistryLib/PhreeqcIOData/CreateUserPunch.cpp +++ b/ChemistryLib/PhreeqcIOData/CreateUserPunch.cpp @@ -22,7 +22,9 @@ std::unique_ptr<UserPunch> createUserPunch( MeshLib::Mesh const& mesh) { if (!config) + { return nullptr; + } std::vector<SecondaryVariable> secondary_variables; for (auto const& variable_name : diff --git a/ChemistryLib/PhreeqcIOData/Dump.h b/ChemistryLib/PhreeqcIOData/Dump.h index 51165600c0a2cee413f876e8b3e1cc0c8f4de742..eb364310f546f9694ca35a36a33e778d2aa7dc68 100644 --- a/ChemistryLib/PhreeqcIOData/Dump.h +++ b/ChemistryLib/PhreeqcIOData/Dump.h @@ -19,7 +19,8 @@ namespace PhreeqcIOData { struct Dump { - Dump(std::string project_file_name) : dump_file(project_file_name + ".dmp") + explicit Dump(std::string project_file_name) + : dump_file(project_file_name + ".dmp") { } diff --git a/ChemistryLib/PhreeqcIOData/UserPunch.cpp b/ChemistryLib/PhreeqcIOData/UserPunch.cpp index 07a4c736ba1b97b0748af9f789f735c3bff2f4d9..4cfe1777c129196d712c63ecb71e21cd09403143 100644 --- a/ChemistryLib/PhreeqcIOData/UserPunch.cpp +++ b/ChemistryLib/PhreeqcIOData/UserPunch.cpp @@ -20,7 +20,9 @@ std::ostream& operator<<(std::ostream& os, UserPunch const& user_punch) os << "-headings "; auto const& secondary_variables = user_punch.secondary_variables; for (auto& secondary_variable : secondary_variables) + { os << secondary_variable.name.c_str() << " "; + } os << "\n"; os << "-start" << "\n"; diff --git a/ProcessLib/ComponentTransport/ComponentTransportFEM.h b/ProcessLib/ComponentTransport/ComponentTransportFEM.h index 59d6f9df50e7108dcd647d6d334d60105948127f..671b8044da3d0ae80c8fe64547c84d3100e999d1 100644 --- a/ProcessLib/ComponentTransport/ComponentTransportFEM.h +++ b/ProcessLib/ComponentTransport/ComponentTransportFEM.h @@ -513,8 +513,10 @@ public: w * dNdx.transpose() * density * K_over_mu * dNdx; if (_process_data.has_gravity) + { local_b.noalias() += w * density * density * dNdx.transpose() * K_over_mu * b; + } // coupling term {