diff --git a/Applications/FileIO/GocadIO/GocadSGridReader.cpp b/Applications/FileIO/GocadIO/GocadSGridReader.cpp index 008db648a3274d5b54cbcef325d856a3a98773e3..6bfe6b50ff28a74155dfc4d2788c7056433ad0e4 100644 --- a/Applications/FileIO/GocadIO/GocadSGridReader.cpp +++ b/Applications/FileIO/GocadIO/GocadSGridReader.cpp @@ -350,7 +350,8 @@ void GocadSGridReader::parseFaceSet(std::string& line, std::istream& in) ERR("****** k coord %d to big for id %d.", c[2], id); std::size_t const cell_id( _index_calculator.getCellIdx(c[0], c[1], c[2])); - face_set_property._property_data[cell_id] = face_indicator; + face_set_property._property_data[cell_id] = + static_cast<double>(face_indicator); } face_set_id_cnt++; } diff --git a/ProcessLib/BoundaryCondition/BoundaryConditionConfig.h b/ProcessLib/BoundaryCondition/BoundaryConditionConfig.h index 0d04ba7c36a4326bc45796df786c474e68ee44e3..99a25779095d73bec49e938d9b7139b606091f20 100644 --- a/ProcessLib/BoundaryCondition/BoundaryConditionConfig.h +++ b/ProcessLib/BoundaryCondition/BoundaryConditionConfig.h @@ -25,16 +25,11 @@ struct BoundaryConditionConfig final { } - BoundaryConditionConfig(BoundaryConditionConfig&& other) - : config(std::move(other.config)), - boundary_mesh(other.boundary_mesh), - component_id(other.component_id) - { - } + BoundaryConditionConfig(BoundaryConditionConfig&& other) = default; BaseLib::ConfigTree config; MeshLib::Mesh const& boundary_mesh; boost::optional<int> const component_id; }; -} // ProcessLib +} // namespace ProcessLib diff --git a/ProcessLib/BoundaryCondition/NeumannBoundaryConditionLocalAssembler.h b/ProcessLib/BoundaryCondition/NeumannBoundaryConditionLocalAssembler.h index 23f74a4c4e70fb9870392f11e9fc07fce3d563cd..529313734041734872b3440f6a7e5bf55632ec94 100644 --- a/ProcessLib/BoundaryCondition/NeumannBoundaryConditionLocalAssembler.h +++ b/ProcessLib/BoundaryCondition/NeumannBoundaryConditionLocalAssembler.h @@ -33,7 +33,7 @@ public: NeumannBoundaryConditionLocalAssembler( MeshLib::Element const& e, std::size_t const local_matrix_size, - bool is_axially_symmetric, + bool const is_axially_symmetric, unsigned const integration_order, Parameter<double> const& neumann_bc_parameter) : Base(e, is_axially_symmetric, integration_order), diff --git a/ProcessLib/Parameter/ConstantParameter.cpp b/ProcessLib/Parameter/ConstantParameter.cpp index 12ac93c33fe0cfe88112ef1264fcf08a26632a92..5361c27c4024f60205e903a0d2e213f8935b0c13 100644 --- a/ProcessLib/Parameter/ConstantParameter.cpp +++ b/ProcessLib/Parameter/ConstantParameter.cpp @@ -24,8 +24,8 @@ std::unique_ptr<ParameterBase> createConstantParameter( // If the 'value' tag is found, use it and return. Otherwise continue with // then required tag 'values'. { - //! \ogs_file_param{prj__parameters__parameter__Constant__value} auto const value = + //! \ogs_file_param{prj__parameters__parameter__Constant__value} config.getConfigParameterOptional<std::vector<double>>("value"); if (value) diff --git a/ProcessLib/ProcessVariable.cpp b/ProcessLib/ProcessVariable.cpp index 7ae6e0ae0261fe3f8e922cc1d82ec0b5067d6ac2..30a7889613f35d68ce9b8e3130938ba5f7dda32d 100644 --- a/ProcessLib/ProcessVariable.cpp +++ b/ProcessLib/ProcessVariable.cpp @@ -139,7 +139,8 @@ ProcessVariable::ProcessVariable( } else { - INFO("No boundary conditions found."); + INFO("No boundary conditions for process variable '%s' found.", + _name.c_str()); } // Source terms @@ -166,7 +167,7 @@ ProcessVariable::ProcessVariable( } else { - INFO("No source terms found."); + INFO("No source terms for process variable '%s' found.", _name.c_str()); } } diff --git a/ProcessLib/RichardsFlow/RichardsFlowFEM.h b/ProcessLib/RichardsFlow/RichardsFlowFEM.h index 05bbfb75e9134cda1ea0f73a3ffac96e8b575066..f1e802d0ff8c7abb4da6633d2f028f08fc79ee63 100644 --- a/ProcessLib/RichardsFlow/RichardsFlowFEM.h +++ b/ProcessLib/RichardsFlow/RichardsFlowFEM.h @@ -13,7 +13,6 @@ #include "MathLib/InterpolationAlgorithms/PiecewiseLinearInterpolation.h" #include "MathLib/LinAlg/Eigen/EigenMapTools.h" -#include "MeshLib/CoordinateSystem.h" #include "NumLib/DOF/DOFTableUtil.h" #include "NumLib/Extrapolation/ExtrapolatableElement.h" #include "NumLib/Fem/FiniteElement/TemplateIsoparametric.h"