diff --git a/Applications/DataExplorer/DataView/GEOModels.cpp b/Applications/DataExplorer/DataView/GEOModels.cpp index 07956cace67..ccb787e712a 100644 --- a/Applications/DataExplorer/DataView/GEOModels.cpp +++ b/Applications/DataExplorer/DataView/GEOModels.cpp @@ -104,7 +104,8 @@ std::vector GEOModels::getGeometryNames() const { return _geo_objects.getGeometryNames(); } -const std::vector* GEOModels::getPointVec(const std::string& name) const +const std::vector* GEOModels::getPointVec( + const std::string& name) const { return _geo_objects.getPointVec(name); } diff --git a/Applications/DataExplorer/DataView/ModellingTabWidget.cpp b/Applications/DataExplorer/DataView/ModellingTabWidget.cpp index 553ba4622b9..a72f055d741 100644 --- a/Applications/DataExplorer/DataView/ModellingTabWidget.cpp +++ b/Applications/DataExplorer/DataView/ModellingTabWidget.cpp @@ -12,8 +12,6 @@ * */ -// ** INCLUDES ** -//#include "ProcessModel.h" #include "ModellingTabWidget.h" ModellingTabWidget::ModellingTabWidget(QWidget* parent /*= 0*/) diff --git a/Applications/DataExplorer/DataView/ProcessView.cpp b/Applications/DataExplorer/DataView/ProcessView.cpp index 93dab4ea009..e48aff67921 100644 --- a/Applications/DataExplorer/DataView/ProcessView.cpp +++ b/Applications/DataExplorer/DataView/ProcessView.cpp @@ -17,7 +17,6 @@ #include "CondItem.h" #include "ProcessModel.h" #include "ProcessVarItem.h" -//#include "FEMConditionSetupDialog.h" #include "SelectMeshDialog.h" ProcessView::ProcessView(QWidget* parent) : QTreeView(parent) {} diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.cpp index cb279baec55..7a3d6dfc5e7 100644 --- a/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.cpp +++ b/Applications/DataExplorer/VtkVis/VtkCompositeNodeSelectionFilter.cpp @@ -12,16 +12,15 @@ * */ -// ** INCLUDES ** #include "VtkCompositeNodeSelectionFilter.h" -#include -//#include "VtkCompositePointToGlyphFilter.h" #include #include #include #include +#include + #include "VtkPointsSource.h" VtkCompositeNodeSelectionFilter::VtkCompositeNodeSelectionFilter( diff --git a/Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp b/Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp index ac715ded592..4f6c3b99c1f 100644 --- a/Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp +++ b/Applications/DataExplorer/VtkVis/VtkCompositeTextureOnSurfaceFilter.cpp @@ -12,7 +12,6 @@ * */ -// ** INCLUDES ** #include "VtkCompositeTextureOnSurfaceFilter.h" #include @@ -31,8 +30,6 @@ #include #include -//#include "VtkCompositeColormapToImageFilter.h" - VtkCompositeTextureOnSurfaceFilter::VtkCompositeTextureOnSurfaceFilter( vtkAlgorithm* inputAlgorithm) : VtkCompositeFilter(inputAlgorithm) diff --git a/Applications/Utils/MeshEdit/Vtu2Grid.cpp b/Applications/Utils/MeshEdit/Vtu2Grid.cpp index 8ee5777bfa7..ae936b1af23 100644 --- a/Applications/Utils/MeshEdit/Vtu2Grid.cpp +++ b/Applications/Utils/MeshEdit/Vtu2Grid.cpp @@ -108,11 +108,11 @@ int main(int argc, char* argv[]) MathLib::Point3d const max( std::array{bounds[1], bounds[3], bounds[5]}); std::array ranges = {max[0] - min[0], max[1] - min[1], - max[2] - min[2]}; + max[2] - min[2]}; if (ranges[0] < 0 || ranges[1] < 0 || ranges[2] < 0) { - ERR("The range ({},{},{}) is not allowed to be < 0", - ranges[0], ranges[1], ranges[2]); + ERR("The range ({},{},{}) is not allowed to be < 0", ranges[0], + ranges[1], ranges[2]); #ifdef USE_PETSC MPI_Finalize(); #endif diff --git a/MathLib/LinAlg/MatrixVectorTraits.cpp b/MathLib/LinAlg/MatrixVectorTraits.cpp index 42f05b62e75..993e7780d95 100644 --- a/MathLib/LinAlg/MatrixVectorTraits.cpp +++ b/MathLib/LinAlg/MatrixVectorTraits.cpp @@ -9,6 +9,7 @@ */ #include "MatrixVectorTraits.h" + #include #include "MatrixSpecifications.h" diff --git a/MeshLib/IO/XDMF/transformData.cpp b/MeshLib/IO/XDMF/transformData.cpp index 4d5abd6c97c..8c61ba7bb68 100644 --- a/MeshLib/IO/XDMF/transformData.cpp +++ b/MeshLib/IO/XDMF/transformData.cpp @@ -81,8 +81,8 @@ std::optional transformAttribute( // lambda f : Collects properties from the propertyVectorBase. It captures // (and overwrites) data that can only be collected via the typed property. // It has boolean return type to allow kind of pipe using || operator. - auto f = [&data_type, &num_of_tuples, &data_ptr, &property_pair]( - auto basic_type) -> bool + auto f = [&data_type, &num_of_tuples, &data_ptr, + &property_pair](auto basic_type) -> bool { auto const property_base = property_pair.second; auto const typed_property = diff --git a/Tests/GeoLib/CreateTestPoints.cpp b/Tests/GeoLib/CreateTestPoints.cpp index 9b28875d2f8..434169b069d 100644 --- a/Tests/GeoLib/CreateTestPoints.cpp +++ b/Tests/GeoLib/CreateTestPoints.cpp @@ -31,8 +31,8 @@ void createSetOfTestPointsAndAssociatedNames(GeoLib::GEOObjects& geo_objs, for (std::size_t i(0); i < pnts_per_edge; i++) { std::size_t const id(i + offset); - pnts.push_back(new GeoLib::Point( - i + shift[0], j + shift[1], k + shift[2], id)); + pnts.push_back(new GeoLib::Point(i + shift[0], j + shift[1], + k + shift[2], id)); std::string const pnt_name(name + "-" + std::to_string(i) + "-" + std::to_string(j) + "-" + std::to_string(k)); diff --git a/Tests/MaterialLib/TestMPLSaturationWeightedThermalConductivity.cpp b/Tests/MaterialLib/TestMPLSaturationWeightedThermalConductivity.cpp index 2c9fdc377b7..3f6d47e3d67 100644 --- a/Tests/MaterialLib/TestMPLSaturationWeightedThermalConductivity.cpp +++ b/Tests/MaterialLib/TestMPLSaturationWeightedThermalConductivity.cpp @@ -470,8 +470,8 @@ TEST(MaterialPropertyLib, SaturationWeightedThermalConductivity1Dgeometric) ParameterLib::ConstantParameter const k_wet{"k_wet", {1.5}}; auto const k_model_eff = MPL::SaturationWeightedThermalConductivity< - MaterialPropertyLib::MeanType::GEOMETRIC, 1>( - "thermal_conductivity", k_dry, k_wet); + MaterialPropertyLib::MeanType::GEOMETRIC, 1>("thermal_conductivity", + k_dry, k_wet); ParameterLib::SpatialPosition const pos; double const t = std::numeric_limits::quiet_NaN(); @@ -536,8 +536,8 @@ TEST(MaterialPropertyLib, SaturationWeightedThermalConductivity3Dgeometric) ParameterLib::ConstantParameter const k_wet{"k_wet", {1.5}}; auto const k_model_eff = MPL::SaturationWeightedThermalConductivity< - MaterialPropertyLib::MeanType::GEOMETRIC, 3>( - "thermal_conductivity", k_dry, k_wet); + MaterialPropertyLib::MeanType::GEOMETRIC, 3>("thermal_conductivity", + k_dry, k_wet); ParameterLib::SpatialPosition const pos; double const t = std::numeric_limits::quiet_NaN(); diff --git a/Tests/MaterialLib/TestMPLWaterDensity.cpp b/Tests/MaterialLib/TestMPLWaterDensity.cpp index c47123d8bce..e00214d3cdf 100644 --- a/Tests/MaterialLib/TestMPLWaterDensity.cpp +++ b/Tests/MaterialLib/TestMPLWaterDensity.cpp @@ -43,27 +43,27 @@ TEST(Material, checkWaterDensityIAPWSIF97Region1_) const double rho_expected = 890.98496087498256; - ASSERT_NEAR(rho_expected, property.template value( - variable_array, pos, t, dt), 1.e-10); + ASSERT_NEAR(rho_expected, + property.template value(variable_array, pos, t, dt), + 1.e-10); const double drho_dT = property.template dValue( - variable_array, MaterialPropertyLib::Variable::temperature, pos, - t, dt); + variable_array, MaterialPropertyLib::Variable::temperature, pos, t, dt); const double drho_dp = property.template dValue( - variable_array, MaterialPropertyLib::Variable::phase_pressure, pos, - t, dt); + variable_array, MaterialPropertyLib::Variable::phase_pressure, pos, t, + dt); const double perturbation = 1.e-4; // Test the differentiation: with respect to temperature: variable_array.temperature += perturbation; - const double rho_T1 = property.template value( - variable_array, pos, t, dt); + const double rho_T1 = + property.template value(variable_array, pos, t, dt); ASSERT_NEAR((rho_T1 - rho_expected) / perturbation, drho_dT, 1.e-6); // Test the differentiation: with respect to pressure: variable_array.phase_pressure += perturbation; - const double rho_p1 = property.template value( - variable_array, pos, t, dt); + const double rho_p1 = + property.template value(variable_array, pos, t, dt); ASSERT_NEAR((rho_p1 - rho_T1) / perturbation, drho_dp, 1.e-6); } diff --git a/Tests/MaterialLib/TestMPLWaterEnthalpyIAPWSIF97Region4.cpp b/Tests/MaterialLib/TestMPLWaterEnthalpyIAPWSIF97Region4.cpp index 1b81dcc4ffc..b8226838e3e 100644 --- a/Tests/MaterialLib/TestMPLWaterEnthalpyIAPWSIF97Region4.cpp +++ b/Tests/MaterialLib/TestMPLWaterEnthalpyIAPWSIF97Region4.cpp @@ -77,8 +77,9 @@ TEST(Material, checkWaterVapourEnthalpyIAPWSIF97Region4) for (int i = 0; i < 4; i++) { variable_array.phase_pressure = p[i]; - ASSERT_NEAR(expected_h[i], - property.template value(variable_array, pos, t, dt) / 1e3, - 1.e-8); + ASSERT_NEAR( + expected_h[i], + property.template value(variable_array, pos, t, dt) / 1e3, + 1.e-8); } } diff --git a/Tests/MaterialLib/TestMPLWaterSaturationTemperature.cpp b/Tests/MaterialLib/TestMPLWaterSaturationTemperature.cpp index be4be313f5b..9849a45ebaf 100644 --- a/Tests/MaterialLib/TestMPLWaterSaturationTemperature.cpp +++ b/Tests/MaterialLib/TestMPLWaterSaturationTemperature.cpp @@ -14,7 +14,6 @@ #include #include - #include #include "MaterialLib/MPL/Properties/CreateWaterSaturationTemperatureIAPWSIF97Region4.h" diff --git a/Tests/MaterialLib/TestMPLWaterThermalConductivity.cpp b/Tests/MaterialLib/TestMPLWaterThermalConductivity.cpp index add5fcaf9db..e5ff82e0396 100644 --- a/Tests/MaterialLib/TestMPLWaterThermalConductivity.cpp +++ b/Tests/MaterialLib/TestMPLWaterThermalConductivity.cpp @@ -40,7 +40,8 @@ TEST(Material, checkWaterThermalConductivityIAPWS_) const double T[] = {298.15, 298.15, 298.15, 873.15}; const double rho[] = {0, 998, 1200, 0}; - const double expected_lambda[] = {18.4341883e-3, 607.712868e-3, 799.038144e-3, 79.1034659e-3}; + const double expected_lambda[] = {18.4341883e-3, 607.712868e-3, + 799.038144e-3, 79.1034659e-3}; const double perturbation = 1.e-8; for (int i = 0; i < 4; i++) @@ -48,30 +49,26 @@ TEST(Material, checkWaterThermalConductivityIAPWS_) // Test lambda variable_array.temperature = T[i]; variable_array.density = rho[i]; - const double lambda = property.template value( - variable_array, pos, t, dt); + const double lambda = + property.template value(variable_array, pos, t, dt); ASSERT_NEAR(expected_lambda[i], lambda, 1.e-9); const double dlambda_dT = property.template dValue( - variable_array, MaterialPropertyLib::Variable::temperature, pos, - t, dt); + variable_array, MaterialPropertyLib::Variable::temperature, pos, t, + dt); const double dlambda_drho = property.template dValue( - variable_array, MaterialPropertyLib::Variable::density, pos, - t, dt); + variable_array, MaterialPropertyLib::Variable::density, pos, t, dt); // Test dlambda/dT - variable_array.temperature = - T[i] + perturbation; - double lambda1 = property.template value( - variable_array, pos, t, dt); + variable_array.temperature = T[i] + perturbation; + double lambda1 = + property.template value(variable_array, pos, t, dt); ASSERT_NEAR((lambda1 - lambda) / perturbation, dlambda_dT, 8.e-6); // Test dlambda/drho variable_array.temperature = T[i]; - variable_array.density = - rho[i] + perturbation; - lambda1 = property.template value( - variable_array, pos, t, dt); + variable_array.density = rho[i] + perturbation; + lambda1 = property.template value(variable_array, pos, t, dt); ASSERT_NEAR((lambda1 - lambda) / perturbation, dlambda_drho, 8.e-6); } diff --git a/Tests/MaterialLib/TestMPLWaterViscosity.cpp b/Tests/MaterialLib/TestMPLWaterViscosity.cpp index 0251b9fcf1f..9a9a9183aad 100644 --- a/Tests/MaterialLib/TestMPLWaterViscosity.cpp +++ b/Tests/MaterialLib/TestMPLWaterViscosity.cpp @@ -15,8 +15,8 @@ #include -#include "MaterialLib/MPL/Properties/Viscosity/CreateWaterViscosityIAPWS.h" #include "MaterialLib/MPL/Properties/Viscosity/CreateLiquidViscosityVogels.h" +#include "MaterialLib/MPL/Properties/Viscosity/CreateWaterViscosityIAPWS.h" #include "TestMPL.h" TEST(Material, checkWaterViscosityIAPWS_) @@ -52,30 +52,26 @@ TEST(Material, checkWaterViscosityIAPWS_) // Test mu variable_array.temperature = T[i]; variable_array.density = rho[i]; - const double mu = property.template value( - variable_array, pos, t, dt); + const double mu = + property.template value(variable_array, pos, t, dt); ASSERT_NEAR(expected_mumu[i] * 1.e-6, mu, 1.e-9); const double dmu_dT = property.template dValue( - variable_array, MaterialPropertyLib::Variable::temperature, pos, - t, dt); + variable_array, MaterialPropertyLib::Variable::temperature, pos, t, + dt); const double dmu_drho = property.template dValue( - variable_array, MaterialPropertyLib::Variable::density, pos, - t, dt); + variable_array, MaterialPropertyLib::Variable::density, pos, t, dt); // Test dmu/dT - variable_array.temperature = - T[i] + perturbation; - double mu1 = property.template value( - variable_array, pos, t, dt); + variable_array.temperature = T[i] + perturbation; + double mu1 = + property.template value(variable_array, pos, t, dt); ASSERT_NEAR((mu1 - mu) / perturbation, dmu_dT, 8.e-6); // Test dmu/drho variable_array.temperature = T[i]; - variable_array.density = - rho[i] + perturbation; - mu1 = property.template value( - variable_array, pos, t, dt); + variable_array.density = rho[i] + perturbation; + mu1 = property.template value(variable_array, pos, t, dt); ASSERT_NEAR((mu1 - mu) / perturbation, dmu_drho, 8.e-6); } @@ -99,11 +95,10 @@ TEST(Material, checkVogelViscosity_) double const dt = std::numeric_limits::quiet_NaN(); variable_array.temperature = 303.; - auto const mu_w = property_w.template value( - variable_array, pos, t, dt); + auto const mu_w = + property_w.template value(variable_array, pos, t, dt); auto const dmu_w_dT = property_w.template dValue( - variable_array, MaterialPropertyLib::Variable::temperature, - pos, t, dt); + variable_array, MaterialPropertyLib::Variable::temperature, pos, t, dt); ASSERT_NEAR(0.802657e-3, mu_w, 1.e-5); ASSERT_NEAR(-1.87823e-5, dmu_w_dT, 1.e-5); @@ -119,12 +114,11 @@ TEST(Material, checkVogelViscosity_) MaterialPropertyLib::Property const& property_co2 = *property_ptr_co2; variable_array.temperature = 255.04; - auto const mu_co2 = property_co2.template value( - variable_array, pos, t, dt); + auto const mu_co2 = + property_co2.template value(variable_array, pos, t, dt); auto const dmu_co2_dT = property_co2.template dValue( - variable_array, MaterialPropertyLib::Variable::temperature, - pos, t, dt); - ASSERT_NEAR(0.137956e-3, mu_co2,1.e-5); + variable_array, MaterialPropertyLib::Variable::temperature, pos, t, dt); + ASSERT_NEAR(0.137956e-3, mu_co2, 1.e-5); ASSERT_NEAR(-2.35664e-6, dmu_co2_dT, 1.e-5); const char xml_ch4[] = @@ -139,11 +133,10 @@ TEST(Material, checkVogelViscosity_) MaterialPropertyLib::Property const& property_ch4 = *property_ptr_ch4; variable_array.temperature = 172.0; - auto const mu_ch4 = property_ch4.template value( - variable_array, pos, t, dt); + auto const mu_ch4 = + property_ch4.template value(variable_array, pos, t, dt); auto const dmu_ch4_dT = property_ch4.template dValue( - variable_array, MaterialPropertyLib::Variable::temperature, - pos, t, dt); + variable_array, MaterialPropertyLib::Variable::temperature, pos, t, dt); ASSERT_NEAR(0.352072e-4, mu_ch4, 1.e-5); ASSERT_NEAR(-2.35664e-6, dmu_ch4_dT, 1.e-5); }