Merge branch 'development' into 36-faster-file-handling-for-material-config-use-stream-access-instead-of-line-wise-reading

This commit is contained in:
Martin Diehl 2018-08-22 09:11:33 +02:00
commit 0068dba40f
3 changed files with 3 additions and 3 deletions

@ -1 +1 @@
Subproject commit c4471725893e301044924eb0990e2ad619aa0a46 Subproject commit ce48785dcc5c9cae28cd35d45b612223c37c73b0

View File

@ -1 +1 @@
v2.0.2-381-gc03ea8f5 v2.0.2-390-g7c683d4f

View File

@ -94,7 +94,7 @@ module numerics
! spectral parameters: ! spectral parameters:
#ifdef Spectral #ifdef Spectral
real(pReal), protected, public :: & real(pReal), protected, public :: &
err_div_tolAbs = 1.0e-10_pReal, & !< absolute tolerance for equilibrium err_div_tolAbs = 1.0e-4_pReal, & !< absolute tolerance for equilibrium
err_div_tolRel = 5.0e-4_pReal, & !< relative tolerance for equilibrium err_div_tolRel = 5.0e-4_pReal, & !< relative tolerance for equilibrium
err_curl_tolAbs = 1.0e-10_pReal, & !< absolute tolerance for compatibility err_curl_tolAbs = 1.0e-10_pReal, & !< absolute tolerance for compatibility
err_curl_tolRel = 5.0e-4_pReal, & !< relative tolerance for compatibility err_curl_tolRel = 5.0e-4_pReal, & !< relative tolerance for compatibility