diff --git a/Applications/Utils/ModelPreparation/PartitionMesh/NodeWiseMeshPartitioner.cpp b/Applications/Utils/ModelPreparation/PartitionMesh/NodeWiseMeshPartitioner.cpp index 633da7566b9cb11e255e09a75b2fc9b53943a2a6..f8217222141490d4ce0dc105b868014d79fa74fd 100644 --- a/Applications/Utils/ModelPreparation/PartitionMesh/NodeWiseMeshPartitioner.cpp +++ b/Applications/Utils/ModelPreparation/PartitionMesh/NodeWiseMeshPartitioner.cpp @@ -786,8 +786,7 @@ void writePropertiesBinary(const std::string& file_name_base, partition.numberOfMeshItems(mesh_item_type))}; DBUG( "Write meta data for node-based PropertyVector: global offset " - "{:d}, " - "number of tuples {:d}", + "{:d}, number of tuples {:d}", pvpmd.offset, pvpmd.number_of_tuples); MeshLib::IO::writePropertyVectorPartitionMetaData(out, pvpmd); offset += pvpmd.number_of_tuples; diff --git a/MaterialLib/SolidModels/MFront/CMakeLists.txt b/MaterialLib/SolidModels/MFront/CMakeLists.txt index f1f7c7e83c5a78533405e769e622c7d4ade43b23..3eb4386c65d64b48ba3da8627b7b697f62f5e2f2 100644 --- a/MaterialLib/SolidModels/MFront/CMakeLists.txt +++ b/MaterialLib/SolidModels/MFront/CMakeLists.txt @@ -4,36 +4,39 @@ list(APPEND SOURCES MFront.cpp MFront.h) ogs_add_library(MaterialLib_SolidModels_MFront ${SOURCES}) -target_link_libraries(MaterialLib_SolidModels_MFront - PUBLIC BaseLib NumLib OgsMFrontBehaviour - PRIVATE MathLib MeshLib spdlog::spdlog) +target_link_libraries( + MaterialLib_SolidModels_MFront + PUBLIC BaseLib NumLib OgsMFrontBehaviour + PRIVATE MathLib MeshLib spdlog::spdlog) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/ThirdParty/MGIS") include(cmake/modules/tfel) -mfront_behaviours_check_library(OgsMFrontBehaviour - BDT - DruckerPrager - Elasticity - MohrCoulombAbboSloan - MohrCoulombAbboSloanOrtho - StandardElasticityBrick - StandardElasticityBrickOrtho - Lubby2 - Lubby2mod - MohrCoulombAbboSloanAniso - MohrCoulombAbboSloanUBI - MohrCoulombAbboSloanUBIOrtho) +mfront_behaviours_check_library( + OgsMFrontBehaviour + BDT + DruckerPrager + Elasticity + Lubby2 + Lubby2mod + MohrCoulombAbboSloan + MohrCoulombAbboSloanAniso + MohrCoulombAbboSloanOrtho + MohrCoulombAbboSloanUBI + MohrCoulombAbboSloanUBIOrtho + StandardElasticityBrick + StandardElasticityBrickOrtho) # Disable warnings for generated OgsMFrontBehaviour -target_compile_options(OgsMFrontBehaviour PRIVATE - $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:-w> - $<$<CXX_COMPILER_ID:MSVC>:/W0> -) +target_compile_options( + OgsMFrontBehaviour + PRIVATE + $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:-w> + $<$<CXX_COMPILER_ID:MSVC>:/W0>) target_include_directories(MaterialLib_SolidModels_MFront PUBLIC ThirdParty/MGIS/include) target_link_libraries(MaterialLib_SolidModels_MFront PUBLIC MFrontGenericInterface) -target_compile_definitions(MaterialLib_SolidModels_MFront PRIVATE - OGS_USE_MFRONT) +target_compile_definitions(MaterialLib_SolidModels_MFront + PRIVATE OGS_USE_MFRONT) diff --git a/MathLib/KelvinVector-impl.h b/MathLib/KelvinVector-impl.h index 7a860b8869dcf3a3d97db53701644e04f6f00816..884d279f048243a51d7187a180025b519a6094f8 100644 --- a/MathLib/KelvinVector-impl.h +++ b/MathLib/KelvinVector-impl.h @@ -19,7 +19,7 @@ double Invariants<KelvinVectorSize>::equivalentStress( Eigen::Matrix<double, KelvinVectorSize, 1> const& deviatoric_v) { assert(std::abs(trace(deviatoric_v)) <= - 2e-13 * diagonal(deviatoric_v).norm()); + 2e-12 * diagonal(deviatoric_v).norm()); return std::sqrt(3 * J2(deviatoric_v)); } @@ -35,7 +35,7 @@ double Invariants<KelvinVectorSize>::J2( Eigen::Matrix<double, KelvinVectorSize, 1> const& deviatoric_v) { assert(std::abs(trace(deviatoric_v)) <= - 2e-13 * diagonal(deviatoric_v).norm()); + 2e-12 * diagonal(deviatoric_v).norm()); return 0.5 * deviatoric_v.transpose() * deviatoric_v; } @@ -46,7 +46,7 @@ double Invariants<KelvinVectorSize>::J3( Eigen::Matrix<double, KelvinVectorSize, 1> const& deviatoric_v) { assert(std::abs(trace(deviatoric_v)) <= - 2e-13 * diagonal(deviatoric_v).norm()); + 2e-12 * diagonal(deviatoric_v).norm()); return determinant(deviatoric_v); } diff --git a/NumLib/DOF/MeshComponentMap.cpp b/NumLib/DOF/MeshComponentMap.cpp index 1c3dd6fd358408889af198a4f8ef22917fca8e65..be9e55ecfcb68bcd4b04d4a52f36230b62c31612 100644 --- a/NumLib/DOF/MeshComponentMap.cpp +++ b/NumLib/DOF/MeshComponentMap.cpp @@ -174,13 +174,12 @@ MeshComponentMap MeshComponentMap::getSubset( { OGS_FATAL( "Could not find a global index for global component " - "{:d} " - "for the mesh '{:s}', node {:d}, in the corresponding " - "bulk " - "mesh '{:s}' and node {:d}. This happens because the " - "boundary mesh is larger then the definition region of " - "the bulk component, usually because the geometry for " - "the boundary condition is too large.", + "{:d} for the mesh '{:s}', node {:d}, in the " + "corresponding bulk mesh '{:s}' and node {:d}. This " + "happens because the boundary mesh is larger then the " + "definition region of the bulk component, usually " + "because the geometry for the boundary condition is " + "too large.", component_id, new_mesh_subset.getMesh().getName(), node_id, diff --git a/ProcessLib/BoundaryCondition/DirichletBoundaryConditionAuxiliaryFunctions.cpp b/ProcessLib/BoundaryCondition/DirichletBoundaryConditionAuxiliaryFunctions.cpp index 471b4b9f462a8f705723a6a504a62b0da963e9b1..8675f5897b58e4ec623f734825aa5c08bd1f7692 100644 --- a/ProcessLib/BoundaryCondition/DirichletBoundaryConditionAuxiliaryFunctions.cpp +++ b/ProcessLib/BoundaryCondition/DirichletBoundaryConditionAuxiliaryFunctions.cpp @@ -52,8 +52,7 @@ void checkParametersOfDirichletBoundaryCondition( DBUG( "Found {:d} nodes for Dirichlet BCs for the variable {:d} and " - "component " - "{:d}", + "component {:d}", bc_mesh.getNodes().size(), variable_id, component_id); } diff --git a/ProcessLib/BoundaryCondition/PrimaryVariableConstraintDirichletBoundaryCondition.cpp b/ProcessLib/BoundaryCondition/PrimaryVariableConstraintDirichletBoundaryCondition.cpp index 4813a20e8b83b3bf75b3007e800a6416cc577869..683f0ece125784de5a1399d13355a020ae0cba2b 100644 --- a/ProcessLib/BoundaryCondition/PrimaryVariableConstraintDirichletBoundaryCondition.cpp +++ b/ProcessLib/BoundaryCondition/PrimaryVariableConstraintDirichletBoundaryCondition.cpp @@ -122,10 +122,9 @@ createPrimaryVariableConstraintDirichletBoundaryCondition( auto& parameter = ParameterLib::findParameter<double>( param_name, parameters, 1, &bc_mesh); - auto const threshold_parameter_name = config.getConfigParameter< - std::string>( + auto const threshold_parameter_name = //! \ogs_file_param{prj__process_variables__process_variable__boundary_conditions__boundary_condition__PrimaryVariableConstraintDirichletBoundaryCondition__threshold_parameter} - "threshold_parameter"); + config.getConfigParameter<std::string>("threshold_parameter"); DBUG("Using parameter {:s} as threshold_parameter", threshold_parameter_name); @@ -133,8 +132,7 @@ createPrimaryVariableConstraintDirichletBoundaryCondition( threshold_parameter_name, parameters, 1, &bc_mesh); auto const comparison_operator_string = - //! - //\ogs_file_param{prj__process_variables__process_variable__boundary_conditions__boundary_condition__PrimaryVariableConstraintDirichletBoundaryCondition__comparison_operator} + //! \ogs_file_param{prj__process_variables__process_variable__boundary_conditions__boundary_condition__PrimaryVariableConstraintDirichletBoundaryCondition__comparison_operator} config.getConfigParameter<std::string>("comparison_operator"); if (comparison_operator_string != "greater" && comparison_operator_string != "less") diff --git a/ProcessLib/HeatConduction/CreateHeatConductionProcess.cpp b/ProcessLib/HeatConduction/CreateHeatConductionProcess.cpp index 3ad6b7cce0f6318ef99e1573261a4b83191d6b35..f54ea4fbfb3259823b314b32a2e7bed172f664e2 100644 --- a/ProcessLib/HeatConduction/CreateHeatConductionProcess.cpp +++ b/ProcessLib/HeatConduction/CreateHeatConductionProcess.cpp @@ -72,8 +72,8 @@ std::unique_ptr<Process> createHeatConductionProcess( DBUG("Use '{:s}' as density parameter.", density.name); - //! \ogs_file_param{prj__processes__process__HEAT_CONDUCTION__mass_lumping} auto const mass_lumping = + //! \ogs_file_param{prj__processes__process__HEAT_CONDUCTION__mass_lumping} config.getConfigParameter<bool>("mass_lumping", false); HeatConductionProcessData process_data{thermal_conductivity, heat_capacity, diff --git a/ProcessLib/HeatConduction/Tests.cmake b/ProcessLib/HeatConduction/Tests.cmake index b4ad3f411bfa97458c934445167b28947fd95e11..81b0894c993d50c693511d523caf507bb1e02da2 100644 --- a/ProcessLib/HeatConduction/Tests.cmake +++ b/ProcessLib/HeatConduction/Tests.cmake @@ -152,7 +152,7 @@ AddTest( EXECUTABLE_ARGS line_1_line_1e2_source_term.prj TESTER vtkdiff DIFF_DATA - line_1_line_1e2_pcs_0_ts_500_t_39062500.000000_reference.vtu line_1_line_1e2_pcs_0_ts_500_t_39062500.000000.vtu temperature temperature 1e-11 0.0 + line_1_line_1e2_pcs_0_ts_500_t_39062500.000000_reference.vtu line_1_line_1e2_pcs_0_ts_500_t_39062500.000000.vtu temperature temperature 1.4e-11 0.0 REQUIREMENTS NOT OGS_USE_MPI ) @@ -249,7 +249,7 @@ AddTest( EXECUTABLE_ARGS line_source_term_x_0.5.prj TESTER vtkdiff DIFF_DATA - source_term_middle_pcs_0_ts_1_t_1.000000.vtu source_term_middle_pcs_0_ts_1_t_1.000000.vtu temperature temperature 4e-15 2e-14 + source_term_middle_pcs_0_ts_1_t_1.000000.vtu source_term_middle_pcs_0_ts_1_t_1.000000.vtu temperature temperature 7e-15 2e-14 source_term_middle_pcs_0_ts_1_t_1.000000.vtu source_term_middle_pcs_0_ts_1_t_1.000000.vtu heat_flux_x heat_flux_x 7e-14 0.0 REQUIREMENTS NOT OGS_USE_MPI ) diff --git a/ProcessLib/LiquidFlow/Tests.cmake b/ProcessLib/LiquidFlow/Tests.cmake index 7f15cacf1f240b249f74a4f234b77140c88ce29b..155110cdd9c8efe21572985a989c75e2922697a9 100644 --- a/ProcessLib/LiquidFlow/Tests.cmake +++ b/ProcessLib/LiquidFlow/Tests.cmake @@ -54,7 +54,7 @@ AddTest( TESTER vtkdiff REQUIREMENTS NOT OGS_USE_MPI DIFF_DATA - standard_solution_buildup_test_pcs_0_ts_107_t_424800.000000.vtu buildup_test_pcs_0_ts_107_t_424800.000000.vtu pressure pressure 5e-6 0.0 + standard_solution_buildup_test_pcs_0_ts_107_t_424800.000000.vtu buildup_test_pcs_0_ts_107_t_424800.000000.vtu pressure pressure 1.6e-5 0.0 standard_solution_buildup_test_pcs_0_ts_211_t_720000.000000.vtu buildup_test_pcs_0_ts_211_t_720000.000000.vtu pressure pressure 5e-5 0.0 ) diff --git a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/medium/bar.prj b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/medium/bar.prj index 456c3a9af5683a45358a1afa0966ae26364e0880..b2add8f42e37c8936ee420cb569ace194b5228e2 100644 --- a/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/medium/bar.prj +++ b/Tests/Data/Mechanics/EhlersDamageNonLocal/bar/medium/bar.prj @@ -317,7 +317,7 @@ <vtkdiff> <file>out_bar_medium_ED_pcs_0_ts_60_t_0.600000.vtu</file> <field>sigma</field> - <absolute_tolerance>2e-7</absolute_tolerance> + <absolute_tolerance>2.1e-7</absolute_tolerance> <relative_tolerance>0</relative_tolerance> </vtkdiff> <vtkdiff> diff --git a/Tests/Data/Parabolic/LiquidFlow/SimpleSynthetics/PrimaryVariableConstraintDirichletBC/cuboid_1x1x1_hex_1000_Dirichlet_Dirichlet_3.prj b/Tests/Data/Parabolic/LiquidFlow/SimpleSynthetics/PrimaryVariableConstraintDirichletBC/cuboid_1x1x1_hex_1000_Dirichlet_Dirichlet_3.prj index d2e2c93429cb6e4ae222b42d7737653be54c68e0..f822cf92df8b05603ffa6f6f5781e8c000bb77a2 100644 --- a/Tests/Data/Parabolic/LiquidFlow/SimpleSynthetics/PrimaryVariableConstraintDirichletBC/cuboid_1x1x1_hex_1000_Dirichlet_Dirichlet_3.prj +++ b/Tests/Data/Parabolic/LiquidFlow/SimpleSynthetics/PrimaryVariableConstraintDirichletBC/cuboid_1x1x1_hex_1000_Dirichlet_Dirichlet_3.prj @@ -206,7 +206,7 @@ <vtkdiff> <regex>part_of_left_boundary_to_part_of_right_boundary_primary_variable_constraint_dirichlet_top_3_ts_.*.vtu</regex> <field>pressure</field> - <absolute_tolerance>1e-15</absolute_tolerance> + <absolute_tolerance>1.2e-15</absolute_tolerance> <relative_tolerance>1e-14</relative_tolerance> </vtkdiff> </test_definition> diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload_ym45.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload_ym45.prj index 84b376ab89b2e34c65255f1652cea9509c554bfb..50ed0081aa8863c5ba4aff4cf12aec2d78e9817f 100644 --- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload_ym45.prj +++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload_ym45.prj @@ -290,7 +290,7 @@ <vtkdiff> <file>m2_2Dload_ym45_pcs_0_ts_101_t_1.000000.vtu</file> <field>sigma</field> - <absolute_tolerance>2.0e-11</absolute_tolerance> + <absolute_tolerance>2.1e-11</absolute_tolerance> <relative_tolerance>0</relative_tolerance> </vtkdiff> </test_definition>