Skip to content

Commit

Permalink
Merge branch 'SmallFixes' into 'master'
Browse files Browse the repository at this point in the history
Small fixes

See merge request ogs/ogs!4770
  • Loading branch information
endJunction committed Oct 18, 2023
2 parents ecd959b + a080b0b commit a95db2a
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 14 deletions.
2 changes: 0 additions & 2 deletions MathLib/LinAlg/Eigen/EigenLinearSolver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -480,8 +480,6 @@ bool EigenLinearSolver::solve(EigenVector& b, EigenVector& x)
INFO("*** Eigen solver solve()");

return solver_->solve(b.getRawVector(), x.getRawVector(), option_);

INFO("------------------------------------------------------------------");
}

bool EigenLinearSolver::solve(EigenMatrix& A, EigenVector& b, EigenVector& x)
Expand Down
9 changes: 0 additions & 9 deletions NumLib/Fem/Integration/IntegrationMethodProvider.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,4 @@ inline DefaultIntegrationMethodProvider getIntegrationMethodProvider(
return DefaultIntegrationMethodProvider{integration_order};
}

/// Overload for <tt>IntegrationMethodProvider</tt>s returning the provider
/// itself.
template <IntegrationMethodProvider IntegrationMethodProvider_>
IntegrationMethodProvider_ const& getIntegrationMethodProvider(
IntegrationMethodProvider_ const& integration_method_provider)
{
return integration_method_provider;
}

} // namespace NumLib
Original file line number Diff line number Diff line change
Expand Up @@ -167,13 +167,13 @@
<vtkdiff>
<file>square_1e2_ts_4_t_1.000000.vtu</file>
<field>sigma</field>
<absolute_tolerance>9.2e-14</absolute_tolerance>
<absolute_tolerance>1.4e-13</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
<file>square_1e2_ts_4_t_1.000000.vtu</file>
<field>sigma_ip</field>
<absolute_tolerance>8.4e-14</absolute_tolerance>
<absolute_tolerance>1.0e-13</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
</test_definition>
Expand Down
2 changes: 1 addition & 1 deletion Tests/Data/ThermoRichardsMechanics/A2/A2.prj
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@
<vtkdiff>
<regex>A2_ts_.*.vtu</regex>
<field>NodalForces</field>
<absolute_tolerance>6e-10</absolute_tolerance>
<absolute_tolerance>1e-9</absolute_tolerance>
<relative_tolerance>1e-15</relative_tolerance>
</vtkdiff>
</test_definition>
Expand Down

0 comments on commit a95db2a

Please sign in to comment.