diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a82dd8621..247f6f26ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,13 @@ Volta GPUs while the automatically selected value will vary across compilers and compiler versions. As such, users are encouraged to override this value with the architecture for their system. +The Trilinos Teptra NVector interface has been updated to utilize CMake +imported targets added in Trilinos 14 to improve support for different Kokkos +backends with Trilinos. As such, Trilinos 14 or newer is required and the +`Trilinos_INTERFACE_*` CMake options have been removed. + +Example programs using *hypre* have been updated to support v2.20 and newer. + ### Bug Fixes Fixed the loading of ARKStep's default first order explicit method. @@ -19,6 +26,9 @@ Fixed the loading of ARKStep's default first order explicit method. Fixed a CMake bug regarding usage of missing "print_warning" macro that was only triggered when the deprecated `CUDA_ARCH` option was used. +Fixed compilation errors when building the Trilinos Teptra NVector with CUDA +support. + ### Deprecation Notices ## Changes to SUNDIALS in release 7.1.1 diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt index 090c1f5b26..2c139fc356 100644 --- a/benchmarks/CMakeLists.txt +++ b/benchmarks/CMakeLists.txt @@ -24,8 +24,10 @@ sundials_option(BENCHMARK_NVECTOR BOOL "NVector benchmarks are on" ON) # Disable some warnings for benchmarks if(ENABLE_ALL_WARNINGS) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-parameter") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-parameter") + set(CMAKE_C_FLAGS + "${CMAKE_C_FLAGS} -Wno-unused-parameter -Wno-unused-function") + set(CMAKE_CXX_FLAGS + "${CMAKE_CXX_FLAGS} -Wno-unused-parameter -Wno-unused-function") endif() # ---------------------------------------- diff --git a/benchmarks/advection_reaction_3D/raja/backends.hpp b/benchmarks/advection_reaction_3D/raja/backends.hpp index c7cbd790ee..c258c68598 100644 --- a/benchmarks/advection_reaction_3D/raja/backends.hpp +++ b/benchmarks/advection_reaction_3D/raja/backends.hpp @@ -114,12 +114,23 @@ using XYZ_KERNEL_POL = #else #define NVECTOR_ID_STRING "Serial" -using EXEC_POLICY = RAJA::seq_exec; -using XYZ_KERNEL_POL = RAJA::KernelPolicy>>>>; +#else +using EXEC_POLICY = RAJA::seq_exec; +using XYZ_KERNEL_POL = RAJA::KernelPolicy>>>>; +#endif + constexpr auto LocalNvector = N_VNew_Serial; #define CopyVecFromDevice(v) diff --git a/cmake/SUNDIALSConfig.cmake.in b/cmake/SUNDIALSConfig.cmake.in index 9cbe9e6c23..399309f67e 100644 --- a/cmake/SUNDIALSConfig.cmake.in +++ b/cmake/SUNDIALSConfig.cmake.in @@ -161,10 +161,8 @@ if("@ENABLE_RAJA@" AND NOT TARGET RAJA) find_dependency(RAJA PATHS "@RAJA_DIR@") endif() -if("@ENABLE_TRILINOS@" AND NOT TARGET SUNDIALS::TRILINOS) - add_library(SUNDIALS::TRILINOS INTERFACE IMPORTED) - target_link_libraries(SUNDIALS::TRILINOS INTERFACE "@Trilinos_LIBRARIES@") - set_target_properties(SUNDIALS::TRILINOS PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "@Trilinos_INCLUDE_DIRS@") +if("@ENABLE_TRILINOS@" AND NOT TARGET Tpetra::all_libs) + find_dependency(Trilinos COMPONENTS Tpetra PATHS "@Trilinos_DIR@") endif() if("@ENABLE_XBRAID@" AND NOT TARGET SUNDIALS::XBRAID) diff --git a/cmake/SundialsBuildOptionsPost.cmake b/cmake/SundialsBuildOptionsPost.cmake index e914eefd1f..d6d02c5565 100644 --- a/cmake/SundialsBuildOptionsPost.cmake +++ b/cmake/SundialsBuildOptionsPost.cmake @@ -123,7 +123,7 @@ list(APPEND SUNDIALS_BUILD_LIST "BUILD_NVECTOR_RAJA") sundials_option( BUILD_NVECTOR_TRILINOS BOOL "Build the NVECTOR_TRILINOS module (requires Trilinos)" ON - DEPENDS_ON ENABLE_TRILINOS Trilinos_WORKS + DEPENDS_ON ENABLE_TRILINOS ADVANCED) list(APPEND SUNDIALS_BUILD_LIST "BUILD_NVECTOR_TRILINOS") diff --git a/cmake/SundialsSetupConfig.cmake b/cmake/SundialsSetupConfig.cmake index e1ea1f1929..7000a90396 100644 --- a/cmake/SundialsSetupConfig.cmake +++ b/cmake/SundialsSetupConfig.cmake @@ -65,7 +65,7 @@ foreach(tpl ${SUNDIALS_TPL_LIST}) endforeach() # prepare substitution variable SUNDIALS_TRILINOS_HAVE_MPI for sundials_config.h -if(Trilinos_MPI) +if(ENABLE_MPI) set(SUNDIALS_TRILINOS_HAVE_MPI TRUE) endif() diff --git a/cmake/SundialsTPLOptions.cmake b/cmake/SundialsTPLOptions.cmake index 9d186c887f..291709c8a8 100644 --- a/cmake/SundialsTPLOptions.cmake +++ b/cmake/SundialsTPLOptions.cmake @@ -269,42 +269,6 @@ sundials_option(ENABLE_TRILINOS BOOL "Enable Trilinos support" OFF) sundials_option(Trilinos_DIR PATH "Path to root of Trilinos installation" "${Trilinos_DIR}" DEPENDS_ON ENABLE_TRILINOS) -sundials_option( - Trilinos_INTERFACE_CXX_COMPILER STRING "C++ compiler for Trilinos interface" - "${Trilinos_CXX_COMPILER}" - DEPENDS_ON ENABLE_TRILINOS - ADVANCED) - -sundials_option( - Trilinos_INTERFACE_C_COMPILER STRING "C compiler for Trilinos interface" - "${Trilinos_C_COMPILER}" - DEPENDS_ON ENABLE_TRILINOS - ADVANCED) - -sundials_option( - Trilinos_INTERFACE_CXX_COMPILER_FLAGS STRING - "C++ compiler flags for Trilinos interface" "${Trilinos_CXX_COMPILER_FLAGS}" - DEPENDS_ON ENABLE_TRILINOS - ADVANCED) - -sundials_option( - Trilinos_INTERFACE_C_COMPILER_FLAGS STRING - "C compiler flags for Trilinos interface" "${Trilinos_C_COMPILER_FLAGS}" - DEPENDS_ON ENABLE_TRILINOS - ADVANCED) - -sundials_option( - Trilinos_INTERFACE_MPIEXEC STRING "MPI executable for Trilinos interface" - "${Trilinos_MPI_EXEC}" - DEPENDS_ON ENABLE_TRILINOS - ADVANCED) - -sundials_option( - Trilinos_WORKS BOOL - "Set to ON to force CMake to accept a given Trilinos configuration" OFF - DEPENDS_ON ENABLE_TRILINOS - ADVANCED) - # --------------------------------------------------------------- # Enable XBraid support? # --------------------------------------------------------------- diff --git a/cmake/tpl/FindHYPRE.cmake b/cmake/tpl/FindHYPRE.cmake index 156356b24e..c9f0fa1258 100644 --- a/cmake/tpl/FindHYPRE.cmake +++ b/cmake/tpl/FindHYPRE.cmake @@ -59,8 +59,7 @@ else() HYPRE_LIBRARY NAMES ${HYPRE_LIBRARY_NAMES} HINTS "${HYPRE_DIR}" "${HYPRE_DIR}/lib" "${HYPRE_DIR}/lib64" - "${HYPRE_LIBRARY_DIR}" - NO_DEFAULT_PATH) + "${HYPRE_LIBRARY_DIR}") endif() mark_as_advanced(HYPRE_LIBRARY) @@ -71,6 +70,23 @@ if(_idx EQUAL -1) CACHE STRING "" FORCE) endif() +# Extract version parts from the version information +if(HYPRE_INCLUDE_DIR) + + # HYPRE_config.h file added in at least v2.11.0 (possibly sooner) + find_file(HYPRE_CONFIG_FILE HYPRE_config.h PATHS "${HYPRE_INCLUDE_DIR}") + + file(STRINGS "${HYPRE_CONFIG_FILE}" _hypre_release_version + REGEX "HYPRE_RELEASE_VERSION") + string(REGEX MATCH "[0-9]+\.[0-9]+\.[0-9]+" HYPRE_VERSION + "${_hypre_release_version}") + string(REGEX MATCHALL "[0-9]+" _hypre_version_numbers "${HYPRE_VERSION}") + list(GET _hypre_version_numbers 0 HYPRE_VERSION_MAJOR) + list(GET _hypre_version_numbers 1 HYPRE_VERSION_MINOR) + list(GET _hypre_version_numbers 2 HYPRE_VERSION_PATCH) + +endif() + # set a more informative error message in case the library was not found set(HYPRE_NOT_FOUND_MESSAGE "\ @@ -83,6 +99,7 @@ ERROR: Could not find HYPRE. Please check the variables:\n\ find_package_handle_standard_args( HYPRE REQUIRED_VARS HYPRE_LIBRARY HYPRE_LIBRARIES HYPRE_INCLUDE_DIR + VERSION_VAR HYPRE_VERSION FAIL_MESSAGE "${HYPRE_NOT_FOUND_MESSAGE}") # Create target for HYPRE diff --git a/cmake/tpl/FindTrilinos.cmake b/cmake/tpl/FindTrilinos.cmake deleted file mode 100644 index 42be691041..0000000000 --- a/cmake/tpl/FindTrilinos.cmake +++ /dev/null @@ -1,49 +0,0 @@ -# ----------------------------------------------------------------------------- -# Programmer(s): Slaven Peles and Cody J. Balos @ LLNL -# ----------------------------------------------------------------------------- -# SUNDIALS Copyright Start -# Copyright (c) 2002-2024, Lawrence Livermore National Security -# and Southern Methodist University. -# All rights reserved. -# -# See the top-level LICENSE and NOTICE files for details. -# -# SPDX-License-Identifier: BSD-3-Clause -# SUNDIALS Copyright End -# ----------------------------------------------------------------------------- -# Find module for Trilinos that uses the TrilinosConfig.cmake that is installed -# with Trilinos. The module will also create a SUNDIALS::TRILINOS target. -# ----------------------------------------------------------------------------- - -# First try and find Trilinos using Trilinos_DIR only. -find_package( - Trilinos - NAMES - Trilinos - TRILINOS - PATHS - ${Trilinos_DIR}/lib/cmake/Trilinos - ${Trilinos_DIR} - NO_DEFAULT_PATH - QUIET) - -# set package variables including Trilinos_FOUND -find_package_handle_standard_args( - Trilinos - REQUIRED_VARS Trilinos_LIBRARIES # defined in TrilinosConfig.cmake - Trilinos_INCLUDE_DIRS # defined in TrilinosConfig.cmake -) - -# Create Trilinos target -if(Trilinos_FOUND) - - if(NOT TARGET SUNDIALS::TRILINOS) - add_library(SUNDIALS::TRILINOS IMPORTED INTERFACE) - endif() - - set_target_properties( - SUNDIALS::TRILINOS - PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${Trilinos_INCLUDE_DIRS}" - INTERFACE_LINK_LIBRARIES "${Trilinos_LIBRARIES}") - -endif() diff --git a/cmake/tpl/SundialsTrilinos.cmake b/cmake/tpl/SundialsTrilinos.cmake index 7f8940ef90..ea6aa6393b 100644 --- a/cmake/tpl/SundialsTrilinos.cmake +++ b/cmake/tpl/SundialsTrilinos.cmake @@ -26,11 +26,7 @@ # Section 1: Include guard # ----------------------------------------------------------------------------- -if(NOT DEFINED SUNDIALS_TRILINOS_INCLUDED) - set(SUNDIALS_TRILINOS_INCLUDED) -else() - return() -endif() +include_guard(GLOBAL) # ----------------------------------------------------------------------------- # Section 2: Check to make sure options are compatible @@ -41,144 +37,20 @@ endif() # ----------------------------------------------------------------------------- # Find Trilinos -find_package(Trilinos REQUIRED) +find_package( + Trilinos REQUIRED + COMPONENTS Tpetra HINTS "${Trilinos_DIR}/lib/cmake/Trilinos" + "${Trilinos_DIR}") -# Check if Trilinos was built with MPI Starting with TriBITS 2022-10-16 -# is no longer defined so we base MPI support on ENABLE_MPI -if(Trilinos_TPL_LIST) - if(";${Trilinos_TPL_LIST};" MATCHES ";MPI;") - set(Trilinos_MPI TRUE) - else() - set(Trilinos_MPI FALSE) - endif() -else() - if(ENABLE_MPI) - set(Trilinos_MPI TRUE) - else() - set(Trilinos_MPI FALSE) - endif() -endif() - -# For XSDK compatibility, only use the user/spack provided compiler and flags to -# build SUNDIALS modules that use Trilinos. If we are not in XSDK mode, we can -# use the imported Trilinos compiler and flags by default, but allow the user to -# change it through CMake the Trilinos_INTERFACE_* options. - -if(USE_XSDK_DEFAULTS) - if(Trilinos_MPI AND MPI_CXX_FOUND) - force_variable(Trilinos_INTERFACE_CXX_COMPILER STRING - "C++ compiler for Trilinos interface" "${MPI_CXX_COMPILER}") - set(Trilinos_INTERFACE_MPI_CXX_FOUND - ${Trilinos_MPI} - CACHE INTERNAL "Is Trilinos interface C++ compiler MPI") - else() - force_variable(Trilinos_INTERFACE_CXX_COMPILER STRING - "C compiler for Trilinos interface" "${CMAKE_CXX_COMPILER}") - set(Trilinos_INTERFACE_MPI_CXX_FOUND - FALSE - CACHE INTERNAL "Is Trilinos interface C++ compiler MPI") - endif() - if(Trilinos_MPI AND MPI_C_FOUND) - force_variable(Trilinos_INTERFACE_C_COMPILER STRING - "C compiler for Trilinos interface" "${MPI_C_COMPILER}") - set(Trilinos_INTERFACE_MPI_C_FOUND - ${Trilinos_MPI} - CACHE INTERNAL "Is Trilinos interface C compiler MPI") - else() - force_variable(Trilinos_INTERFACE_C_COMPILER STRING - "C compiler for Trilinos interface" "${CMAKE_C_COMPILER}") - set(Trilinos_INTERFACE_MPI_C_FOUND - FALSE - CACHE INTERNAL "Is Trilinos interface C compiler MPI") - endif() - force_variable(Trilinos_INTERFACE_CXX_COMPILER_FLAGS STRING - "C++ compiler flags specific to Trilinos interface" "") - force_variable(Trilinos_INTERFACE_C_COMPILER_FLAGS STRING - "C compiler flags specific to Trilinos interface" "") - force_variable( - Trilinos_INTERFACE_MPIEXEC STRING "MPI executable for Trilinos interface" - "${MPIEXEC_EXECUTABLE}") -else() - force_variable( - Trilinos_INTERFACE_CXX_COMPILER STRING - "C++ compiler for Trilinos interface" "${Trilinos_CXX_COMPILER}") - force_variable(Trilinos_INTERFACE_C_COMPILER STRING - "C compiler for Trilinos interface" "${Trilinos_C_COMPILER}") - force_variable( - Trilinos_INTERFACE_CXX_COMPILER_FLAGS STRING - "C++ compiler flags for Trilinos interface" - "${Trilinos_CXX_COMPILER_FLAGS}") - force_variable( - Trilinos_INTERFACE_C_COMPILER_FLAGS STRING - "C compiler flags for Trilinos interface" "${Trilinos_C_COMPILER_FLAGS}") - force_variable(Trilinos_INTERFACE_MPIEXEC STRING - "MPI executable for Trilinos interface" "${Trilinos_MPI_EXEC}") - set(Trilinos_INTERFACE_MPI_CXX_FOUND - ${Trilinos_MPI} - CACHE INTERNAL "Is Trilinos interface C++ compiler MPI") - set(Trilinos_INTERFACE_MPI_C_FOUND - ${Trilinos_MPI} - CACHE INTERNAL "Is Trilinos interface C compiler MPI") -endif() - -message(STATUS "Trilinos_MPI: ${Trilinos_MPI}") -message(STATUS "Trilinos_LIBRARIES: ${Trilinos_LIBRARIES}") -message(STATUS "Trilinos_INCLUDE_DIRS: ${Trilinos_INCLUDE_DIRS}") +message(STATUS "Trilinos Libraries: ${Trilinos_LIBRARIES}") +message(STATUS "Trilinos Includes: ${Trilinos_INCLUDE_DIRS}") +message(STATUS "Trilinos Devices: ${Kokkos_DEVICES}") # ----------------------------------------------------------------------------- # Section 4: Test the TPL # ----------------------------------------------------------------------------- -if(Trilinos_FOUND AND (NOT Trilinos_WORKS)) - # Do any checks which don't require compilation first. - - # Create the Trilinos_TEST directory - set(Trilinos_TEST_DIR ${PROJECT_BINARY_DIR}/Trilinos_TEST) - file(MAKE_DIRECTORY ${Trilinos_TEST_DIR}) - - # Create a CMakeLists.txt file - file( - WRITE ${Trilinos_TEST_DIR}/CMakeLists.txt - "CMAKE_MINIMUM_REQUIRED(VERSION ${CMAKE_VERSION})\n" - "PROJECT(ltest CXX)\n" - "SET(CMAKE_VERBOSE_MAKEFILE ON)\n" - "SET(CMAKE_BUILD_TYPE \"${CMAKE_BUILD_TYPE}\")\n" - "SET(CMAKE_CXX_COMPILER \"${Trilinos_INTERFACE_CXX_COMPILER}\")\n" - "SET(CMAKE_CXX_STANDARD \"${CMAKE_CXX_STANDARD}\")\n" - "SET(CMAKE_CXX_FLAGS \"${Trilinos_INTERFACE_CXX_COMPILER_FLAGS}\")\n" - "SET(Trilinos_DIR \"${Trilinos_DIR}\")\n" - "INCLUDE(FindPackageHandleStandardArgs)\n" - "INCLUDE(${PROJECT_SOURCE_DIR}/cmake/tpl/FindTrilinos.cmake)\n" - "ADD_EXECUTABLE(ltest ltest.cpp)\n" - "TARGET_LINK_LIBRARIES(ltest SUNDIALS::TRILINOS)\n") - - # Create a C++ source file which calls a Trilinos function - file(WRITE ${Trilinos_TEST_DIR}/ltest.cpp - "#include \n" "int main(void) {\n" - "std::cout << Tpetra::version() << std::endl;\n" "return(0);\n" "}\n") - - # Attempt to build and link the "ltest" executable - try_compile( - COMPILE_OK ${Trilinos_TEST_DIR} - ${Trilinos_TEST_DIR} ltest - OUTPUT_VARIABLE COMPILE_OUTPUT) - - # Process test result - if(COMPILE_OK) - message(STATUS "Checking if Trilinos works with SUNDIALS... OK") - set(Trilinos_WORKS - TRUE - CACHE BOOL "Trilinos works with SUNDIALS as configured" FORCE) - else() - message(STATUS "Checking if Trilinos works with SUNDIALS... FAILED") - message(STATUS "Check output: ") - message("${COMPILE_OUTPUT}") - message(FATAL_ERROR "SUNDIALS interface to Trilinos is not functional.") - endif() - -elseif(Trilinos_FOUND AND Trilinos_WORKS) - message( - STATUS - "Skipped Trilinos tests, assuming Trilinos works with SUNDIALS. Set Trilinos_WORKS=FALSE to (re)run compatibility test." - ) -endif() +# Does not currently work with Trilinos imported targets due to an error from +# evaluating generator expression: $ may only be used with +# binary targets to specify link libraries, link directories, link options and +# link depends. diff --git a/doc/shared/RecentChanges.rst b/doc/shared/RecentChanges.rst index 0cd3986ee3..ed8b0b13a6 100644 --- a/doc/shared/RecentChanges.rst +++ b/doc/shared/RecentChanges.rst @@ -8,6 +8,13 @@ only valid for Volta GPUs while the automatically selected value will vary across compilers and compiler versions. As such, users are encouraged to override this value with the architecture for their system. +The Trilinos Tpetra NVector interface has been updated to utilize CMake +imported targets added in Trilinos 14 to improve support for different Kokkos +backends with Trilinos. As such, Trilinos 14 or newer is required and the +``Trilinos_INTERFACE_*`` CMake options have been removed. + +Example programs using *hypre* have been updated to support v2.20 and newer. + **Bug Fixes** Fixed the loading of ARKStep's default first order explicit method. @@ -15,4 +22,7 @@ Fixed the loading of ARKStep's default first order explicit method. Fixed a CMake bug regarding usage of missing "print_warning" macro that was only triggered when the deprecated ``CUDA_ARCH`` option was used. +Fixed compilation errors when building the Trilinos Teptra NVector with CUDA +support. + **Deprecation Notices** diff --git a/doc/shared/sundials/Install.rst b/doc/shared/sundials/Install.rst index 3d730dd594..f80b9f8fa5 100644 --- a/doc/shared/sundials/Install.rst +++ b/doc/shared/sundials/Install.rst @@ -1060,6 +1060,18 @@ illustration only. Default: OFF +.. cmakeoption:: ENABLE_TRILINOS + + Enable Trilinos (Tpetra) support + + Default: OFF + +.. cmakeoption:: Trilinos_DIR + + Path to the Trilinos installation. + + Default: None + .. cmakeoption:: ENABLE_CALIPER Enable CALIPER support @@ -1590,6 +1602,25 @@ repository. SUNDIALS has been tested with XBraid version 3.0.0. +.. _Installation.CMake.ExternalLibraries.Trilinos: + +Building with Trilinos +^^^^^^^^^^^^^^^^^^^^^^ + +`Trilinos `_ is a collection of C++ libraries of +linear solvers, non-linear solvers, optimization solvers, etc. To enable the +SUNDIALS interface to the Trilinos Tpetra vector, set the +:cmakeop:`ENABLE_TRILINOS` to ``ON`` and provide the path to the root of the +Trilinos installation in :cmakeop:`Trilinos_DIR`. + +.. code-block:: bash + + % cmake \ + > -DENABLE_TRILONOS=ON \ + > -DTRILINOS_DIR=/path/to/ginkgo/installation \ + > /home/myname/sundials/srcdir + + .. _Installation.CMake.Testing: Testing the build and installation diff --git a/examples/arkode/CXX_parallel/CMakeLists.txt b/examples/arkode/CXX_parallel/CMakeLists.txt index 2ebc00df7e..05b2a87861 100644 --- a/examples/arkode/CXX_parallel/CMakeLists.txt +++ b/examples/arkode/CXX_parallel/CMakeLists.txt @@ -175,9 +175,9 @@ if(ENABLE_RAJA # ------------- set(serial_raja_examples - "ark_brusselator1D_task_local_nls.cpp\;\;--monitor\;1\;4\;develop\;2" - "ark_brusselator1D_task_local_nls.cpp\;\;--monitor --global-nls\;1\;4\;develop\;2" - "ark_brusselator1D_task_local_nls.cpp\;\;--monitor --explicit --tf 1\;1\;4\;develop\;2" + "ark_brusselator1D_task_local_nls.cpp\;USE_SERIAL_NVEC\;--monitor\;1\;4\;develop\;2" + "ark_brusselator1D_task_local_nls.cpp\;USE_SERIAL_NVEC\;--monitor --global-nls\;1\;4\;develop\;2" + "ark_brusselator1D_task_local_nls.cpp\;USE_SERIAL_NVEC\;--monitor --explicit --tf 1\;1\;4\;develop\;2" ) set(SUNDIALS_LIBS sundials_arkode sundials_nvecmpiplusx) build_examples(serial_raja_examples CXX) diff --git a/examples/arkode/CXX_parallel/ark_brusselator1D_task_local_nls_--monitor.out b/examples/arkode/CXX_parallel/ark_brusselator1D_task_local_nls.USE_SERIAL_NVEC_--monitor.out similarity index 100% rename from examples/arkode/CXX_parallel/ark_brusselator1D_task_local_nls_--monitor.out rename to examples/arkode/CXX_parallel/ark_brusselator1D_task_local_nls.USE_SERIAL_NVEC_--monitor.out diff --git a/examples/arkode/CXX_parallel/ark_brusselator1D_task_local_nls_--monitor_--explicit_--tf_1.out b/examples/arkode/CXX_parallel/ark_brusselator1D_task_local_nls.USE_SERIAL_NVEC_--monitor_--explicit_--tf_1.out similarity index 100% rename from examples/arkode/CXX_parallel/ark_brusselator1D_task_local_nls_--monitor_--explicit_--tf_1.out rename to examples/arkode/CXX_parallel/ark_brusselator1D_task_local_nls.USE_SERIAL_NVEC_--monitor_--explicit_--tf_1.out diff --git a/examples/arkode/CXX_parallel/ark_brusselator1D_task_local_nls_--monitor_--global-nls.out b/examples/arkode/CXX_parallel/ark_brusselator1D_task_local_nls.USE_SERIAL_NVEC_--monitor_--global-nls.out similarity index 100% rename from examples/arkode/CXX_parallel/ark_brusselator1D_task_local_nls_--monitor_--global-nls.out rename to examples/arkode/CXX_parallel/ark_brusselator1D_task_local_nls.USE_SERIAL_NVEC_--monitor_--global-nls.out diff --git a/examples/arkode/CXX_parallel/ark_brusselator1D_task_local_nls.cpp b/examples/arkode/CXX_parallel/ark_brusselator1D_task_local_nls.cpp index b5029ca9a5..a44b52ea67 100644 --- a/examples/arkode/CXX_parallel/ark_brusselator1D_task_local_nls.cpp +++ b/examples/arkode/CXX_parallel/ark_brusselator1D_task_local_nls.cpp @@ -93,12 +93,14 @@ using EXEC_POLICY = RAJA::hip_exec<512, false>; constexpr auto LocalNvector = N_VNew_Hip; constexpr auto CopyVecFromDevice = N_VCopyFromDevice_Hip; -#else +#elif USE_SERIAL_NVEC #define NVECTOR_ID_STRING "Serial" using EXEC_POLICY = RAJA::seq_exec; constexpr auto LocalNvector = N_VNew_Serial; #define CopyVecFromDevice(v) +#else +#error "Unknown backend" #endif // USE_RAJA_NVEC #ifdef USE_CUDA_OR_HIP @@ -1355,9 +1357,11 @@ int EnableFusedVectorOps(N_Vector y) #elif defined(USE_OMPDEV_NVEC) retval = N_VEnableFusedOps_OpenMPDEV(N_VGetLocalVector_MPIPlusX(y), 1); if (check_retval(&retval, "N_VEnableFusedOps_OpenMPDEV", 1)) return (-1); -#else +#elif defined(USE_SERIAL_NVEC) retval = N_VEnableFusedOps_Serial(N_VGetLocalVector_MPIPlusX(y), 1); if (check_retval(&retval, "N_VEnableFusedOps_Serial", 1)) { return (-1); } +#else +#error "Unknown backend" #endif return (0); @@ -1562,11 +1566,13 @@ int SetupProblem(int argc, char* argv[], UserData* udata, UserOptions* uopt, udata->Erecv = (double*)omp_target_alloc(udata->nvar * sizeof(double), dev); if (check_retval((void*)udata->Erecv, "omp_target_alloc", 0)) return 1; -#else +#elif defined(USE_SERIAL_NVEC) udata->Wsend = new double[udata->nvar]; udata->Wrecv = new double[udata->nvar]; udata->Esend = new double[udata->nvar]; udata->Erecv = new double[udata->nvar]; +#else +#error "Unknown backend" #endif /* Create the solution masks */ @@ -1670,11 +1676,13 @@ UserData::~UserData() omp_target_free(Wrecv); omp_target_free(Esend); omp_target_free(Erecv); -#else +#elif USE_SERIAL_NVEC delete[] Wsend; delete[] Wrecv; delete[] Esend; delete[] Erecv; +#else +#error "Unknown backend" #endif /* close output streams */ diff --git a/examples/arkode/CXX_parallel/ark_diffusion_reaction_p_--np_2_2_--mri-cvode-global.out b/examples/arkode/CXX_parallel/ark_diffusion_reaction_p_--np_2_2_--mri-cvode-global.out index eb6c3b2f7a..9b913a3b91 100644 --- a/examples/arkode/CXX_parallel/ark_diffusion_reaction_p_--np_2_2_--mri-cvode-global.out +++ b/examples/arkode/CXX_parallel/ark_diffusion_reaction_p_--np_2_2_--mri-cvode-global.out @@ -61,16 +61,16 @@ 4.000000000000000e+00 3.694354186527817e+00 4.500000000000000e+00 3.627867393042675e+00 5.000000000000000e+00 3.474857085470333e+00 - 5.500000000000000e+00 3.343640002216232e+00 - 6.000000000000000e+00 3.233844046127571e+00 - 6.500000000000000e+00 3.082251062694838e+00 - 7.000000000000000e+00 2.890585369424622e+00 - 7.500000000000000e+00 2.837315452756236e+00 - 8.000000000000000e+00 2.898424893363213e+00 - 8.500000000000000e+00 3.140291028418725e+00 - 9.000000000000000e+00 3.442457327275146e+00 - 9.500000000000000e+00 3.740600281636448e+00 - 1.000000000000000e+01 4.014633157708740e+00 + 5.500000000000000e+00 3.343640002216235e+00 + 6.000000000000000e+00 3.233844046127573e+00 + 6.500000000000000e+00 3.082251062694890e+00 + 7.000000000000000e+00 2.890585369424727e+00 + 7.500000000000000e+00 2.837315452756403e+00 + 8.000000000000000e+00 2.898424893360023e+00 + 8.500000000000000e+00 3.140291028418674e+00 + 9.000000000000000e+00 3.442457327179101e+00 + 9.500000000000000e+00 3.740600281376645e+00 + 1.000000000000000e+01 4.014633156501281e+00 ---------------------------------------------- Final integrator statistics: @@ -80,17 +80,17 @@ Slow Integrator: RHS diffusion = 792 NLS iters = 396 NLS fails = 0 - LS iters = 2640 + LS iters = 2641 LS fails = 0 LS setups = 0 - LS RHS evals = 2640 - Jv products = 2640 + LS RHS evals = 2641 + Jv products = 2641 Avg NLS iters per step attempt = 3.000000 - Avg LS iters per NLS iter = 6.666667 + Avg LS iters per NLS iter = 6.669192 Preconditioner setups = 0 - Preconditioner solves = 2640 + Preconditioner solves = 2641 Fast Integrator: Steps = 2057 diff --git a/examples/arkode/CXX_parallel/ark_diffusion_reaction_p_--np_2_2_--mri-cvode-local.out b/examples/arkode/CXX_parallel/ark_diffusion_reaction_p_--np_2_2_--mri-cvode-local.out index 2069d3daf0..0dd0389711 100644 --- a/examples/arkode/CXX_parallel/ark_diffusion_reaction_p_--np_2_2_--mri-cvode-local.out +++ b/examples/arkode/CXX_parallel/ark_diffusion_reaction_p_--np_2_2_--mri-cvode-local.out @@ -63,14 +63,14 @@ 5.000000000000000e+00 3.474734466021550e+00 5.500000000000000e+00 3.343606933034505e+00 6.000000000000000e+00 3.233915506336244e+00 - 6.500000000000000e+00 3.082406527906669e+00 - 7.000000000000000e+00 2.890736516064352e+00 - 7.500000000000000e+00 2.837432528460552e+00 - 8.000000000000000e+00 2.898441248594821e+00 - 8.500000000000000e+00 3.140256919387213e+00 - 9.000000000000000e+00 3.442407086783334e+00 - 9.500000000000000e+00 3.740539247790086e+00 - 1.000000000000000e+01 4.014559182532612e+00 + 6.500000000000000e+00 3.082406527906665e+00 + 7.000000000000000e+00 2.890736516064349e+00 + 7.500000000000000e+00 2.837432528460562e+00 + 8.000000000000000e+00 2.898441248595020e+00 + 8.500000000000000e+00 3.140256919387674e+00 + 9.000000000000000e+00 3.442407086782958e+00 + 9.500000000000000e+00 3.740539247767240e+00 + 1.000000000000000e+01 4.014559182371761e+00 ---------------------------------------------- Final integrator statistics: diff --git a/examples/arkode/CXX_parallel/ark_heat2D_p_--np_2_2.out b/examples/arkode/CXX_parallel/ark_heat2D_p_--np_2_2.out index 7ab208a80b..015642ed18 100644 --- a/examples/arkode/CXX_parallel/ark_heat2D_p_--np_2_2.out +++ b/examples/arkode/CXX_parallel/ark_heat2D_p_--np_2_2.out @@ -45,18 +45,18 @@ 3.000000000000000e-01 1.261168083661019e-01 1.580109403207297e-03 3.500000000000000e-01 7.529981277589509e-02 1.084790395311314e-03 4.000000000000000e-01 3.495180900127044e-02 6.472682226835030e-04 - 4.500000000000000e-01 9.023693954928847e-03 3.135810291332412e-04 - 4.999999999999999e-01 5.528701553701492e-05 1.158664422041093e-04 - 5.499999999999999e-01 8.918915917846342e-03 7.372606743541107e-05 - 6.000000000000000e-01 3.475275192986246e-02 1.914158585883952e-04 - 6.500000000000000e-01 7.502609251530372e-02 4.577116765183409e-04 - 7.000000000000001e-01 1.257965751119296e-01 8.461653253856172e-04 - 7.500000000000001e-01 1.820941861384917e-01 1.318095298729283e-03 - 8.000000000000002e-01 2.384093995726680e-01 1.830603288722976e-03 - 8.500000000000002e-01 2.892274536259308e-01 2.327914434912759e-03 - 9.000000000000002e-01 3.295751200296289e-01 2.764242715472154e-03 - 9.500000000000003e-01 3.555039203503529e-01 3.099492697821171e-03 - 1.000000000000000e+00 3.644737419510748e-01 3.296010382116465e-03 + 4.500000000000000e-01 9.023693955015859e-03 3.135810295420080e-04 + 4.999999999999999e-01 5.528701560828762e-05 1.158664423513919e-04 + 5.499999999999999e-01 8.918915917892657e-03 7.372606708900761e-05 + 6.000000000000000e-01 3.475275193022622e-02 1.914158609587074e-04 + 6.500000000000000e-01 7.502609251490090e-02 4.577116702588202e-04 + 7.000000000000001e-01 1.257965751111169e-01 8.461653361390153e-04 + 7.500000000000001e-01 1.820941861365472e-01 1.318095291393762e-03 + 8.000000000000002e-01 2.384093995701346e-01 1.830603310791989e-03 + 8.500000000000002e-01 2.892274536261998e-01 2.327914469715142e-03 + 9.000000000000002e-01 3.295751200290455e-01 2.764242715480814e-03 + 9.500000000000003e-01 3.555039203482325e-01 3.099492713609875e-03 + 1.000000000000000e+00 3.644737419511721e-01 3.296010382883741e-03 ----------------------------------------------------------------------- Final integrator statistics: @@ -66,16 +66,16 @@ Final integrator statistics: RHS evals = 753 NLS iters = 375 NLS fails = 0 - LS iters = 12925 + LS iters = 12926 LS fails = 36 LS setups = 56 - LS RHS evals = 12925 - Jv products = 12925 + LS RHS evals = 12926 + Jv products = 12926 Avg NLS iters per step attempt = 3.000000 - Avg LS iters per NLS iter = 34.466667 + Avg LS iters per NLS iter = 34.469333 Preconditioner setups = 4 - Preconditioner solves = 12925 + Preconditioner solves = 12926 - Max error = 3.296010382116465e-03 + Max error = 3.296010382883741e-03 diff --git a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_ls.cpp b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_ls.cpp index e80c842bd4..14786d9c98 100644 --- a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_ls.cpp +++ b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_ls.cpp @@ -382,6 +382,13 @@ int main(int argc, char* argv[]) flag = SUNContext_Create(comm_w, &ctx); if (check_flag(&flag, "SUNContext_Create", 1)) { return 1; } + // Initialize hypre if v2.20.0 or newer +#if HYPRE_RELEASE_NUMBER >= 22000 || SUN_HYPRE_VERSION_MAJOR > 2 || \ + (SUN_HYPRE_VERSION_MAJOR == 2 && SUN_HYPRE_VERSION_MINOR >= 20) + flag = HYPRE_Init(); + if (check_flag(&flag, "HYPRE_Init", 1)) { return 1; } +#endif + // Set output process flag bool outproc = (myid == 0); @@ -592,6 +599,13 @@ int main(int argc, char* argv[]) // Clean up and return // -------------------- + // Finalize hypre if v2.20.0 or newer +#if HYPRE_RELEASE_NUMBER >= 22000 || SUN_HYPRE_VERSION_MAJOR > 2 || \ + (SUN_HYPRE_VERSION_MAJOR == 2 && SUN_HYPRE_VERSION_MINOR >= 20) + flag = HYPRE_Finalize(); + if (check_flag(&flag, "HYPRE_Finalize", 1)) { return 1; } +#endif + ARKodeFree(&arkode_mem); // Free integrator memory SUNLinSolFree(LS); // Free linear solver SUNMatDestroy(A); // Free matrix diff --git a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_ls_--np_2_2.out b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_ls_--np_2_2.out index caced8662d..b39cea2617 100644 --- a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_ls_--np_2_2.out +++ b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_ls_--np_2_2.out @@ -49,16 +49,16 @@ 4.000000000000000e-01 3.531419592900913e-02 1.573064596348678e-04 4.500000000000000e-01 9.066519339379787e-03 7.648429036438351e-05 4.999999999999999e-01 1.366001182955177e-05 2.823151525618881e-05 - 5.499999999999999e-01 9.040623249804479e-03 1.797011257123962e-05 - 6.000000000000000e-01 3.526521493542883e-02 4.668318201425659e-05 - 6.500000000000000e-01 7.611978800168785e-02 1.113065272947134e-04 - 7.000000000000001e-01 1.276052139795591e-01 2.055077733625899e-04 - 7.500000000000001e-01 1.846816872915430e-01 3.198180091384950e-04 - 8.000000000000002e-01 2.417622665897318e-01 4.436012686822588e-04 - 8.500000000000002e-01 2.932595626759321e-01 5.646812043804683e-04 - 9.000000000000002e-01 3.341325736187308e-01 6.709855218931526e-04 - 9.500000000000003e-01 3.603805168237891e-01 7.524532351810276e-04 - 1.000000000000000e+00 3.694333172786589e-01 7.994041731159696e-04 + 5.499999999999999e-01 9.040623249804480e-03 1.797011257116676e-05 + 6.000000000000000e-01 3.526521493542879e-02 4.668318201424271e-05 + 6.500000000000000e-01 7.611978800168766e-02 1.113065272941860e-04 + 7.000000000000001e-01 1.276052139795589e-01 2.055077733629229e-04 + 7.500000000000001e-01 1.846816872915429e-01 3.198180091369962e-04 + 8.000000000000002e-01 2.417622665897317e-01 4.436012686840352e-04 + 8.500000000000002e-01 2.932595626759314e-01 5.646812043708094e-04 + 9.000000000000002e-01 3.341325736187309e-01 6.709855218919314e-04 + 9.500000000000003e-01 3.603805168237892e-01 7.524532351735891e-04 + 1.000000000000000e+00 3.694333172786592e-01 7.994041731184121e-04 ----------------------------------------------------------------------- Final integrator statistics: @@ -76,4 +76,4 @@ Final integrator statistics: Avg NLS iters per step attempt = 3.000000 Avg LS iters per NLS iter = 7.222222 - Max error = 7.994041731159696e-04 + Max error = 7.994041731184121e-04 diff --git a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg.cpp b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg.cpp index 51e2673424..d408bcdf78 100644 --- a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg.cpp +++ b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg.cpp @@ -339,6 +339,13 @@ int main(int argc, char* argv[]) flag = SUNContext_Create(comm_w, &ctx); if (check_flag(&flag, "SUNContext_Create", 1)) { return 1; } + // Initialize hypre if v2.20.0 or newer +#if HYPRE_RELEASE_NUMBER >= 22000 || SUN_HYPRE_VERSION_MAJOR > 2 || \ + (SUN_HYPRE_VERSION_MAJOR == 2 && SUN_HYPRE_VERSION_MINOR >= 20) + flag = HYPRE_Init(); + if (check_flag(&flag, "HYPRE_Init", 1)) { return 1; } +#endif + // Set output process flag bool outproc = (myid == 0); @@ -597,6 +604,13 @@ int main(int argc, char* argv[]) // Clean up and return // -------------------- + // Finalize hypre if v2.20.0 or newer +#if HYPRE_RELEASE_NUMBER >= 22000 || SUN_HYPRE_VERSION_MAJOR > 2 || \ + (SUN_HYPRE_VERSION_MAJOR == 2 && SUN_HYPRE_VERSION_MINOR >= 20) + flag = HYPRE_Finalize(); + if (check_flag(&flag, "HYPRE_Finalize", 1)) { return 1; } +#endif + ARKodeFree(&arkode_mem); // Free integrator memory SUNLinSolFree(LS); // Free linear solver N_VDestroy(u); // Free vectors diff --git a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_imex.cpp b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_imex.cpp index caa5aaa5ad..ddf689ac47 100644 --- a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_imex.cpp +++ b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_imex.cpp @@ -339,6 +339,13 @@ int main(int argc, char* argv[]) // Create SUNDIALS context sundials::Context sunctx(comm_w); + // Initialize hypre if v2.20.0 or newer +#if HYPRE_RELEASE_NUMBER >= 22000 || SUN_HYPRE_VERSION_MAJOR > 2 || \ + (SUN_HYPRE_VERSION_MAJOR == 2 && SUN_HYPRE_VERSION_MINOR >= 20) + flag = HYPRE_Init(); + if (check_flag(&flag, "HYPRE_Init", 1)) { return 1; } +#endif + // ------------------------------------------ // Setup UserData and parallel decomposition // ------------------------------------------ @@ -539,6 +546,13 @@ int main(int argc, char* argv[]) // Clean up and return // -------------------- + // Finalize hypre if v2.20.0 or newer +#if HYPRE_RELEASE_NUMBER >= 22000 || SUN_HYPRE_VERSION_MAJOR > 2 || \ + (SUN_HYPRE_VERSION_MAJOR == 2 && SUN_HYPRE_VERSION_MINOR >= 20) + flag = HYPRE_Finalize(); + if (check_flag(&flag, "HYPRE_Finalize", 1)) { return 1; } +#endif + ARKodeFree(&arkode_mem); // Free integrator memory SUNLinSolFree(LS); // Free linear solver N_VDestroy(u); // Free vectors diff --git a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_mri.cpp b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_mri.cpp index da67100875..aa75c8b61c 100644 --- a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_mri.cpp +++ b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_mri.cpp @@ -346,6 +346,12 @@ int main(int argc, char* argv[]) // Create SUNDIALS context sundials::Context sunctx(comm_w); +#if HYPRE_RELEASE_NUMBER >= 22000 || SUN_HYPRE_VERSION_MAJOR > 2 || \ + (SUN_HYPRE_VERSION_MAJOR == 2 && SUN_HYPRE_VERSION_MINOR >= 20) + flag = HYPRE_Init(); + if (check_flag(&flag, "HYPRE_Init", 1)) { return 1; } +#endif + // ------------------------------------------ // Setup UserData and parallel decomposition // ------------------------------------------ @@ -605,6 +611,13 @@ int main(int argc, char* argv[]) // Clean up and return // -------------------- + // Finalize hypre if v2.20.0 or newer +#if HYPRE_RELEASE_NUMBER >= 22000 || SUN_HYPRE_VERSION_MAJOR > 2 || \ + (SUN_HYPRE_VERSION_MAJOR == 2 && SUN_HYPRE_VERSION_MINOR >= 20) + flag = HYPRE_Finalize(); + if (check_flag(&flag, "HYPRE_Finalize", 1)) { return 1; } +#endif + ARKodeFree(&arkode_mem); // Free slow integrator memory ARKodeFree(&inner_arkode_mem); // Free fast integrator memory MRIStepInnerStepper_Free(&inner_stepper); // Free inner stepper diff --git a/examples/arkode/CXX_serial/ark_heat2D.out b/examples/arkode/CXX_serial/ark_heat2D.out index 07fbd3c159..c7146f1b2b 100644 --- a/examples/arkode/CXX_serial/ark_heat2D.out +++ b/examples/arkode/CXX_serial/ark_heat2D.out @@ -33,24 +33,24 @@ 0.000000000000000e+00 3.632812500000000e-01 0.000000000000000e+00 5.000000000000000e-02 3.551988422792973e-01 2.455482048598578e-03 1.000000000000000e-01 3.296234292110422e-01 2.897895995286115e-03 - 1.500000000000000e-01 2.894441909302122e-01 2.832303854545248e-03 - 2.000000000000000e-01 2.387114783517686e-01 2.525802321085235e-03 - 2.500000000000000e-01 1.824256479734333e-01 2.078269488693274e-03 - 3.000000000000000e-01 1.261168083293890e-01 1.580109287144749e-03 - 3.500000000000000e-01 7.529981275357446e-02 1.084790334542951e-03 - 4.000000000000000e-01 3.495180902992235e-02 6.472683008614116e-04 - 4.500000000000000e-01 9.023693952669724e-03 3.135810223303982e-04 - 4.999999999999999e-01 5.528701552159280e-05 1.158664421454541e-04 - 5.499999999999999e-01 8.918915918112386e-03 7.372606746483198e-05 - 6.000000000000000e-01 3.475275193284167e-02 1.914158675670324e-04 - 6.500000000000000e-01 7.502609250656343e-02 4.577116535290637e-04 - 7.000000000000001e-01 1.257965751177328e-01 8.461653470575592e-04 - 7.500000000000001e-01 1.820941861469086e-01 1.318095315867573e-03 - 8.000000000000002e-01 2.384093995809592e-01 1.830603315116197e-03 - 8.500000000000002e-01 2.892274536079913e-01 2.327914393411401e-03 - 9.000000000000002e-01 3.295751199857850e-01 2.764242599605837e-03 - 9.500000000000003e-01 3.555039203642584e-01 3.099492771073020e-03 - 1.000000000000000e+00 3.644737419562301e-01 3.296010393803339e-03 + 1.500000000000000e-01 2.894441909307264e-01 2.832303876386777e-03 + 2.000000000000000e-01 2.387114783346062e-01 2.525802281702627e-03 + 2.500000000000000e-01 1.824256479329715e-01 2.078269451951664e-03 + 3.000000000000000e-01 1.261168083582418e-01 1.580109388325313e-03 + 3.500000000000000e-01 7.529981276644941e-02 1.084790361132459e-03 + 4.000000000000000e-01 3.495180902493194e-02 6.472682865382440e-04 + 4.500000000000000e-01 9.023693953952201e-03 3.135810269774553e-04 + 4.999999999999999e-01 5.528701564976438e-05 1.158664424579011e-04 + 5.499999999999999e-01 8.918915918150624e-03 7.372606719366695e-05 + 6.000000000000000e-01 3.475275193254342e-02 1.914158656317888e-04 + 6.500000000000000e-01 7.502609250596767e-02 4.577116486274846e-04 + 7.000000000000001e-01 1.257965751168525e-01 8.461653407310088e-04 + 7.500000000000001e-01 1.820941861476670e-01 1.318095319222168e-03 + 8.000000000000002e-01 2.384093995816105e-01 1.830603307639511e-03 + 8.500000000000002e-01 2.892274536103360e-01 2.327914403585929e-03 + 9.000000000000002e-01 3.295751199825840e-01 2.764242586895782e-03 + 9.500000000000003e-01 3.555039203016255e-01 3.099492598853892e-03 + 1.000000000000000e+00 3.644737419736066e-01 3.296010432179086e-03 ----------------------------------------------------------------------- Final integrator statistics: @@ -60,16 +60,16 @@ Final integrator statistics: RHS evals = 753 NLS iters = 375 NLS fails = 0 - LS iters = 12926 - LS fails = 37 + LS iters = 12927 + LS fails = 36 LS setups = 56 - LS RHS evals = 12926 - Jv products = 12926 + LS RHS evals = 12927 + Jv products = 12927 Avg NLS iters per step attempt = 3.000000 - Avg LS iters per NLS iter = 34.469333 + Avg LS iters per NLS iter = 34.472000 Preconditioner setups = 4 - Preconditioner solves = 12926 + Preconditioner solves = 12927 - Max error = 3.296010393803339e-03 + Max error = 3.296010432179086e-03 diff --git a/examples/arkode/CXX_serial/ark_kpr_Mt_0_4_1.out b/examples/arkode/CXX_serial/ark_kpr_Mt_0_4_1.out index b27df8ddb3..a662ca0306 100644 --- a/examples/arkode/CXX_serial/ark_kpr_Mt_0_4_1.out +++ b/examples/arkode/CXX_serial/ark_kpr_Mt_0_4_1.out @@ -19,7 +19,7 @@ Nonlinear Kvaerno-Prothero-Robinson test problem with mass matrix: -2.500000 0.774227 1.183861 4.86e-10 2.53e-12 -2.400000 0.794546 1.150885 4.63e-10 2.35e-12 -2.300000 0.816616 1.119953 4.77e-10 2.40e-12 - -2.200000 0.840089 1.091560 4.63e-10 2.28e-12 + -2.200000 0.840089 1.091560 4.63e-10 2.29e-12 -2.100000 0.864625 1.066204 4.49e-10 1.91e-12 -2.000000 0.889903 1.044367 4.35e-10 2.22e-12 -1.900000 0.915617 1.026499 1.65e-10 5.44e-12 @@ -84,8 +84,8 @@ Nonlinear Kvaerno-Prothero-Robinson test problem with mass matrix: 4.000000 0.820474 1.114988 4.63e-10 9.99e-12 4.100000 0.844149 1.087071 4.86e-10 9.55e-12 4.200000 0.868832 1.062273 4.87e-10 8.65e-12 - 4.300000 0.894204 1.041074 4.18e-10 8.16e-12 - 4.400000 0.919964 1.023913 7.04e-12 4.13e-12 + 4.300000 0.894204 1.041074 4.18e-10 8.17e-12 + 4.400000 0.919964 1.023913 7.04e-12 4.12e-12 4.500000 0.945834 1.011173 1.24e-09 1.30e-11 4.600000 0.971557 1.003150 2.19e-08 6.19e-10 4.700000 0.996898 1.000038 1.43e-07 2.28e-09 @@ -102,7 +102,7 @@ Nonlinear Kvaerno-Prothero-Robinson test problem with mass matrix: 5.800000 1.201149 1.239112 7.52e-10 1.06e-11 5.900000 1.209851 1.275195 8.14e-10 8.47e-12 6.000000 1.216587 1.311711 7.93e-10 7.30e-12 - 6.100000 1.221325 1.348272 7.60e-10 6.06e-12 + 6.100000 1.221325 1.348272 7.60e-10 6.05e-12 6.200000 1.224039 1.384525 2.32e-07 1.19e-09 6.300000 1.224716 1.420146 1.87e-07 9.24e-10 6.400000 1.223353 1.454836 2.45e-07 1.21e-09 @@ -125,4 +125,4 @@ Final Solver Statistics: Total linear solver setups = 0 Total number of Nonlinear iterations = 36712 Total number of Nonlinear convergence failures = 1130 - Errors: u = 7.56688e-08, v = 4.52391e-10, total = 5.35069e-08 + Errors: u = 7.56688e-08, v = 4.5239e-10, total = 5.35069e-08 diff --git a/examples/arkode/CXX_serial/ark_kpr_Mt_1_4.out b/examples/arkode/CXX_serial/ark_kpr_Mt_1_4.out index 8f2cfc2057..c652708cf1 100644 --- a/examples/arkode/CXX_serial/ark_kpr_Mt_1_4.out +++ b/examples/arkode/CXX_serial/ark_kpr_Mt_1_4.out @@ -79,7 +79,7 @@ Nonlinear Kvaerno-Prothero-Robinson test problem with mass matrix: 3.500000 0.729226 1.284209 5.55e-07 9.40e-06 3.600000 0.742716 1.247982 3.92e-06 8.60e-06 3.700000 0.758914 1.212497 4.97e-07 5.99e-06 - 3.800000 0.777505 1.178189 1.74e-06 5.18e-06 + 3.800000 0.777505 1.178189 1.74e-06 5.19e-06 3.900000 0.798150 1.145523 5.73e-06 4.63e-06 4.000000 0.820475 1.114985 1.79e-07 2.61e-06 4.100000 0.844150 1.087070 2.82e-07 1.21e-06 diff --git a/examples/arkode/CXX_serial/ark_pendulum.out b/examples/arkode/CXX_serial/ark_pendulum.out index d2ff98a75c..3731825864 100644 --- a/examples/arkode/CXX_serial/ark_pendulum.out +++ b/examples/arkode/CXX_serial/ark_pendulum.out @@ -7,29 +7,29 @@ Nonlinear Pendulum problem: step t u v e e err --------------------------------------------------------------------------------------------------------------------------- 0 0.000000000000000e+00 1.500000000000000e+00 1.000000000000000e+00 5.846976941318602e-01 0.000000000000000e+00 - 1000 1.225851562364904e+00 3.464109129286753e-01 2.123155979647627e+00 5.846976941318590e-01 -1.221245327087672e-15 - 2000 2.418923205034655e+00 -6.603311992497419e-01 1.946233242793910e+00 5.846976941317269e-01 -1.333377852574813e-13 - 3000 3.660149066899992e+00 -1.735668411457896e+00 3.986787133040775e-01 5.846976941317225e-01 -1.377786773559819e-13 - 4000 4.623294832907320e+00 -1.372538839057398e+00 -1.205491805789652e+00 5.846976941317235e-01 -1.367794766338193e-13 - 5000 5.934005658137125e+00 -1.564401075076330e-01 -2.180300444219520e+00 5.846976941317296e-01 -1.306732499983809e-13 - 6000 7.123567932980419e+00 8.747899699484564e-01 -1.774266316025390e+00 5.846976941316223e-01 -2.379207941771710e-13 - 7000 8.350624078669346e+00 1.780060261145096e+00 -2.794469129917746e-02 5.846976941316284e-01 -2.318145675417327e-13 - 8000 9.285790680382140e+00 1.196242389800009e+00 1.439620221946003e+00 5.846976941316235e-01 -2.366995488500834e-13 + 1000 1.225851561786450e+00 3.464109134211063e-01 2.123155979447245e+00 5.846976941318597e-01 -5.551115123125783e-16 + 2000 2.418921543882608e+00 -6.603296538020499e-01 1.946234339702692e+00 5.846976941317183e-01 -1.418865025470950e-13 + 3000 3.660145898154469e+00 -1.735667181339737e+00 3.986842131931391e-01 5.846976941317146e-01 -1.456612608308205e-13 + 4000 4.623633228460875e+00 -1.372222744424223e+00 -1.205956213413156e+00 5.846976941317116e-01 -1.486588629973085e-13 + 5000 5.935194112987728e+00 -1.554657188553769e-01 -2.180485787130640e+00 5.846976941317086e-01 -1.516564651637964e-13 + 6000 7.205549998128942e+00 9.556191519474134e-01 -1.699242944703125e+00 5.846976941316105e-01 -2.496891582381977e-13 + 7000 8.435071967628154e+00 1.776079125914080e+00 1.222986509241673e-01 5.846976941316141e-01 -2.461364445593972e-13 + 8000 9.428792778266162e+00 1.053566258330932e+00 1.600497457231273e+00 5.846976941316125e-01 -2.476907567938724e-13 --------------------------------------------------------------------------------------------------------------------------- Final Solver Statistics: - Internal solver steps = 8552 (attempted = 8562) - Total number of error test failures = 10 - Total RHS evals: Fe = 0, Fi = 35561 - Total number of Newton iterations = 27018 - Total number of linear solver convergence failures = 11 - Total linear solver setups = 471 - Total number of Jacobian evaluations = 150 + Internal solver steps = 8416 (attempted = 8425) + Total number of error test failures = 9 + Total RHS evals: Fe = 0, Fi = 35032 + Total number of Newton iterations = 26624 + Total number of linear solver convergence failures = 10 + Total linear solver setups = 459 + Total number of Jacobian evaluations = 147 Total RHS evals for setting up the linear system = 0 - Total Relaxation Fn evals = 25424 - Total Relaxation Jac evals = 25424 + Total Relaxation Fn evals = 25036 + Total Relaxation Jac evals = 25036 Total Relaxation fails = 0 Total Relaxation bound fails = 0 Total Relaxation NLS fails = 0 - Total Relaxation NLS iters = 8300 + Total Relaxation NLS iters = 8186 diff --git a/examples/arkode/CXX_xbraid/ark_heat2D_hypre_pfmg_xbraid.cpp b/examples/arkode/CXX_xbraid/ark_heat2D_hypre_pfmg_xbraid.cpp index 0dd094d8b6..987ba94a5d 100644 --- a/examples/arkode/CXX_xbraid/ark_heat2D_hypre_pfmg_xbraid.cpp +++ b/examples/arkode/CXX_xbraid/ark_heat2D_hypre_pfmg_xbraid.cpp @@ -375,6 +375,13 @@ int main(int argc, char* argv[]) flag = SUNContext_Create(comm_w, &ctx); if (check_flag(&flag, "SUNContext_Create", 1)) { return 1; } + // Initialize hypre if v2.20.0 or newer +#if HYPRE_RELEASE_NUMBER >= 22000 || SUN_HYPRE_VERSION_MAJOR > 2 || \ + (SUN_HYPRE_VERSION_MAJOR == 2 && SUN_HYPRE_VERSION_MINOR >= 20) + flag = HYPRE_Init(); + if (check_flag(&flag, "HYPRE_Init", 1)) { return 1; } +#endif + // Set output process flag bool outproc = (myid == 0); @@ -701,6 +708,13 @@ int main(int argc, char* argv[]) // Clean up and return // -------------------- + // Finalize hypre if v2.20.0 or newer +#if HYPRE_RELEASE_NUMBER >= 22000 || SUN_HYPRE_VERSION_MAJOR > 2 || \ + (SUN_HYPRE_VERSION_MAJOR == 2 && SUN_HYPRE_VERSION_MINOR >= 20) + flag = HYPRE_Finalize(); + if (check_flag(&flag, "HYPRE_Finalize", 1)) { return 1; } +#endif + ARKodeFree(&arkode_mem); // Free integrator memory SUNLinSolFree(LS); // Free linear solver N_VDestroy(u); // Free vectors diff --git a/examples/arkode/CXX_xbraid/ark_heat2D_hypre_pfmg_xbraid_--np_2_1_2_--x_print_level_0.out b/examples/arkode/CXX_xbraid/ark_heat2D_hypre_pfmg_xbraid_--np_2_1_2_--x_print_level_0.out index 978c7d9928..e8bf3bb4cf 100644 --- a/examples/arkode/CXX_xbraid/ark_heat2D_hypre_pfmg_xbraid_--np_2_1_2_--x_print_level_0.out +++ b/examples/arkode/CXX_xbraid/ark_heat2D_hypre_pfmg_xbraid_--np_2_1_2_--x_print_level_0.out @@ -45,7 +45,7 @@ output = 1 --------------------------------- - Max error = 3.297223495382084e-03 + Max error = 3.297223495728918e-03 Final max integrator statistics: Steps = 1780 diff --git a/examples/arkode/CXX_xbraid/ark_heat2D_p_xbraid_--np_2_1_2_--x_print_level_0.out b/examples/arkode/CXX_xbraid/ark_heat2D_p_xbraid_--np_2_1_2_--x_print_level_0.out index 744747849a..b9a01b542f 100644 --- a/examples/arkode/CXX_xbraid/ark_heat2D_p_xbraid_--np_2_1_2_--x_print_level_0.out +++ b/examples/arkode/CXX_xbraid/ark_heat2D_p_xbraid_--np_2_1_2_--x_print_level_0.out @@ -42,7 +42,7 @@ output = 1 --------------------------------- - Max error = 3.297223330406052e-03 + Max error = 3.297223209148270e-03 Final max integrator statistics: Steps = 1780 @@ -51,15 +51,15 @@ Final max integrator statistics: RHS evals = 12460 NLS iters = 5340 NLS fails = 0 - LS iters = 188622 + LS iters = 188490 LS fails = 0 LS setups = 1780 - LS RHS evals = 188622 - Jv products = 188622 + LS RHS evals = 188490 + Jv products = 188490 Avg NLS iters per step attempt = 3.000000 - Avg LS iters per NLS iter = 35.322472 + Avg LS iters per NLS iter = 35.297753 Preconditioner setups = 1780 - Preconditioner solves = 188622 + Preconditioner solves = 188490 diff --git a/examples/arkode/CXX_xbraid/ark_heat2D_xbraid_--x_print_level_0.out b/examples/arkode/CXX_xbraid/ark_heat2D_xbraid_--x_print_level_0.out index 90b4dedf7a..2f66e11ae8 100644 --- a/examples/arkode/CXX_xbraid/ark_heat2D_xbraid_--x_print_level_0.out +++ b/examples/arkode/CXX_xbraid/ark_heat2D_xbraid_--x_print_level_0.out @@ -37,7 +37,7 @@ output = 1 --------------------------------- - Max error = 3.297223425028251e-03 + Max error = 3.297223554637685e-03 Final max integrator statistics: Steps = 895 @@ -46,15 +46,15 @@ Final max integrator statistics: RHS evals = 6265 NLS iters = 2685 NLS fails = 0 - LS iters = 97779 + LS iters = 97791 LS fails = 0 LS setups = 895 - LS RHS evals = 97779 - Jv products = 97779 + LS RHS evals = 97791 + Jv products = 97791 Avg NLS iters per step attempt = 3.000000 - Avg LS iters per NLS iter = 36.416760 + Avg LS iters per NLS iter = 36.421229 Preconditioner setups = 895 - Preconditioner solves = 97779 + Preconditioner solves = 97791 diff --git a/examples/arkode/C_parallel/ark_brusselator1D_task_local_nls.c b/examples/arkode/C_parallel/ark_brusselator1D_task_local_nls.c index c76464681c..a35437e611 100644 --- a/examples/arkode/C_parallel/ark_brusselator1D_task_local_nls.c +++ b/examples/arkode/C_parallel/ark_brusselator1D_task_local_nls.c @@ -180,7 +180,7 @@ typedef struct #define LOCAL_NLS(NLS) (GET_NLS_CONTENT(NLS)->local_nls) /* SUNNonlinearSolver constructor */ -SUNNonlinearSolver TaskLocalNewton(SUNContext ctx, N_Vector y); +static SUNNonlinearSolver TaskLocalNewton(SUNContext ctx, N_Vector y); /* * RHS functions provided to the integrator @@ -352,7 +352,8 @@ int main(int argc, char* argv[]) } /* Setup ARKODE and evolve problem in time with IMEX method*/ -int EvolveProblemIMEX(N_Vector y, UserData udata, UserOptions uopt, SUNContext ctx) +static int EvolveProblemIMEX(N_Vector y, UserData udata, UserOptions uopt, + SUNContext ctx) { void* arkode_mem = NULL; /* empty ARKODE memory structure */ SUNNonlinearSolver NLS = NULL; /* empty nonlinear solver structure */ @@ -503,8 +504,8 @@ int EvolveProblemIMEX(N_Vector y, UserData udata, UserOptions uopt, SUNContext c } /* Setup ARKODE and evolve problem in time explicitly */ -int EvolveProblemExplicit(N_Vector y, UserData udata, UserOptions uopt, - SUNContext ctx) +static int EvolveProblemExplicit(N_Vector y, UserData udata, UserOptions uopt, + SUNContext ctx) { void* arkode_mem = NULL; /* empty ARKODE memory structure */ double t, dtout, tout; /* current/output time data */ @@ -591,7 +592,7 @@ int EvolveProblemExplicit(N_Vector y, UserData udata, UserOptions uopt, } /* Write time and solution to disk */ -int WriteOutput(double t, N_Vector y, UserData udata, UserOptions uopt) +static int WriteOutput(double t, N_Vector y, UserData udata, UserOptions uopt) { long long i; long long nvar = udata->nvar; @@ -652,7 +653,7 @@ int WriteOutput(double t, N_Vector y, UserData udata, UserOptions uopt) } /* Initial Condition Functions */ -int SetIC(N_Vector y, UserData udata) +static int SetIC(N_Vector y, UserData udata) { /* Variable shortcuts */ long long nvar = udata->nvar; @@ -703,7 +704,7 @@ int SetIC(N_Vector y, UserData udata) * --------------------------------------------------------------*/ /* Compute the advection term. */ -int Advection(double t, N_Vector y, N_Vector ydot, void* user_data) +static int Advection(double t, N_Vector y, N_Vector ydot, void* user_data) { /* access problem data */ UserData udata = (UserData)user_data; @@ -792,7 +793,7 @@ int Advection(double t, N_Vector y, N_Vector ydot, void* user_data) } /* Compute the reaction term. */ -int Reaction(double t, N_Vector y, N_Vector ydot, void* user_data) +static int Reaction(double t, N_Vector y, N_Vector ydot, void* user_data) { /* access problem data */ UserData udata = (UserData)user_data; @@ -858,7 +859,7 @@ int Reaction(double t, N_Vector y, N_Vector ydot, void* user_data) } /* Compute the RHS as Advection+Reaction. */ -int AdvectionReaction(double t, N_Vector y, N_Vector ydot, void* user_data) +static int AdvectionReaction(double t, N_Vector y, N_Vector ydot, void* user_data) { int retval; @@ -879,7 +880,7 @@ int AdvectionReaction(double t, N_Vector y, N_Vector ydot, void* user_data) * (Non)linear system functions * --------------------------------------------------------------*/ -int TaskLocalNlsResidual(N_Vector ycor, N_Vector F, void* arkode_mem) +static int TaskLocalNlsResidual(N_Vector ycor, N_Vector F, void* arkode_mem) { /* temporary variables */ UserData udata; @@ -926,7 +927,7 @@ int TaskLocalNlsResidual(N_Vector ycor, N_Vector F, void* arkode_mem) return (0); } -int TaskLocalLSolve(N_Vector delta, void* arkode_mem) +static int TaskLocalLSolve(N_Vector delta, void* arkode_mem) { /* local variables */ UserData udata = NULL; @@ -1027,12 +1028,12 @@ int TaskLocalLSolve(N_Vector delta, void* arkode_mem) return (retval); } -SUNNonlinearSolver_Type TaskLocalNewton_GetType(SUNNonlinearSolver NLS) +static SUNNonlinearSolver_Type TaskLocalNewton_GetType(SUNNonlinearSolver NLS) { return SUNNONLINEARSOLVER_ROOTFIND; } -SUNErrCode TaskLocalNewton_Initialize(SUNNonlinearSolver NLS) +static SUNErrCode TaskLocalNewton_Initialize(SUNNonlinearSolver NLS) { /* check that the nonlinear solver is non-null */ if (NLS == NULL) { return SUN_ERR_ARG_CORRUPT; } @@ -1044,9 +1045,9 @@ SUNErrCode TaskLocalNewton_Initialize(SUNNonlinearSolver NLS) return (SUNNonlinSolInitialize(LOCAL_NLS(NLS))); } -int TaskLocalNewton_Solve(SUNNonlinearSolver NLS, N_Vector y0, N_Vector ycor, - N_Vector w, double tol, sunbooleantype callLSetup, - void* mem) +static int TaskLocalNewton_Solve(SUNNonlinearSolver NLS, N_Vector y0, + N_Vector ycor, N_Vector w, double tol, + sunbooleantype callLSetup, void* mem) { /* local variables */ MPI_Comm comm; @@ -1080,7 +1081,7 @@ int TaskLocalNewton_Solve(SUNNonlinearSolver NLS, N_Vector y0, N_Vector ycor, return recover; } -SUNErrCode TaskLocalNewton_Free(SUNNonlinearSolver NLS) +static SUNErrCode TaskLocalNewton_Free(SUNNonlinearSolver NLS) { /* return if NLS is already free */ if (NLS == NULL) { return SUN_SUCCESS; } @@ -1106,8 +1107,8 @@ SUNErrCode TaskLocalNewton_Free(SUNNonlinearSolver NLS) return SUN_SUCCESS; } -SUNErrCode TaskLocalNewton_SetSysFn(SUNNonlinearSolver NLS, - SUNNonlinSolSysFn SysFn) +static SUNErrCode TaskLocalNewton_SetSysFn(SUNNonlinearSolver NLS, + SUNNonlinSolSysFn SysFn) { /* check that the nonlinear solver is non-null */ if (NLS == NULL) { return SUN_ERR_ARG_CORRUPT; } @@ -1115,9 +1116,9 @@ SUNErrCode TaskLocalNewton_SetSysFn(SUNNonlinearSolver NLS, return (SUNNonlinSolSetSysFn(LOCAL_NLS(NLS), SysFn)); } -SUNErrCode TaskLocalNewton_SetConvTestFn(SUNNonlinearSolver NLS, - SUNNonlinSolConvTestFn CTestFn, - void* ctest_data) +static SUNErrCode TaskLocalNewton_SetConvTestFn(SUNNonlinearSolver NLS, + SUNNonlinSolConvTestFn CTestFn, + void* ctest_data) { /* check that the nonlinear solver is non-null */ if (NLS == NULL) { return SUN_ERR_ARG_CORRUPT; } @@ -1125,8 +1126,8 @@ SUNErrCode TaskLocalNewton_SetConvTestFn(SUNNonlinearSolver NLS, return (SUNNonlinSolSetConvTestFn(LOCAL_NLS(NLS), CTestFn, ctest_data)); } -SUNErrCode TaskLocalNewton_GetNumConvFails(SUNNonlinearSolver NLS, - long int* nconvfails) +static SUNErrCode TaskLocalNewton_GetNumConvFails(SUNNonlinearSolver NLS, + long int* nconvfails) { /* check that the nonlinear solver is non-null */ if (NLS == NULL) { return SUN_ERR_ARG_CORRUPT; } @@ -1134,7 +1135,7 @@ SUNErrCode TaskLocalNewton_GetNumConvFails(SUNNonlinearSolver NLS, return (GET_NLS_CONTENT(NLS)->ncnf); } -SUNNonlinearSolver TaskLocalNewton(SUNContext ctx, N_Vector y) +static SUNNonlinearSolver TaskLocalNewton(SUNContext ctx, N_Vector y) { SUNNonlinearSolver NLS; TaskLocalNewton_Content content; @@ -1201,8 +1202,8 @@ SUNNonlinearSolver TaskLocalNewton(SUNContext ctx, N_Vector y) * --------------------------------------------------------------*/ /* Sets P = I - gamma * J */ -int PSetup(double t, N_Vector y, N_Vector ydot, sunbooleantype jok, - sunbooleantype* jcurPtr, double gamma, void* user_data) +static int PSetup(double t, N_Vector y, N_Vector ydot, sunbooleantype jok, + sunbooleantype* jcurPtr, double gamma, void* user_data) { /* local variables */ UserData udata = (UserData)user_data; @@ -1274,8 +1275,8 @@ int PSetup(double t, N_Vector y, N_Vector ydot, sunbooleantype jok, } /* Solves Pz = r */ -int PSolve(double t, N_Vector y, N_Vector ydot, N_Vector r, N_Vector z, - double gamma, double delta, int lr, void* user_data) +static int PSolve(double t, N_Vector y, N_Vector ydot, N_Vector r, N_Vector z, + double gamma, double delta, int lr, void* user_data) { /* local variables */ UserData udata = (UserData)user_data; @@ -1303,7 +1304,7 @@ int PSolve(double t, N_Vector y, N_Vector ydot, N_Vector r, N_Vector z, /* Exchanges the periodic BCs only by sending the first mesh node to the last processor. */ -int ExchangeBCOnly(N_Vector y, UserData udata) +static int ExchangeBCOnly(N_Vector y, UserData udata) { int var, ierr; MPI_Status stat; @@ -1360,7 +1361,7 @@ int ExchangeBCOnly(N_Vector y, UserData udata) } /* Starts the exchange of the neighbor information */ -int ExchangeAllStart(N_Vector y, UserData udata) +static int ExchangeAllStart(N_Vector y, UserData udata) { int var; int retval; @@ -1419,7 +1420,7 @@ int ExchangeAllStart(N_Vector y, UserData udata) } /* Completes the exchange of the neighbor information */ -int ExchangeAllEnd(UserData udata) +static int ExchangeAllEnd(UserData udata) { int ierr; MPI_Status stat; @@ -1445,8 +1446,8 @@ int ExchangeAllEnd(UserData udata) return 0; } -int SetupProblem(int argc, char* argv[], UserData udata, UserOptions uopt, - SUNContext ctx) +static int SetupProblem(int argc, char* argv[], UserData udata, + UserOptions uopt, SUNContext ctx) { /* local variables */ int i, retval; @@ -1736,7 +1737,7 @@ int SetupProblem(int argc, char* argv[], UserData udata, UserOptions uopt, return (0); } -void FreeProblem(UserData udata, UserOptions uopt) +static void FreeProblem(UserData udata, UserOptions uopt) { if (!uopt->explicit) { @@ -1777,7 +1778,7 @@ void FreeProblem(UserData udata, UserOptions uopt) } } -void InputError(char* name) +static void InputError(char* name) { int myid; @@ -1819,7 +1820,7 @@ void InputError(char* name) * opt == 1 means the function returns an integer where a * value < 0 indicates an error occurred * --------------------------------------------------------------*/ -int check_retval(void* returnvalue, const char* funcname, int opt) +static int check_retval(void* returnvalue, const char* funcname, int opt) { int *errvalue, myid; diff --git a/examples/arkode/C_parallel/ark_brusselator1D_task_local_nls_--monitor_--global-nls.out b/examples/arkode/C_parallel/ark_brusselator1D_task_local_nls_--monitor_--global-nls.out index 8035ea4112..2af3945f09 100644 --- a/examples/arkode/C_parallel/ark_brusselator1D_task_local_nls_--monitor_--global-nls.out +++ b/examples/arkode/C_parallel/ark_brusselator1D_task_local_nls_--monitor_--global-nls.out @@ -30,47 +30,47 @@ Output directory: . 1.000000 1.617972 2.789695 3.499972 1.250000 1.738611 2.525641 3.499970 1.500000 1.724313 2.346645 3.499970 - 1.750000 1.609332 2.267405 3.499972 - 2.000000 1.441938 2.284790 3.499975 - 2.250000 1.254548 2.387110 3.499978 - 2.500000 1.067861 2.552978 3.499982 - 2.750000 0.894914 2.755797 3.499985 - 3.000000 0.742698 2.972707 3.499988 - 3.250000 0.614424 3.189681 3.499990 + 1.750000 1.609332 2.267405 3.499980 + 2.000000 1.441938 2.284790 3.499964 + 2.250000 1.254548 2.387110 3.500108 + 2.500000 1.067861 2.552978 3.499971 + 2.750000 0.894914 2.755797 3.499978 + 3.000000 0.742698 2.972707 3.499968 + 3.250000 0.614424 3.189681 3.499987 3.500000 0.511703 3.400292 3.499992 3.750000 0.435022 3.602349 3.499993 4.000000 0.382884 3.795611 3.499993 4.250000 0.351268 3.980789 3.499994 4.500000 0.334675 4.159066 3.499994 - 4.750000 0.327999 4.331676 3.499994 - 5.000000 0.327576 4.499585 3.499994 + 4.750000 0.327999 4.331676 3.499996 + 5.000000 0.327576 4.499585 3.499998 5.250000 0.331182 4.663357 3.499994 5.500000 0.337619 4.823164 3.499994 - 5.750000 0.346346 4.978846 3.499994 - 6.000000 0.357245 5.129937 3.499994 - 6.250000 0.370526 5.275660 3.499994 - 6.500000 0.386740 5.414810 3.499993 - 6.750000 0.406897 5.545549 3.499993 + 5.750000 0.346346 4.978846 3.499754 + 6.000000 0.357245 5.129937 3.499811 + 6.250000 0.370526 5.275660 3.499996 + 6.500000 0.386740 5.414810 3.500062 + 6.750000 0.406897 5.545549 3.499988 7.000000 0.432797 5.664942 3.499992 7.250000 0.467856 5.767888 3.499992 7.500000 0.519324 5.844481 3.499991 - 7.750000 0.605996 5.871569 3.499989 + 7.750000 0.605996 5.871569 3.499969 8.000000 0.797170 5.775343 3.499986 8.250000 1.629022 5.135025 3.499974 8.500000 3.774898 3.499505 3.499941 8.750000 4.025788 2.194933 3.499932 9.000000 3.877379 0.967603 3.499933 - 9.250000 3.148899 1.087229 3.499946 + 9.250000 3.148899 1.087229 3.499958 9.500000 2.471560 1.322866 3.499958 9.750000 1.912340 1.594917 3.499967 - 10.000000 1.450253 1.896162 3.499975 + 10.000000 1.450253 1.896164 3.499975 Final Solver Statistics (for processor 0): - Internal solver steps = 482 (attempted = 482) - Total RHS evals: Fe = 1931, Fi = 4835 + Internal solver steps = 483 (attempted = 483) + Total RHS evals: Fe = 1935, Fi = 4845 Total number of error test failures = 0 Total number of nonlinear solver convergence failures = 2 - Total number of nonlinear iterations = 2904 - Total number of linear iterations = 9286 + Total number of nonlinear iterations = 2910 + Total number of linear iterations = 9307 Total number of preconditioner setups = 9 - Total number of preconditioner solves = 12085 + Total number of preconditioner solves = 12112 diff --git a/examples/arkode/C_parallel/ark_diurnal_kry_bbd_p.out b/examples/arkode/C_parallel/ark_diurnal_kry_bbd_p.out index 6ec12802af..33fd09b78d 100644 --- a/examples/arkode/C_parallel/ark_diurnal_kry_bbd_p.out +++ b/examples/arkode/C_parallel/ark_diurnal_kry_bbd_p.out @@ -8,63 +8,63 @@ Preconditioner type is: jpre = SUN_PREC_LEFT t = 7.20e+03 no. steps = 980 stepsize = 3.07e+00 -At bottom left: c1, c2 = 1.047e+04 2.527e+11 -At top right: c1, c2 = 1.119e+04 2.700e+11 +At bottom left: c1, c2 = 1.047e+04 2.527e+11 +At top right: c1, c2 = 1.119e+04 2.700e+11 t = 1.44e+04 no. steps = 2730 stepsize = 6.90e+00 -At bottom left: c1, c2 = 6.659e+06 2.582e+11 -At top right: c1, c2 = 7.301e+06 2.833e+11 +At bottom left: c1, c2 = 6.659e+06 2.582e+11 +At top right: c1, c2 = 7.301e+06 2.833e+11 t = 2.16e+04 no. steps = 3533 stepsize = 1.04e+01 -At bottom left: c1, c2 = 2.665e+07 2.993e+11 -At top right: c1, c2 = 2.931e+07 3.313e+11 +At bottom left: c1, c2 = 2.665e+07 2.993e+11 +At top right: c1, c2 = 2.931e+07 3.313e+11 -t = 2.88e+04 no. steps = 4681 stepsize = 4.32e+00 -At bottom left: c1, c2 = 8.702e+06 3.380e+11 -At top right: c1, c2 = 9.650e+06 3.751e+11 +t = 2.88e+04 no. steps = 4686 stepsize = 4.31e+00 +At bottom left: c1, c2 = 8.702e+06 3.380e+11 +At top right: c1, c2 = 9.650e+06 3.751e+11 -t = 3.60e+04 no. steps = 5975 stepsize = 2.55e+00 -At bottom left: c1, c2 = 1.404e+04 3.387e+11 -At top right: c1, c2 = 1.561e+04 3.765e+11 +t = 3.60e+04 no. steps = 5981 stepsize = 2.55e+00 +At bottom left: c1, c2 = 1.404e+04 3.387e+11 +At top right: c1, c2 = 1.561e+04 3.765e+11 -t = 4.32e+04 no. steps = 7163 stepsize = 4.64e+02 -At bottom left: c1, c2 = 2.125e-08 3.382e+11 -At top right: c1, c2 = 4.245e-08 3.804e+11 +t = 4.32e+04 no. steps = 7170 stepsize = 4.78e+02 +At bottom left: c1, c2 = -3.557e-10 3.382e+11 +At top right: c1, c2 = 1.033e-09 3.804e+11 -t = 5.04e+04 no. steps = 7179 stepsize = 4.64e+02 -At bottom left: c1, c2 = -4.072e-07 3.358e+11 -At top right: c1, c2 = 4.005e-11 3.864e+11 +t = 5.04e+04 no. steps = 7187 stepsize = 4.82e+02 +At bottom left: c1, c2 = -4.936e-07 3.358e+11 +At top right: c1, c2 = -1.075e-12 3.864e+11 -t = 5.76e+04 no. steps = 7195 stepsize = 3.44e+02 -At bottom left: c1, c2 = 3.487e-08 3.320e+11 -At top right: c1, c2 = 3.658e-18 3.909e+11 +t = 5.76e+04 no. steps = 7202 stepsize = 3.74e+02 +At bottom left: c1, c2 = -9.646e-07 3.320e+11 +At top right: c1, c2 = 1.101e-19 3.909e+11 -t = 6.48e+04 no. steps = 7210 stepsize = 5.15e+02 -At bottom left: c1, c2 = 2.253e-07 3.313e+11 -At top right: c1, c2 = -2.680e-19 3.963e+11 +t = 6.48e+04 no. steps = 7216 stepsize = 5.82e+02 +At bottom left: c1, c2 = 1.665e-07 3.313e+11 +At top right: c1, c2 = 3.501e-19 3.963e+11 -t = 7.20e+04 no. steps = 7224 stepsize = 5.15e+02 -At bottom left: c1, c2 = 8.966e-08 3.330e+11 -At top right: c1, c2 = -1.036e-18 4.039e+11 +t = 7.20e+04 no. steps = 7228 stepsize = 5.82e+02 +At bottom left: c1, c2 = -1.045e-08 3.330e+11 +At top right: c1, c2 = -6.502e-20 4.039e+11 -t = 7.92e+04 no. steps = 7238 stepsize = 5.15e+02 -At bottom left: c1, c2 = 2.038e-08 3.334e+11 -At top right: c1, c2 = -2.330e-18 4.120e+11 +t = 7.92e+04 no. steps = 7241 stepsize = 5.82e+02 +At bottom left: c1, c2 = -1.269e-07 3.334e+11 +At top right: c1, c2 = 4.639e-19 4.120e+11 -t = 8.64e+04 no. steps = 7252 stepsize = 5.15e+02 -At bottom left: c1, c2 = -3.746e-21 3.352e+11 -At top right: c1, c2 = -2.537e-27 4.163e+11 +t = 8.64e+04 no. steps = 7253 stepsize = 5.82e+02 +At bottom left: c1, c2 = -3.193e-07 3.352e+11 +At top right: c1, c2 = -7.979e-21 4.163e+11 -Final Statistics: +Final Statistics: lenrw = 3902 leniw = 279 lenrwls = 2455 leniwls = 126 -nst = 7252 nfe = 0 -nfe = 76929 nfels = 102816 -nni = 40521 nli = 102816 -nsetups = 439 netf = 29 -npe = 122 nps = 140398 +nst = 7253 nfe = 0 +nfe = 76956 nfels = 102729 +nni = 40543 nli = 102729 +nsetups = 441 netf = 29 +npe = 122 nps = 140344 ncfn = 0 ncfl = 0 In ARKBBDPRE: real/integer local work space sizes = 1300, 192 @@ -77,64 +77,64 @@ In ARKBBDPRE: real/integer local work space sizes = 1300, 192 Preconditioner type is: jpre = SUN_PREC_RIGHT t = 7.20e+03 no. steps = 980 stepsize = 3.07e+00 -At bottom left: c1, c2 = 1.047e+04 2.527e+11 -At top right: c1, c2 = 1.119e+04 2.700e+11 +At bottom left: c1, c2 = 1.047e+04 2.527e+11 +At top right: c1, c2 = 1.119e+04 2.700e+11 t = 1.44e+04 no. steps = 2730 stepsize = 6.90e+00 -At bottom left: c1, c2 = 6.659e+06 2.582e+11 -At top right: c1, c2 = 7.301e+06 2.833e+11 +At bottom left: c1, c2 = 6.659e+06 2.582e+11 +At top right: c1, c2 = 7.301e+06 2.833e+11 t = 2.16e+04 no. steps = 3533 stepsize = 1.04e+01 -At bottom left: c1, c2 = 2.665e+07 2.993e+11 -At top right: c1, c2 = 2.931e+07 3.313e+11 +At bottom left: c1, c2 = 2.665e+07 2.993e+11 +At top right: c1, c2 = 2.931e+07 3.313e+11 -t = 2.88e+04 no. steps = 4705 stepsize = 3.57e+00 -At bottom left: c1, c2 = 8.702e+06 3.380e+11 -At top right: c1, c2 = 9.650e+06 3.751e+11 +t = 2.88e+04 no. steps = 4684 stepsize = 4.55e+00 +At bottom left: c1, c2 = 8.702e+06 3.380e+11 +At top right: c1, c2 = 9.650e+06 3.751e+11 -t = 3.60e+04 no. steps = 6160 stepsize = 2.56e+00 -At bottom left: c1, c2 = 1.404e+04 3.387e+11 -At top right: c1, c2 = 1.561e+04 3.765e+11 +t = 3.60e+04 no. steps = 5947 stepsize = 2.56e+00 +At bottom left: c1, c2 = 1.404e+04 3.387e+11 +At top right: c1, c2 = 1.561e+04 3.765e+11 -t = 4.32e+04 no. steps = 7347 stepsize = 4.30e+02 -At bottom left: c1, c2 = 4.255e-12 3.382e+11 -At top right: c1, c2 = -2.358e-07 3.804e+11 +t = 4.32e+04 no. steps = 7133 stepsize = 4.36e+02 +At bottom left: c1, c2 = -1.512e-12 3.382e+11 +At top right: c1, c2 = -1.226e-11 3.804e+11 -t = 5.04e+04 no. steps = 7364 stepsize = 4.81e+02 -At bottom left: c1, c2 = -1.312e-17 3.358e+11 -At top right: c1, c2 = 2.130e-11 3.864e+11 +t = 5.04e+04 no. steps = 7150 stepsize = 4.19e+02 +At bottom left: c1, c2 = 8.712e-16 3.358e+11 +At top right: c1, c2 = -1.011e-06 3.864e+11 -t = 5.76e+04 no. steps = 7380 stepsize = 2.39e+02 -At bottom left: c1, c2 = -6.762e-21 3.320e+11 -At top right: c1, c2 = -4.330e-12 3.909e+11 +t = 5.76e+04 no. steps = 7168 stepsize = 2.29e+02 +At bottom left: c1, c2 = 8.678e-21 3.320e+11 +At top right: c1, c2 = 9.801e-10 3.909e+11 -t = 6.48e+04 no. steps = 7393 stepsize = 6.42e+02 -At bottom left: c1, c2 = -3.898e-25 3.313e+11 -At top right: c1, c2 = -4.918e-07 3.963e+11 +t = 6.48e+04 no. steps = 7181 stepsize = 6.37e+02 +At bottom left: c1, c2 = -1.578e-24 3.313e+11 +At top right: c1, c2 = 1.788e-09 3.963e+11 -t = 7.20e+04 no. steps = 7405 stepsize = 6.42e+02 -At bottom left: c1, c2 = 5.173e-25 3.330e+11 -At top right: c1, c2 = -1.031e-06 4.039e+11 +t = 7.20e+04 no. steps = 7193 stepsize = 6.37e+02 +At bottom left: c1, c2 = -1.410e-23 3.330e+11 +At top right: c1, c2 = -9.726e-07 4.039e+11 -t = 7.92e+04 no. steps = 7416 stepsize = 6.42e+02 -At bottom left: c1, c2 = 5.441e-26 3.334e+11 -At top right: c1, c2 = -1.290e-06 4.120e+11 +t = 7.92e+04 no. steps = 7204 stepsize = 6.37e+02 +At bottom left: c1, c2 = -1.897e-24 3.334e+11 +At top right: c1, c2 = -1.322e-06 4.120e+11 -t = 8.64e+04 no. steps = 7427 stepsize = 6.42e+02 -At bottom left: c1, c2 = 1.538e-27 3.352e+11 -At top right: c1, c2 = -5.134e-07 4.163e+11 +t = 8.64e+04 no. steps = 7215 stepsize = 6.37e+02 +At bottom left: c1, c2 = 3.801e-23 3.352e+11 +At top right: c1, c2 = 3.984e-11 4.163e+11 -Final Statistics: +Final Statistics: lenrw = 3902 leniw = 284 lenrwls = 2455 leniwls = 126 -nst = 7427 nfe = 0 -nfe = 78794 nfels = 111450 -nni = 41511 nli = 111450 -nsetups = 453 netf = 29 -npe = 125 nps = 149218 -ncfn = 0 ncfl = 38 +nst = 7215 nfe = 0 +nfe = 76537 nfels = 108364 +nni = 40314 nli = 108364 +nsetups = 438 netf = 29 +npe = 122 nps = 145149 +ncfn = 0 ncfl = 43 In ARKBBDPRE: real/integer local work space sizes = 1300, 192 - no. flocal evals. = 2750 + no. flocal evals. = 2684 diff --git a/examples/arkode/C_parallel/ark_diurnal_kry_p.out b/examples/arkode/C_parallel/ark_diurnal_kry_p.out index b2a0ee2812..2fc4afceac 100644 --- a/examples/arkode/C_parallel/ark_diurnal_kry_p.out +++ b/examples/arkode/C_parallel/ark_diurnal_kry_p.out @@ -2,61 +2,62 @@ 2-species diurnal advection-diffusion problem t = 7.20e+03 no. steps = 980 stepsize = 3.07e+00 -At bottom left: c1, c2 = 1.047e+04 2.527e+11 -At top right: c1, c2 = 1.119e+04 2.700e+11 +At bottom left: c1, c2 = 1.047e+04 2.527e+11 +At top right: c1, c2 = 1.119e+04 2.700e+11 t = 1.44e+04 no. steps = 2730 stepsize = 6.90e+00 -At bottom left: c1, c2 = 6.659e+06 2.582e+11 -At top right: c1, c2 = 7.301e+06 2.833e+11 +At bottom left: c1, c2 = 6.659e+06 2.582e+11 +At top right: c1, c2 = 7.301e+06 2.833e+11 t = 2.16e+04 no. steps = 3533 stepsize = 1.04e+01 -At bottom left: c1, c2 = 2.665e+07 2.993e+11 -At top right: c1, c2 = 2.931e+07 3.313e+11 +At bottom left: c1, c2 = 2.665e+07 2.993e+11 +At top right: c1, c2 = 2.931e+07 3.313e+11 -t = 2.88e+04 no. steps = 4695 stepsize = 3.50e+00 -At bottom left: c1, c2 = 8.702e+06 3.380e+11 -At top right: c1, c2 = 9.650e+06 3.751e+11 +t = 2.88e+04 no. steps = 4707 stepsize = 4.53e+00 +At bottom left: c1, c2 = 8.702e+06 3.380e+11 +At top right: c1, c2 = 9.650e+06 3.751e+11 -t = 3.60e+04 no. steps = 6172 stepsize = 2.55e+00 -At bottom left: c1, c2 = 1.404e+04 3.387e+11 -At top right: c1, c2 = 1.561e+04 3.765e+11 +t = 3.60e+04 no. steps = 5973 stepsize = 2.55e+00 +At bottom left: c1, c2 = 1.404e+04 3.387e+11 +At top right: c1, c2 = 1.561e+04 3.765e+11 -t = 4.32e+04 no. steps = 7361 stepsize = 5.00e+02 -At bottom left: c1, c2 = 3.855e-13 3.382e+11 -At top right: c1, c2 = -1.439e-12 3.804e+11 +t = 4.32e+04 no. steps = 7161 stepsize = 4.81e+02 +At bottom left: c1, c2 = -5.680e-13 3.382e+11 +At top right: c1, c2 = 1.958e-12 3.804e+11 -t = 5.04e+04 no. steps = 7379 stepsize = 3.71e+02 -At bottom left: c1, c2 = -4.407e-14 3.358e+11 -At top right: c1, c2 = 1.551e-13 3.864e+11 +t = 5.04e+04 no. steps = 7176 stepsize = 4.29e+02 +At bottom left: c1, c2 = -6.614e-11 3.358e+11 +At top right: c1, c2 = 9.416e-11 3.864e+11 -t = 5.76e+04 no. steps = 7394 stepsize = 1.90e+02 -At bottom left: c1, c2 = 2.370e-12 3.320e+11 -At top right: c1, c2 = -4.013e-12 3.909e+11 +t = 5.76e+04 no. steps = 7196 stepsize = 2.18e+02 +At bottom left: c1, c2 = 4.884e-13 3.320e+11 +At top right: c1, c2 = 3.038e-13 3.909e+11 -t = 6.48e+04 no. steps = 7409 stepsize = 5.59e+02 -At bottom left: c1, c2 = 1.301e-12 3.313e+11 -At top right: c1, c2 = -4.849e-12 3.963e+11 +t = 6.48e+04 no. steps = 7209 stepsize = 6.39e+02 +At bottom left: c1, c2 = 3.911e-12 3.313e+11 +At top right: c1, c2 = -1.118e-11 3.963e+11 -t = 7.20e+04 no. steps = 7421 stepsize = 5.59e+02 -At bottom left: c1, c2 = -1.797e-23 3.330e+11 -At top right: c1, c2 = -3.890e-22 4.039e+11 +t = 7.20e+04 no. steps = 7220 stepsize = 6.39e+02 +At bottom left: c1, c2 = -2.160e-12 3.330e+11 +At top right: c1, c2 = -2.041e-11 4.039e+11 -t = 7.92e+04 no. steps = 7434 stepsize = 5.59e+02 -At bottom left: c1, c2 = -2.819e-27 3.334e+11 -At top right: c1, c2 = -1.209e-25 4.120e+11 +t = 7.92e+04 no. steps = 7231 stepsize = 6.39e+02 +At bottom left: c1, c2 = -2.099e-26 3.334e+11 +At top right: c1, c2 = -4.407e-25 4.120e+11 -t = 8.64e+04 no. steps = 7447 stepsize = 5.59e+02 -At bottom left: c1, c2 = -2.334e-27 3.352e+11 -At top right: c1, c2 = -8.983e-26 4.163e+11 +t = 8.64e+04 no. steps = 7243 stepsize = 6.39e+02 +At bottom left: c1, c2 = -5.876e-25 3.352e+11 +At top right: c1, c2 = -9.344e-24 4.163e+11 -Final Statistics: +Final Statistics: lenrw = 3302 leniw = 255 lenrwls = 2455 leniwls = 126 -nst = 7447 nfe = 0 -nfi = 79041 nfels = 108536 -nni = 41643 nli = 108536 -nsetups = 456 netf = 32 -npe = 125 nps = 147035 -ncfn = 0 ncfl = 83 +nst = 7243 nfe = 0 +nfi = 76825 nfels = 105271 +nni = 40467 nli = 105271 +nsetups = 439 netf = 28 +npe = 122 nps = 142747 +ncfn = 0 ncfl = 141 + diff --git a/examples/arkode/C_parhyp/ark_diurnal_kry_ph.out b/examples/arkode/C_parhyp/ark_diurnal_kry_ph.out index a6c5f580fa..1d0747bbf7 100644 --- a/examples/arkode/C_parhyp/ark_diurnal_kry_ph.out +++ b/examples/arkode/C_parhyp/ark_diurnal_kry_ph.out @@ -2,61 +2,62 @@ 2-species diurnal advection-diffusion problem t = 7.20e+03 no. steps = 979 stepsize = 3.07e+00 -At bottom left: c1, c2 = 1.047e+04 2.527e+11 -At top right: c1, c2 = 1.119e+04 2.700e+11 +At bottom left: c1, c2 = 1.047e+04 2.527e+11 +At top right: c1, c2 = 1.119e+04 2.700e+11 t = 1.44e+04 no. steps = 2733 stepsize = 6.93e+00 -At bottom left: c1, c2 = 6.659e+06 2.582e+11 -At top right: c1, c2 = 7.301e+06 2.833e+11 +At bottom left: c1, c2 = 6.659e+06 2.582e+11 +At top right: c1, c2 = 7.301e+06 2.833e+11 t = 2.16e+04 no. steps = 3532 stepsize = 1.04e+01 -At bottom left: c1, c2 = 2.665e+07 2.993e+11 -At top right: c1, c2 = 2.931e+07 3.313e+11 +At bottom left: c1, c2 = 2.665e+07 2.993e+11 +At top right: c1, c2 = 2.931e+07 3.313e+11 -t = 2.88e+04 no. steps = 4588 stepsize = 4.86e+00 -At bottom left: c1, c2 = 8.702e+06 3.380e+11 -At top right: c1, c2 = 9.650e+06 3.751e+11 +t = 2.88e+04 no. steps = 4603 stepsize = 4.79e+00 +At bottom left: c1, c2 = 8.702e+06 3.380e+11 +At top right: c1, c2 = 9.650e+06 3.751e+11 -t = 3.60e+04 no. steps = 5824 stepsize = 2.55e+00 -At bottom left: c1, c2 = 1.404e+04 3.387e+11 -At top right: c1, c2 = 1.561e+04 3.765e+11 +t = 3.60e+04 no. steps = 5841 stepsize = 2.56e+00 +At bottom left: c1, c2 = 1.404e+04 3.387e+11 +At top right: c1, c2 = 1.561e+04 3.765e+11 -t = 4.32e+04 no. steps = 7026 stepsize = 5.12e+02 -At bottom left: c1, c2 = 1.334e-12 3.382e+11 -At top right: c1, c2 = -4.825e-12 3.804e+11 +t = 4.32e+04 no. steps = 7028 stepsize = 5.25e+02 +At bottom left: c1, c2 = -1.384e-10 3.382e+11 +At top right: c1, c2 = 4.912e-10 3.804e+11 -t = 5.04e+04 no. steps = 7041 stepsize = 5.36e+02 -At bottom left: c1, c2 = 1.415e-13 3.358e+11 -At top right: c1, c2 = -1.712e-12 3.864e+11 +t = 5.04e+04 no. steps = 7045 stepsize = 4.32e+02 +At bottom left: c1, c2 = -1.726e-08 3.358e+11 +At top right: c1, c2 = 3.060e-08 3.864e+11 -t = 5.76e+04 no. steps = 7055 stepsize = 2.34e+02 -At bottom left: c1, c2 = -2.533e-12 3.320e+11 -At top right: c1, c2 = -5.401e-12 3.909e+11 +t = 5.76e+04 no. steps = 7060 stepsize = 2.24e+02 +At bottom left: c1, c2 = -2.215e-10 3.320e+11 +At top right: c1, c2 = -3.625e-10 3.909e+11 -t = 6.48e+04 no. steps = 7068 stepsize = 6.40e+02 -At bottom left: c1, c2 = -4.169e-12 3.313e+11 -At top right: c1, c2 = 1.665e-11 3.963e+11 +t = 6.48e+04 no. steps = 7074 stepsize = 6.21e+02 +At bottom left: c1, c2 = -1.004e-22 3.313e+11 +At top right: c1, c2 = -3.771e-23 3.963e+11 -t = 7.20e+04 no. steps = 7080 stepsize = 6.40e+02 -At bottom left: c1, c2 = -3.839e-12 3.330e+11 -At top right: c1, c2 = -3.434e-11 4.039e+11 +t = 7.20e+04 no. steps = 7085 stepsize = 6.21e+02 +At bottom left: c1, c2 = -2.029e-23 3.330e+11 +At top right: c1, c2 = 2.084e-23 4.039e+11 -t = 7.92e+04 no. steps = 7091 stepsize = 6.40e+02 -At bottom left: c1, c2 = 2.289e-26 3.334e+11 -At top right: c1, c2 = 4.220e-25 4.120e+11 +t = 7.92e+04 no. steps = 7097 stepsize = 6.21e+02 +At bottom left: c1, c2 = -5.112e-23 3.334e+11 +At top right: c1, c2 = 1.320e-23 4.120e+11 -t = 8.64e+04 no. steps = 7102 stepsize = 6.40e+02 -At bottom left: c1, c2 = -5.225e-26 3.352e+11 -At top right: c1, c2 = -5.452e-25 4.163e+11 +t = 8.64e+04 no. steps = 7109 stepsize = 6.21e+02 +At bottom left: c1, c2 = 1.584e-22 3.352e+11 +At top right: c1, c2 = -2.798e-23 4.163e+11 -Final Statistics: +Final Statistics: lenrw = 3302 leniw = 255 lenrwls = 2455 leniwls = 126 -nst = 7102 nfe = 0 -nfi = 74579 nfels = 87090 -nni = 38921 nli = 87090 -nsetups = 429 netf = 29 -npe = 119 nps = 123765 +nst = 7109 nfe = 0 +nfi = 74641 nfels = 87206 +nni = 38963 nli = 87206 +nsetups = 431 netf = 26 +npe = 119 nps = 123911 ncfn = 0 ncfl = 0 + diff --git a/examples/arkode/C_serial/ark_KrylovDemo_prec.c b/examples/arkode/C_serial/ark_KrylovDemo_prec.c index 732eb5a5b4..501ff55e80 100644 --- a/examples/arkode/C_serial/ark_KrylovDemo_prec.c +++ b/examples/arkode/C_serial/ark_KrylovDemo_prec.c @@ -124,6 +124,16 @@ #endif #endif +#ifndef ABS +#if defined(SUNDIALS_DOUBLE_PRECISION) +#define ABS(x) (fabs((x))) +#elif defined(SUNDIALS_SINGLE_PRECISION) +#define ABS(x) (fabsf((x))) +#elif defined(SUNDIALS_EXTENDED_PRECISION) +#define ABS(x) (fabsl((x))) +#endif +#endif + /* Constants */ #define ZERO SUN_RCONST(0.0) @@ -878,7 +888,7 @@ static int Precond(sunrealtype t, N_Vector c, N_Vector fc, sunbooleantype jok, f1 = N_VGetArrayPointer(wdata->tmp); fac = N_VWrmsNorm(fc, rewt); - r0 = SUN_RCONST(1000.0) * fabs(gamma) * uround * NEQ * fac; + r0 = SUN_RCONST(1000.0) * ABS(gamma) * uround * NEQ * fac; if (r0 == ZERO) { r0 = ONE; } for (igy = 0; igy < ngy; igy++) @@ -896,7 +906,7 @@ static int Precond(sunrealtype t, N_Vector c, N_Vector fc, sunbooleantype jok, /* Generate the jth column as a difference quotient */ jj = if0 + j; save = cdata[jj]; - r = MAX(srur * fabs(save), r0 / rewtdata[jj]); + r = MAX(srur * ABS(save), r0 / rewtdata[jj]); cdata[jj] += r; fac = -gamma / r; fblock(t, cdata, jx, jy, f1, wdata); diff --git a/examples/arkode/C_serial/ark_analytic.c b/examples/arkode/C_serial/ark_analytic.c index a21a59b285..152a95133d 100644 --- a/examples/arkode/C_serial/ark_analytic.c +++ b/examples/arkode/C_serial/ark_analytic.c @@ -294,8 +294,8 @@ static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, sunrealtype at /* compute solution error */ ans = atan(t); - ewt = SUN_RCONST(1.0) / (rtol * fabs(ans) + atol); - err = ewt * fabs(NV_Ith_S(y, 0) - ans); + ewt = SUN_RCONST(1.0) / (rtol * SUNRabs(ans) + atol); + err = ewt * SUNRabs(NV_Ith_S(y, 0) - ans); /* is the solution within the tolerances? */ passfail = (err < SUN_RCONST(1.0)) ? 0 : 1; diff --git a/examples/arkode/C_serial/ark_analytic_mels.c b/examples/arkode/C_serial/ark_analytic_mels.c index 4b59063b1d..95dca9fbc2 100644 --- a/examples/arkode/C_serial/ark_analytic_mels.c +++ b/examples/arkode/C_serial/ark_analytic_mels.c @@ -332,8 +332,8 @@ static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, sunrealtype at /* compute solution error */ ans = atan(t); - ewt = SUN_RCONST(1.0) / (rtol * fabs(ans) + atol); - err = ewt * fabs(NV_Ith_S(y, 0) - ans); + ewt = SUN_RCONST(1.0) / (rtol * SUNRabs(ans) + atol); + err = ewt * SUNRabs(NV_Ith_S(y, 0) - ans); /* is the solution within the tolerances? */ passfail = (err < SUN_RCONST(1.0)) ? 0 : 1; diff --git a/examples/arkode/C_serial/ark_conserved_exp_entropy_ark_1_0.out b/examples/arkode/C_serial/ark_conserved_exp_entropy_ark_1_0.out index 76cfdd2a7e..bbaf5142f3 100644 --- a/examples/arkode/C_serial/ark_conserved_exp_entropy_ark_1_0.out +++ b/examples/arkode/C_serial/ark_conserved_exp_entropy_ark_1_0.out @@ -9,7 +9,7 @@ Conserved Exponential Entropy problem: ------------------------------------------------------------------------------- 0 0.000000e+00 1.000000e+00 5.000000e-01 4.367003e+00 0.000000e+00 40 7.671134e-01 -1.432143e+00 1.417843e+00 4.367003e+00 5.329071e-15 - 80 2.733674e+00 -9.963899e+00 1.474066e+00 4.367003e+00 8.881784e-15 + 80 2.733674e+00 -9.963899e+00 1.474066e+00 4.367003e+00 7.993606e-15 ------------------------------------------------------------------------------- Final Solver Statistics: diff --git a/examples/arkode/C_serial/ark_conserved_exp_entropy_ark_1_1.out b/examples/arkode/C_serial/ark_conserved_exp_entropy_ark_1_1.out index 8ab099ceb4..411353b0a1 100644 --- a/examples/arkode/C_serial/ark_conserved_exp_entropy_ark_1_1.out +++ b/examples/arkode/C_serial/ark_conserved_exp_entropy_ark_1_1.out @@ -14,20 +14,20 @@ Conserved Exponential Entropy problem: 160 1.965497e-01 5.857982e-01 9.441311e-01 4.367003e+00 8.881784e-15 200 2.457811e-01 4.537292e-01 1.027056e+00 4.367003e+00 2.753353e-14 240 2.947183e-01 3.119036e-01 1.098939e+00 4.367003e+00 4.440892e-14 - 280 3.389142e-01 1.753685e-01 1.155408e+00 4.367003e+00 4.973799e-14 - 320 3.715233e-01 6.985629e-02 1.192300e+00 4.367003e+00 4.618528e-14 - 360 3.897050e-01 9.378019e-03 1.211221e+00 4.367003e+00 4.973799e-14 - 400 3.941218e-01 -5.484616e-03 1.215646e+00 4.367003e+00 6.306067e-14 - 440 4.041300e-01 -3.940365e-02 1.225433e+00 4.367003e+00 5.861978e-14 - 480 4.249355e-01 -1.109566e-01 1.244738e+00 4.367003e+00 6.394885e-14 - 520 4.567105e-01 -2.228060e-01 1.271650e+00 4.367003e+00 7.283063e-14 - 560 5.018939e-01 -3.867565e-01 1.305016e+00 4.367003e+00 8.082424e-14 - 600 5.637002e-01 -6.191770e-01 1.342503e+00 4.367003e+00 8.526513e-14 - 640 6.475411e-01 -9.467796e-01 1.381034e+00 4.367003e+00 9.148238e-14 - 680 7.633005e-01 -1.416410e+00 1.416925e+00 4.367003e+00 9.769963e-14 - 720 9.297484e-01 -2.114173e+00 1.446041e+00 4.367003e+00 1.039169e-13 - 760 1.217690e+00 -3.351631e+00 1.466024e+00 4.367003e+00 1.145750e-13 - 800 2.256864e+00 -7.881740e+00 1.473991e+00 4.367003e+00 1.207923e-13 + 280 3.389142e-01 1.753685e-01 1.155408e+00 4.367003e+00 4.618528e-14 + 320 3.715233e-01 6.985629e-02 1.192300e+00 4.367003e+00 4.440892e-14 + 360 3.897050e-01 9.378019e-03 1.211221e+00 4.367003e+00 4.440892e-14 + 400 3.941218e-01 -5.484616e-03 1.215646e+00 4.367003e+00 5.329071e-14 + 440 4.041300e-01 -3.940364e-02 1.225433e+00 4.367003e+00 5.240253e-14 + 480 4.249355e-01 -1.109566e-01 1.244738e+00 4.367003e+00 4.263256e-14 + 520 4.567105e-01 -2.228060e-01 1.271650e+00 4.367003e+00 5.240253e-14 + 560 5.018939e-01 -3.867565e-01 1.305016e+00 4.367003e+00 5.151435e-14 + 600 5.637002e-01 -6.191769e-01 1.342503e+00 4.367003e+00 5.417888e-14 + 640 6.475411e-01 -9.467796e-01 1.381034e+00 4.367003e+00 5.506706e-14 + 680 7.633005e-01 -1.416410e+00 1.416925e+00 4.367003e+00 6.572520e-14 + 720 9.297484e-01 -2.114173e+00 1.446041e+00 4.367003e+00 7.638334e-14 + 760 1.217690e+00 -3.351631e+00 1.466024e+00 4.367003e+00 8.704149e-14 + 800 2.256863e+00 -7.881740e+00 1.473991e+00 4.367003e+00 8.792966e-14 ------------------------------------------------------------------------------- Final Solver Statistics: @@ -39,9 +39,10 @@ Final Solver Statistics: Total linear solver setups = 195 Total number of Jacobian evaluations = 136 Total RHS evals for setting up the linear system = 0 - Total Relaxation Fn evals = 2689 - Total Relaxation Jac evals = 3521 + Total Relaxation Fn evals = 2692 + Total Relaxation Jac evals = 3524 Total Relaxation fails = 15 Total Relaxation bound fails = 15 Total Relaxation NLS fails = 0 - Total Relaxation NLS iters = 1025 + Total Relaxation NLS iters = 1028 + diff --git a/examples/arkode/C_serial/ark_dissipated_exp_entropy_1_1.out b/examples/arkode/C_serial/ark_dissipated_exp_entropy_1_1.out index 176dffd2b8..d10cdad5ac 100644 --- a/examples/arkode/C_serial/ark_dissipated_exp_entropy_1_1.out +++ b/examples/arkode/C_serial/ark_dissipated_exp_entropy_1_1.out @@ -22,19 +22,19 @@ Dissipated Exponential Entropy problem: 480 6.300899e-01 2.032891e-03 1.002035e+00 -2.103494e-01 -1.716247e+00 520 6.349961e-01 -2.871232e-03 9.971329e-01 -2.192131e-01 -1.721149e+00 560 6.468398e-01 -1.461180e-02 9.854944e-01 -2.404481e-01 -1.732787e+00 - 600 6.694857e-01 -3.668376e-02 9.639809e-01 -2.804267e-01 -1.754301e+00 - 640 7.021782e-01 -6.771235e-02 9.345293e-01 -3.367534e-01 -1.783753e+00 + 600 6.694857e-01 -3.668375e-02 9.639809e-01 -2.804267e-01 -1.754301e+00 + 640 7.021782e-01 -6.771234e-02 9.345293e-01 -3.367534e-01 -1.783753e+00 680 7.458296e-01 -1.076957e-01 8.979008e-01 -4.095471e-01 -1.820381e+00 - 720 8.007409e-01 -1.558236e-01 8.557101e-01 -4.974764e-01 -1.862572e+00 + 720 8.007408e-01 -1.558236e-01 8.557101e-01 -4.974763e-01 -1.862572e+00 760 8.752295e-01 -2.176153e-01 8.044349e-01 -6.108460e-01 -1.913847e+00 - 800 9.636774e-01 -2.863486e-01 7.510007e-01 -7.375568e-01 -1.967281e+00 + 800 9.636774e-01 -2.863486e-01 7.510008e-01 -7.375568e-01 -1.967281e+00 840 1.066491e+00 -3.607260e-01 6.971700e-01 -8.753575e-01 -2.021112e+00 - 880 1.204472e+00 -4.525718e-01 6.359904e-01 -1.046452e+00 -2.082291e+00 + 880 1.204472e+00 -4.525717e-01 6.359904e-01 -1.046452e+00 -2.082291e+00 920 1.362583e+00 -5.483883e-01 5.778804e-01 -1.225972e+00 -2.140401e+00 960 1.551610e+00 -6.520589e-01 5.209720e-01 -1.421306e+00 -2.197310e+00 - 1000 1.797284e+00 -7.724956e-01 4.618590e-01 -1.649553e+00 -2.256423e+00 + 1000 1.797284e+00 -7.724955e-01 4.618590e-01 -1.649552e+00 -2.256423e+00 1040 2.083087e+00 -8.964821e-01 4.080024e-01 -1.885881e+00 -2.310279e+00 - 1080 2.422755e+00 -1.026269e+00 3.583415e-01 -2.134596e+00 -2.359940e+00 + 1080 2.422755e+00 -1.026269e+00 3.583416e-01 -2.134596e+00 -2.359940e+00 1120 2.874633e+00 -1.176348e+00 3.084029e-01 -2.423715e+00 -2.409879e+00 1160 3.418118e+00 -1.331309e+00 2.641313e-01 -2.723747e+00 -2.454151e+00 1200 4.078701e+00 -1.492135e+00 2.248921e-01 -3.036550e+00 -2.493390e+00 @@ -50,9 +50,10 @@ Final Solver Statistics: Total linear solver setups = 179 Total number of Jacobian evaluations = 125 Total RHS evals for setting up the linear system = 0 - Total Relaxation Fn evals = 4403 - Total Relaxation Jac evals = 5649 + Total Relaxation Fn evals = 4401 + Total Relaxation Jac evals = 5647 Total Relaxation fails = 0 Total Relaxation bound fails = 0 Total Relaxation NLS fails = 0 - Total Relaxation NLS iters = 1911 + Total Relaxation NLS iters = 1909 + diff --git a/examples/arkode/C_serial/ark_heat1D_adapt.c b/examples/arkode/C_serial/ark_heat1D_adapt.c index 3f9e349073..8e846e592e 100644 --- a/examples/arkode/C_serial/ark_heat1D_adapt.c +++ b/examples/arkode/C_serial/ark_heat1D_adapt.c @@ -408,7 +408,7 @@ sunrealtype* adapt_mesh(N_Vector y, sunindextype* Nnew, UserData udata) ydd = Y[i - 1] - TWO * Y[i] + Y[i + 1]; /* check for refinement */ - if (fabs(ydd) > udata->refine_tol) + if (SUNRabs(ydd) > udata->refine_tol) { marks[i - 1] = 1; marks[i] = 1; diff --git a/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--count-orbits_--use-compensated-sums.out b/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--count-orbits_--use-compensated-sums.out index 4ac4c1c821..f9b0aca194 100644 --- a/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--count-orbits_--use-compensated-sums.out +++ b/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--count-orbits_--use-compensated-sums.out @@ -51,78 +51,78 @@ t = 34.0000, H(p,q)-H0 = 2.1904265623540198e-09, L(p,q)-L0 = -2.2204460492503131 ROOT RETURN: g[0] = -1, y[0] = -1.6, y[1] = -1.9092e-13, num. orbits is now 5.50 t = 34.5575, H(p,q)-H0 = 2.1547714723624267e-09, L(p,q)-L0 = -9.2910568127990700e-11 t = 36.0000, H(p,q)-H0 = 2.1893326040967054e-09, L(p,q)-L0 = -1.1102230246251565e-16 -ROOT RETURN: g[0] = 1, y[0] = 0.4, y[1] = 5.18837e-13, num. orbits is now 6.00 +ROOT RETURN: g[0] = 1, y[0] = 0.4, y[1] = 5.1883e-13, num. orbits is now 6.00 t = 37.6991, H(p,q)-H0 = 1.4644406864938730e-06, L(p,q)-L0 = 3.3085088491091597e-07 t = 38.0000, H(p,q)-H0 = 1.4440848516983351e-10, L(p,q)-L0 = -1.1102230246251565e-16 -t = 40.0000, H(p,q)-H0 = 2.1902958335928702e-09, L(p,q)-L0 = -1.1102230246251565e-16 -ROOT RETURN: g[0] = -1, y[0] = -1.6, y[1] = -2.26967e-13, num. orbits is now 6.50 +t = 40.0000, H(p,q)-H0 = 2.1902958335928702e-09, L(p,q)-L0 = -2.2204460492503131e-16 +ROOT RETURN: g[0] = -1, y[0] = -1.6, y[1] = -2.2689e-13, num. orbits is now 6.50 t = 40.8407, H(p,q)-H0 = 2.1847282871689799e-09, L(p,q)-L0 = -1.5020873433968518e-11 -t = 42.0000, H(p,q)-H0 = 2.1899792534973983e-09, L(p,q)-L0 = 0.0000000000000000e+00 -ROOT RETURN: g[0] = 1, y[0] = 0.4, y[1] = 9.77503e-13, num. orbits is now 7.00 -t = 43.9823, H(p,q)-H0 = 1.5984138088676048e-06, L(p,q)-L0 = 3.6095561650739683e-07 -t = 44.0000, H(p,q)-H0 = -8.7564400175210721e-11, L(p,q)-L0 = 0.0000000000000000e+00 -t = 46.0000, H(p,q)-H0 = 2.1900307123345897e-09, L(p,q)-L0 = -1.1102230246251565e-16 -ROOT RETURN: g[0] = -1, y[0] = -1.6, y[1] = -5.21501e-16, num. orbits is now 7.50 -t = 47.1239, H(p,q)-H0 = 2.1591558541089739e-09, L(p,q)-L0 = -8.1509909932719893e-11 -t = 48.0000, H(p,q)-H0 = 2.1902712976640260e-09, L(p,q)-L0 = -1.1102230246251565e-16 +t = 42.0000, H(p,q)-H0 = 2.1899791979862471e-09, L(p,q)-L0 = -1.1102230246251565e-16 +ROOT RETURN: g[0] = 1, y[0] = 0.4, y[1] = 9.77139e-13, num. orbits is now 7.00 +t = 43.9823, H(p,q)-H0 = 1.5984138084235155e-06, L(p,q)-L0 = 3.6095561639637452e-07 +t = 44.0000, H(p,q)-H0 = -8.7565066309025497e-11, L(p,q)-L0 = -1.1102230246251565e-16 +t = 46.0000, H(p,q)-H0 = 2.1900307678457409e-09, L(p,q)-L0 = -1.1102230246251565e-16 +ROOT RETURN: g[0] = -1, y[0] = -1.6, y[1] = -1.18503e-16, num. orbits is now 7.50 +t = 47.1239, H(p,q)-H0 = 2.1591557430866715e-09, L(p,q)-L0 = -8.1510020955022355e-11 +t = 48.0000, H(p,q)-H0 = 2.1902712421528747e-09, L(p,q)-L0 = -1.1102230246251565e-16 t = 50.0000, H(p,q)-H0 = -4.5252468439116456e-10, L(p,q)-L0 = 0.0000000000000000e+00 -ROOT RETURN: g[0] = 1, y[0] = 0.4, y[1] = 6.09365e-15, num. orbits is now 8.00 +ROOT RETURN: g[0] = 1, y[0] = 0.4, y[1] = 5.4041e-15, num. orbits is now 8.00 t = 50.2655, H(p,q)-H0 = 3.2033230468186957e-06, L(p,q)-L0 = 7.2350434687784571e-07 -t = 52.0000, H(p,q)-H0 = 2.1894521751164575e-09, L(p,q)-L0 = -1.1102230246251565e-16 -ROOT RETURN: g[0] = -1, y[0] = -1.6, y[1] = -1.38778e-16, num. orbits is now 8.50 -t = 53.4071, H(p,q)-H0 = 2.1524908522252417e-09, L(p,q)-L0 = -9.8839714191001349e-11 -t = 54.0000, H(p,q)-H0 = 2.1904144609230514e-09, L(p,q)-L0 = 0.0000000000000000e+00 -t = 56.0000, H(p,q)-H0 = 1.9337540457797786e-09, L(p,q)-L0 = -1.1102230246251565e-16 -ROOT RETURN: g[0] = 1, y[0] = 0.4, y[1] = 1.71703e-12, num. orbits is now 9.00 -t = 56.5487, H(p,q)-H0 = 2.0121016088836541e-06, L(p,q)-L0 = 4.5456268404908684e-07 -t = 58.0000, H(p,q)-H0 = 2.1879919542833193e-09, L(p,q)-L0 = -2.2204460492503131e-16 -ROOT RETURN: g[0] = -1, y[0] = -1.6, y[1] = -7.71159e-16, num. orbits is now 9.50 -t = 59.6903, H(p,q)-H0 = 2.1883964640423414e-09, L(p,q)-L0 = -5.4833915186236482e-12 -t = 60.0000, H(p,q)-H0 = 2.1904827951502170e-09, L(p,q)-L0 = -1.1102230246251565e-16 -t = 62.0000, H(p,q)-H0 = 2.1533409499951972e-09, L(p,q)-L0 = -1.1102230246251565e-16 -ROOT RETURN: g[0] = 1, y[0] = 0.4, y[1] = 2.65131e-15, num. orbits is now 10.00 -t = 62.8319, H(p,q)-H0 = 1.2891478551324553e-06, L(p,q)-L0 = 2.9111120158908932e-07 -t = 64.0000, H(p,q)-H0 = 2.1833788110825481e-09, L(p,q)-L0 = -1.1102230246251565e-16 -ROOT RETURN: g[0] = -1, y[0] = -1.6, y[1] = -1.13744e-15, num. orbits is now 10.50 -t = 65.9734, H(p,q)-H0 = 2.1621995305309838e-09, L(p,q)-L0 = -7.3596240213191777e-11 -t = 66.0000, H(p,q)-H0 = 2.1905053881887682e-09, L(p,q)-L0 = 0.0000000000000000e+00 -t = 68.0000, H(p,q)-H0 = 2.1815430018001791e-09, L(p,q)-L0 = 0.0000000000000000e+00 -ROOT RETURN: g[0] = 1, y[0] = 0.4, y[1] = 1.23713e-12, num. orbits is now 11.00 -t = 69.1150, H(p,q)-H0 = 3.0882619195260474e-06, L(p,q)-L0 = 6.9749695053022975e-07 +t = 52.0000, H(p,q)-H0 = 2.1894519530718526e-09, L(p,q)-L0 = 0.0000000000000000e+00 +ROOT RETURN: g[0] = -1, y[0] = -1.6, y[1] = -2.94728e-13, num. orbits is now 8.50 +t = 53.4071, H(p,q)-H0 = 2.1524909632475442e-09, L(p,q)-L0 = -9.8839381124093961e-11 +t = 54.0000, H(p,q)-H0 = 2.1904142943895977e-09, L(p,q)-L0 = 0.0000000000000000e+00 +t = 56.0000, H(p,q)-H0 = 1.9337542678243835e-09, L(p,q)-L0 = 0.0000000000000000e+00 +ROOT RETURN: g[0] = 1, y[0] = 0.4, y[1] = 1.71884e-12, num. orbits is now 9.00 +t = 56.5487, H(p,q)-H0 = 2.0121016079954757e-06, L(p,q)-L0 = 4.5456268382704224e-07 +t = 58.0000, H(p,q)-H0 = 2.1879922873502267e-09, L(p,q)-L0 = 0.0000000000000000e+00 +ROOT RETURN: g[0] = -1, y[0] = -1.6, y[1] = -1.0166e-15, num. orbits is now 9.50 +t = 59.6903, H(p,q)-H0 = 2.1883965195534927e-09, L(p,q)-L0 = -5.4833915186236482e-12 +t = 60.0000, H(p,q)-H0 = 2.1904828506613683e-09, L(p,q)-L0 = -1.1102230246251565e-16 +t = 62.0000, H(p,q)-H0 = 2.1533411720398021e-09, L(p,q)-L0 = 0.0000000000000000e+00 +ROOT RETURN: g[0] = 1, y[0] = 0.4, y[1] = 1.78677e-15, num. orbits is now 10.00 +t = 62.8319, H(p,q)-H0 = 1.2891478542442769e-06, L(p,q)-L0 = 2.9111120147806702e-07 +t = 64.0000, H(p,q)-H0 = 2.1833788110825481e-09, L(p,q)-L0 = 0.0000000000000000e+00 +ROOT RETURN: g[0] = -1, y[0] = -1.6, y[1] = -6.74591e-16, num. orbits is now 10.50 +t = 65.9734, H(p,q)-H0 = 2.1621999746201936e-09, L(p,q)-L0 = -7.3595796123981927e-11 +t = 66.0000, H(p,q)-H0 = 2.1905055547222219e-09, L(p,q)-L0 = -1.1102230246251565e-16 +t = 68.0000, H(p,q)-H0 = 2.1815429462890279e-09, L(p,q)-L0 = -1.1102230246251565e-16 +ROOT RETURN: g[0] = 1, y[0] = 0.4, y[1] = 1.25993e-12, num. orbits is now 11.00 +t = 69.1150, H(p,q)-H0 = 3.0882619195260474e-06, L(p,q)-L0 = 6.9749695041920745e-07 t = 70.0000, H(p,q)-H0 = 2.1630525148808033e-09, L(p,q)-L0 = -1.1102230246251565e-16 -t = 72.0000, H(p,q)-H0 = 2.1904902336444820e-09, L(p,q)-L0 = -1.1102230246251565e-16 -ROOT RETURN: g[0] = -1, y[0] = -1.6, y[1] = -3.96608e-13, num. orbits is now 11.50 -t = 72.2566, H(p,q)-H0 = 2.1511883385727515e-09, L(p,q)-L0 = -1.0222600543841054e-10 -t = 74.0000, H(p,q)-H0 = 2.1874849154279730e-09, L(p,q)-L0 = -1.1102230246251565e-16 -ROOT RETURN: g[0] = 1, y[0] = 0.4, y[1] = 5.75581e-15, num. orbits is now 12.00 +t = 72.0000, H(p,q)-H0 = 2.1904902891556333e-09, L(p,q)-L0 = -2.2204460492503131e-16 +ROOT RETURN: g[0] = -1, y[0] = -1.6, y[1] = -3.75904e-15, num. orbits is now 11.50 +t = 72.2566, H(p,q)-H0 = 2.1511886161285076e-09, L(p,q)-L0 = -1.0222600543841054e-10 +t = 74.0000, H(p,q)-H0 = 2.1874850819614267e-09, L(p,q)-L0 = 0.0000000000000000e+00 +ROOT RETURN: g[0] = 1, y[0] = 0.4, y[1] = 1.66894e-12, num. orbits is now 12.00 t = 75.3982, H(p,q)-H0 = 2.4488947434342379e-06, L(p,q)-L0 = 5.5322002912028267e-07 -t = 76.0000, H(p,q)-H0 = 2.0191779359635120e-09, L(p,q)-L0 = -1.1102230246251565e-16 -t = 78.0000, H(p,q)-H0 = 2.1904320024468404e-09, L(p,q)-L0 = -1.1102230246251565e-16 -ROOT RETURN: g[0] = -1, y[0] = -1.6, y[1] = -4.30512e-13, num. orbits is now 12.50 -t = 78.5398, H(p,q)-H0 = 2.1863212351647121e-09, L(p,q)-L0 = -1.0879075418301909e-11 -t = 80.0000, H(p,q)-H0 = 2.1892699875181165e-09, L(p,q)-L0 = -1.1102230246251565e-16 -ROOT RETURN: g[0] = 1, y[0] = 0.4, y[1] = 1.8114e-12, num. orbits is now 13.00 -t = 81.6814, H(p,q)-H0 = 9.7535366494483355e-07, L(p,q)-L0 = 2.2024722368119143e-07 -t = 82.0000, H(p,q)-H0 = 4.1583381182874746e-10, L(p,q)-L0 = -2.2204460492503131e-16 -t = 84.0000, H(p,q)-H0 = 2.1903069358231164e-09, L(p,q)-L0 = -1.1102230246251565e-16 -ROOT RETURN: g[0] = -1, y[0] = -1.6, y[1] = -6.01949e-16, num. orbits is now 13.50 -t = 84.8230, H(p,q)-H0 = 2.1655218729321746e-09, L(p,q)-L0 = -6.4957705880885896e-11 -t = 86.0000, H(p,q)-H0 = 2.1899523861002024e-09, L(p,q)-L0 = 0.0000000000000000e+00 -ROOT RETURN: g[0] = 1, y[0] = 0.4, y[1] = 8.92949e-16, num. orbits is now 14.00 -t = 87.9646, H(p,q)-H0 = 2.9269917813934399e-06, L(p,q)-L0 = 6.6105562701590515e-07 -t = 88.0000, H(p,q)-H0 = -3.5649505569779194e-10, L(p,q)-L0 = 0.0000000000000000e+00 -t = 90.0000, H(p,q)-H0 = 2.1900535829288970e-09, L(p,q)-L0 = 0.0000000000000000e+00 -ROOT RETURN: g[0] = -1, y[0] = -1.6, y[1] = -1.25442e-16, num. orbits is now 14.50 -t = 91.1062, H(p,q)-H0 = 2.1507646774665545e-09, L(p,q)-L0 = -1.0332734667883869e-10 -t = 92.0000, H(p,q)-H0 = 2.1902584745880915e-09, L(p,q)-L0 = 0.0000000000000000e+00 -t = 94.0000, H(p,q)-H0 = -7.9522965990008743e-10, L(p,q)-L0 = -1.1102230246251565e-16 -ROOT RETURN: g[0] = 1, y[0] = 0.4, y[1] = 2.10223e-12, num. orbits is now 15.00 +t = 76.0000, H(p,q)-H0 = 2.0191780469858145e-09, L(p,q)-L0 = -1.1102230246251565e-16 +t = 78.0000, H(p,q)-H0 = 2.1904322244914454e-09, L(p,q)-L0 = 0.0000000000000000e+00 +ROOT RETURN: g[0] = -1, y[0] = -1.6, y[1] = -4.98042e-16, num. orbits is now 12.50 +t = 78.5398, H(p,q)-H0 = 2.1863216237427707e-09, L(p,q)-L0 = -1.0878853373696984e-11 +t = 80.0000, H(p,q)-H0 = 2.1892702095627214e-09, L(p,q)-L0 = 0.0000000000000000e+00 +ROOT RETURN: g[0] = 1, y[0] = 0.4, y[1] = 1.09916e-15, num. orbits is now 13.00 +t = 81.6814, H(p,q)-H0 = 9.7535366450074434e-07, L(p,q)-L0 = 2.2024722357016913e-07 +t = 82.0000, H(p,q)-H0 = 4.1583425591795731e-10, L(p,q)-L0 = 0.0000000000000000e+00 +t = 84.0000, H(p,q)-H0 = 2.1903071578677213e-09, L(p,q)-L0 = -1.1102230246251565e-16 +ROOT RETURN: g[0] = -1, y[0] = -1.6, y[1] = -2.06996e-15, num. orbits is now 13.50 +t = 84.8230, H(p,q)-H0 = 2.1655219839544770e-09, L(p,q)-L0 = -6.4957816903188359e-11 +t = 86.0000, H(p,q)-H0 = 2.1899527191671098e-09, L(p,q)-L0 = 0.0000000000000000e+00 +ROOT RETURN: g[0] = 1, y[0] = 0.4, y[1] = 3.21574e-15, num. orbits is now 14.00 +t = 87.9646, H(p,q)-H0 = 2.9269917809493506e-06, L(p,q)-L0 = 6.6105562690488284e-07 +t = 88.0000, H(p,q)-H0 = -3.5649527774239687e-10, L(p,q)-L0 = -1.1102230246251565e-16 +t = 90.0000, H(p,q)-H0 = 2.1900536939511994e-09, L(p,q)-L0 = 0.0000000000000000e+00 +ROOT RETURN: g[0] = -1, y[0] = -1.6, y[1] = -5.0435e-13, num. orbits is now 14.50 +t = 91.1062, H(p,q)-H0 = 2.1507648440000082e-09, L(p,q)-L0 = -1.0332712463423377e-10 +t = 92.0000, H(p,q)-H0 = 2.1902585300992428e-09, L(p,q)-L0 = -1.1102230246251565e-16 +t = 94.0000, H(p,q)-H0 = -7.9522965990008743e-10, L(p,q)-L0 = 0.0000000000000000e+00 +ROOT RETURN: g[0] = 1, y[0] = 0.4, y[1] = 2.0991e-12, num. orbits is now 15.00 t = 94.2478, H(p,q)-H0 = 2.7836469302933153e-06, L(p,q)-L0 = 6.2882004014941373e-07 -t = 96.0000, H(p,q)-H0 = 2.1895043000874637e-09, L(p,q)-L0 = -1.1102230246251565e-16 -ROOT RETURN: g[0] = -1, y[0] = -1.6, y[1] = -5.37004e-13, num. orbits is now 15.50 -t = 97.3894, H(p,q)-H0 = 2.1772518232765492e-09, L(p,q)-L0 = -3.4459657349827921e-11 -t = 98.0000, H(p,q)-H0 = 2.1904077440737524e-09, L(p,q)-L0 = -2.2204460492503131e-16 -t = 100.0000, H(p,q)-H0 = 1.8950301328146679e-09, L(p,q)-L0 = -2.2204460492503131e-16 +t = 96.0000, H(p,q)-H0 = 2.1895045221320686e-09, L(p,q)-L0 = 0.0000000000000000e+00 +ROOT RETURN: g[0] = -1, y[0] = -1.6, y[1] = -1.7756e-15, num. orbits is now 15.50 +t = 97.3894, H(p,q)-H0 = 2.1772523228769103e-09, L(p,q)-L0 = -3.4459213260618071e-11 +t = 98.0000, H(p,q)-H0 = 2.1904080771406598e-09, L(p,q)-L0 = 0.0000000000000000e+00 +t = 100.0000, H(p,q)-H0 = 1.8950303548592728e-09, L(p,q)-L0 = 0.0000000000000000e+00 Current time = 100 Steps = 10000 Step attempts = 10000 @@ -134,6 +134,6 @@ Inequality constraint fails = 0 Initial step size = 0.01 Last step size = 0.01 Current step size = 0.01 -Root fn evals = 10297 +Root fn evals = 10280 f1 RHS fn evals = 40031 f2 RHS fn evals = 40031 diff --git a/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_LEAPFROG_2_2_--tf_50_--check-order_--nout_1.out b/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_LEAPFROG_2_2_--tf_50_--check-order_--nout_1.out index f6270cd29f..b68cd78622 100644 --- a/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_LEAPFROG_2_2_--tf_50_--check-order_--nout_1.out +++ b/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_LEAPFROG_2_2_--tf_50_--check-order_--nout_1.out @@ -126,7 +126,7 @@ Problem Arguments: nout: 1 t = 0.0000, H(p,q) = -0.5000000000000000, L(p,q) = 0.8000000000000000 -t = 50.0000, H(p,q)-H0 = -1.6152086335097238e-09, L(p,q)-L0 = -6.2394533983933798e-14 +t = 50.0000, H(p,q)-H0 = -1.6151293635857655e-09, L(p,q)-L0 = -3.3972824553529790e-14 Current time = 50 Steps = 400001 Step attempts = 400001 diff --git a/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_MCLACHLAN_5_6_--tf_50_--check-order_--nout_1.out b/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_MCLACHLAN_5_6_--tf_50_--check-order_--nout_1.out index 78f14dd179..9249767e85 100644 --- a/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_MCLACHLAN_5_6_--tf_50_--check-order_--nout_1.out +++ b/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_MCLACHLAN_5_6_--tf_50_--check-order_--nout_1.out @@ -70,7 +70,7 @@ Problem Arguments: nout: 1 t = 0.0000, H(p,q) = -0.5000000000000000, L(p,q) = 0.8000000000000000 -t = 50.0000, H(p,q)-H0 = 1.3166233214789713e-07, L(p,q)-L0 = -1.1102230246251565e-15 +t = 50.0000, H(p,q)-H0 = 1.3166233259198634e-07, L(p,q)-L0 = -6.6613381477509392e-16 Current time = 50 Steps = 1000 Step attempts = 1000 @@ -210,7 +210,7 @@ Problem Arguments: nout: 1 t = 0.0000, H(p,q) = -0.5000000000000000, L(p,q) = 0.8000000000000000 -t = 50.0000, H(p,q)-H0 = 3.9968028886505635e-15, L(p,q)-L0 = 2.9864999362416711e-14 +t = 50.0000, H(p,q)-H0 = 1.2878587085651816e-14, L(p,q)-L0 = 1.9317880628477724e-14 Current time = 50 Steps = 32001 Step attempts = 32001 @@ -253,5 +253,5 @@ Current step size = 0.00078125 f1 RHS fn evals = 384000 f2 RHS fn evals = 384000 -Order of accuracy wrt solution: expected = 5, max = 5.9898, avg = 3.4143, overall = 3.7927 -Order of accuracy wrt Hamiltonian: expected = 5, max = 5.8607, avg = 3.9728, overall = 4.4560 +Order of accuracy wrt solution: expected = 5, max = 5.9898, avg = 3.4143, overall = 3.7912 +Order of accuracy wrt Hamiltonian: expected = 5, max = 5.8607, avg = 3.9728, overall = 4.3555 diff --git a/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_PSEUDO_LEAPFROG_2_2_--tf_50_--check-order_--nout_1.out b/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_PSEUDO_LEAPFROG_2_2_--tf_50_--check-order_--nout_1.out index 1289fd72b9..de9d86f8fc 100644 --- a/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_PSEUDO_LEAPFROG_2_2_--tf_50_--check-order_--nout_1.out +++ b/examples/arkode/C_serial/ark_kepler_--stepper_SPRK_--step-mode_fixed_--method_ARKODE_SPRK_PSEUDO_LEAPFROG_2_2_--tf_50_--check-order_--nout_1.out @@ -210,7 +210,7 @@ Problem Arguments: nout: 1 t = 0.0000, H(p,q) = -0.5000000000000000, L(p,q) = 0.8000000000000000 -t = 50.0000, H(p,q)-H0 = 7.8297457406506510e-10, L(p,q)-L0 = -9.2703622556200571e-14 +t = 50.0000, H(p,q)-H0 = 7.8271966685861116e-10, L(p,q)-L0 = -1.8152146452621309e-13 Current time = 50 Steps = 3200000 Step attempts = 3200000 diff --git a/examples/arkode/C_serial/ark_kpr_mri_9_0.001.out b/examples/arkode/C_serial/ark_kpr_mri_9_0.001.out index 8da07cba27..665cd0a588 100644 --- a/examples/arkode/C_serial/ark_kpr_mri_9_0.001.out +++ b/examples/arkode/C_serial/ark_kpr_mri_9_0.001.out @@ -14,7 +14,7 @@ Multirate nonlinear Kvaerno-Prothero-Robinson test problem: 0.100000 1.223725 1.077464 1.63e-11 6.38e-13 0.200000 1.220669 1.551800 1.60e-11 6.83e-13 0.300000 1.215594 1.467737 1.52e-11 9.61e-13 - 0.400000 1.208524 1.154583 1.51e-11 9.22e-13 + 0.400000 1.208524 1.154583 1.51e-11 9.21e-13 0.500000 1.199496 1.721908 1.60e-11 1.73e-12 0.600000 1.188557 1.023517 1.48e-11 3.43e-12 0.700000 1.175764 1.622751 1.36e-11 2.17e-12 diff --git a/examples/arkode/F2003_parallel/ark_brusselator1D_task_local_nls_f2003_--monitor_--global-nls.out b/examples/arkode/F2003_parallel/ark_brusselator1D_task_local_nls_f2003_--monitor_--global-nls.out index 87a64e82de..59d97ba67a 100644 --- a/examples/arkode/F2003_parallel/ark_brusselator1D_task_local_nls_f2003_--monitor_--global-nls.out +++ b/examples/arkode/F2003_parallel/ark_brusselator1D_task_local_nls_f2003_--monitor_--global-nls.out @@ -30,50 +30,50 @@ Integrator Options: 1.00000E+00 1.61797E+00 2.78970E+00 3.49997E+00 1.25000E+00 1.73861E+00 2.52564E+00 3.49997E+00 1.50000E+00 1.72431E+00 2.34664E+00 3.49997E+00 - 1.75000E+00 1.60933E+00 2.26740E+00 3.49997E+00 - 2.00000E+00 1.44194E+00 2.28479E+00 3.49997E+00 - 2.25000E+00 1.25455E+00 2.38711E+00 3.49998E+00 - 2.50000E+00 1.06786E+00 2.55298E+00 3.49998E+00 - 2.75000E+00 8.94914E-01 2.75580E+00 3.49999E+00 - 3.00000E+00 7.42698E-01 2.97271E+00 3.49999E+00 + 1.75000E+00 1.60933E+00 2.26740E+00 3.49998E+00 + 2.00000E+00 1.44194E+00 2.28479E+00 3.49996E+00 + 2.25000E+00 1.25455E+00 2.38711E+00 3.50011E+00 + 2.50000E+00 1.06786E+00 2.55298E+00 3.49997E+00 + 2.75000E+00 8.94914E-01 2.75580E+00 3.49998E+00 + 3.00000E+00 7.42698E-01 2.97271E+00 3.49997E+00 3.25000E+00 6.14424E-01 3.18968E+00 3.49999E+00 3.50000E+00 5.11703E-01 3.40029E+00 3.49999E+00 3.75000E+00 4.35022E-01 3.60235E+00 3.49999E+00 4.00000E+00 3.82884E-01 3.79561E+00 3.49999E+00 4.25000E+00 3.51268E-01 3.98079E+00 3.49999E+00 4.50000E+00 3.34675E-01 4.15907E+00 3.49999E+00 - 4.75000E+00 3.27999E-01 4.33168E+00 3.49999E+00 - 5.00000E+00 3.27576E-01 4.49959E+00 3.49999E+00 + 4.75000E+00 3.27999E-01 4.33168E+00 3.50000E+00 + 5.00000E+00 3.27576E-01 4.49959E+00 3.50000E+00 5.25000E+00 3.31182E-01 4.66336E+00 3.49999E+00 5.50000E+00 3.37619E-01 4.82316E+00 3.49999E+00 - 5.75000E+00 3.46346E-01 4.97885E+00 3.49999E+00 - 6.00000E+00 3.57245E-01 5.12994E+00 3.49999E+00 - 6.25000E+00 3.70526E-01 5.27566E+00 3.49999E+00 - 6.50000E+00 3.86740E-01 5.41481E+00 3.49999E+00 + 5.75000E+00 3.46346E-01 4.97885E+00 3.49975E+00 + 6.00000E+00 3.57245E-01 5.12994E+00 3.49981E+00 + 6.25000E+00 3.70526E-01 5.27566E+00 3.50000E+00 + 6.50000E+00 3.86740E-01 5.41481E+00 3.50006E+00 6.75000E+00 4.06897E-01 5.54555E+00 3.49999E+00 7.00000E+00 4.32797E-01 5.66494E+00 3.49999E+00 7.25000E+00 4.67856E-01 5.76789E+00 3.49999E+00 7.50000E+00 5.19324E-01 5.84448E+00 3.49999E+00 - 7.75000E+00 6.05996E-01 5.87157E+00 3.49999E+00 + 7.75000E+00 6.05996E-01 5.87157E+00 3.49997E+00 8.00000E+00 7.97170E-01 5.77534E+00 3.49999E+00 8.25000E+00 1.62902E+00 5.13503E+00 3.49997E+00 8.50000E+00 3.77490E+00 3.49950E+00 3.49994E+00 8.75000E+00 4.02579E+00 2.19493E+00 3.49993E+00 9.00000E+00 3.87738E+00 9.67603E-01 3.49993E+00 - 9.25000E+00 3.14890E+00 1.08723E+00 3.49995E+00 + 9.25000E+00 3.14890E+00 1.08723E+00 3.49996E+00 9.50000E+00 2.47156E+00 1.32287E+00 3.49996E+00 9.75000E+00 1.91234E+00 1.59492E+00 3.49997E+00 1.00000E+01 1.45025E+00 1.89616E+00 3.49998E+00 ----------------------------------------------------------- Final Solver Statistics (for processor 0): - Steps = 482 - Step attempts = 482 + Steps = 483 + Step attempts = 483 Error test fails = 0 NLS fails = 2 - RHS evals Fe = 1931 - RHS evals Fi = 4835 - NLS iters = 2904 - LS iters = 9286 + RHS evals Fe = 1935 + RHS evals Fi = 4845 + NLS iters = 2910 + LS iters = 9307 P setups = 9 - P solves = 12085 + P solves = 12112 diff --git a/examples/arkode/F2003_serial/ark_diurnal_kry_bp_f2003.out b/examples/arkode/F2003_serial/ark_diurnal_kry_bp_f2003.out index 68e0609dbb..90517794f0 100644 --- a/examples/arkode/F2003_serial/ark_diurnal_kry_bp_f2003.out +++ b/examples/arkode/F2003_serial/ark_diurnal_kry_bp_f2003.out @@ -1,6 +1,6 @@ - + Finished initialization, starting time steps - + t c1 (bottom left middle top right) | lnst lnst_att lh t c2 (bottom left middle top right) | lnst lnst_att lh ---------------------------------------------------------------------------------------- @@ -8,42 +8,43 @@ 4.440310E+11 7.263637E+11 3.820591E+11 1.440000E+04 1.149716E+07 1.249098E+07 1.329954E+07 2780 2784 1.022085E+01 4.473684E+11 4.862283E+11 5.178450E+11 - 2.160000E+04 2.525270E+07 7.837587E+07 3.018990E+07 3325 3329 1.467507E+01 + 2.160000E+04 2.525270E+07 7.837587E+07 3.018990E+07 3325 3329 1.467514E+01 2.824256E+11 9.233209E+11 3.419869E+11 - 2.880000E+04 1.189287E+07 2.395791E+07 1.042605E+07 3816 3820 1.467507E+01 + 2.880000E+04 1.189287E+07 2.395791E+07 1.042605E+07 3816 3820 1.467514E+01 4.627840E+11 9.345089E+11 4.054359E+11 - 3.600000E+04 2.342948E+04 2.291472E+04 2.522324E+04 4629 4633 4.334128E+00 + 3.600000E+04 2.342949E+04 2.291472E+04 2.522325E+04 4629 4633 4.333728E+00 5.651673E+11 5.527495E+11 6.084385E+11 - 4.320000E+04 1.194709E-04 5.892092E-05 -1.674879E-04 5635 5639 6.277419E+02 + 4.320000E+04 -3.718382E-05 -1.465487E-05 2.611385E-05 5635 5639 6.272609E+02 3.689222E+11 8.238330E+11 4.623703E+11 - 5.040000E+04 -8.456488E-06 -9.187620E-06 3.659273E-05 5647 5651 6.277419E+02 - 3.862510E+11 1.017897E+12 3.536889E+11 - 5.760000E+04 -1.301882E-05 -3.846503E-06 5.896852E-06 5658 5662 6.277419E+02 - 5.832932E+11 6.187928E+11 5.788981E+11 - 6.480000E+04 3.467015E-05 1.276786E-05 -3.337236E-05 5670 5674 6.277419E+02 - 4.274401E+11 6.788806E+11 5.386844E+11 - 7.200000E+04 -7.456958E-06 8.227805E-17 3.511631E-10 5681 5685 6.277419E+02 + 5.040000E+04 5.522194E-07 -9.160075E-06 4.014494E-05 5647 5651 6.272609E+02 + 3.862509E+11 1.017897E+12 3.536890E+11 + 5.760000E+04 -1.084359E-05 -3.724411E-06 1.288549E-06 5658 5662 6.272609E+02 + 5.832933E+11 6.187928E+11 5.788981E+11 + 6.480000E+04 2.972416E-05 1.471335E-05 -3.876329E-05 5670 5674 6.272609E+02 + 4.274400E+11 6.788806E+11 5.386844E+11 + 7.200000E+04 -2.141097E-16 6.301814E-17 1.652460E-15 5681 5685 6.272609E+02 3.453624E+11 1.030182E+12 3.448304E+11 - 7.920000E+04 -1.368994E-06 2.401515E-15 -7.272100E-13 5693 5697 6.277419E+02 + 7.920000E+04 2.795850E-14 6.145328E-15 1.996900E-14 5693 5697 6.272609E+02 5.450919E+11 7.330919E+11 5.109883E+11 - 8.640000E+04 8.946777E-06 2.191861E-15 1.700622E-10 5704 5708 6.277419E+02 + 8.640000E+04 4.560340E-15 2.221125E-15 1.793820E-14 5704 5708 6.272609E+02 5.090704E+11 5.755864E+11 5.984224E+11 ---------------------------------------------------------------------------------------- - + General Solver Stats: Total internal steps taken = 5704 Total internal steps attempts = 5708 Total rhs exp function call = 0 Total rhs imp function call = 59357 Total num preconditioner evals = 96 - Total num preconditioner solves = 89026 + Total num preconditioner solves = 89028 Num error test failures = 4 Num nonlinear solver iters = 30814 - Num linear solver iters = 59967 - Avg Krylov subspace dim = 1.946096E+00 + Num linear solver iters = 59966 + Avg Krylov subspace dim = 1.946063E+00 Num nonlinear solver fails = 0 Num linear solver fails = 0 main solver real/int workspace sizes = 3702 145 linear solver real/int workspace sizes = 2455 42 ARKBandPre real/int workspace sizes = 2800 622 ARKBandPre number of f evaluations = 480 + diff --git a/examples/cvode/CXX_parhyp/cv_heat2D_hypre_ls.cpp b/examples/cvode/CXX_parhyp/cv_heat2D_hypre_ls.cpp index 6a80f99acf..57b407923a 100644 --- a/examples/cvode/CXX_parhyp/cv_heat2D_hypre_ls.cpp +++ b/examples/cvode/CXX_parhyp/cv_heat2D_hypre_ls.cpp @@ -379,6 +379,13 @@ int main(int argc, char* argv[]) // SUNDIALS context sundials::Context sunctx(comm_w); + // Initialize hypre if v2.20.0 or newer +#if HYPRE_RELEASE_NUMBER >= 22000 || SUN_HYPRE_VERSION_MAJOR > 2 || \ + (SUN_HYPRE_VERSION_MAJOR == 2 && SUN_HYPRE_VERSION_MINOR >= 20) + flag = HYPRE_Init(); + if (check_flag(&flag, "HYPRE_Init", 1)) { return 1; } +#endif + // Set output process flag bool outproc = (myid == 0); @@ -559,6 +566,13 @@ int main(int argc, char* argv[]) // Clean up and return // -------------------- + // Finalize hypre if v2.20.0 or newer +#if HYPRE_RELEASE_NUMBER >= 22000 || SUN_HYPRE_VERSION_MAJOR > 2 || \ + (SUN_HYPRE_VERSION_MAJOR == 2 && SUN_HYPRE_VERSION_MINOR >= 20) + flag = HYPRE_Finalize(); + if (check_flag(&flag, "HYPRE_Finalize", 1)) { return 1; } +#endif + CVodeFree(&cvode_mem); // Free integrator memory SUNLinSolFree(LS); // Free linear solver SUNMatDestroy(A); // Free matrix diff --git a/examples/cvode/CXX_parhyp/cv_heat2D_hypre_pfmg.cpp b/examples/cvode/CXX_parhyp/cv_heat2D_hypre_pfmg.cpp index 6322b09aec..cb722ec2d9 100644 --- a/examples/cvode/CXX_parhyp/cv_heat2D_hypre_pfmg.cpp +++ b/examples/cvode/CXX_parhyp/cv_heat2D_hypre_pfmg.cpp @@ -336,6 +336,13 @@ int main(int argc, char* argv[]) // SUNDIALS context sundials::Context sunctx(comm_w); + // Initialize hypre if v2.20.0 or newer +#if HYPRE_RELEASE_NUMBER >= 22000 || SUN_HYPRE_VERSION_MAJOR > 2 || \ + (SUN_HYPRE_VERSION_MAJOR == 2 && SUN_HYPRE_VERSION_MINOR >= 20) + flag = HYPRE_Init(); + if (check_flag(&flag, "HYPRE_Init", 1)) { return 1; } +#endif + // Set output process flag bool outproc = (myid == 0); @@ -542,6 +549,13 @@ int main(int argc, char* argv[]) // Clean up and return // -------------------- + // Finalize hypre if v2.20.0 or newer +#if HYPRE_RELEASE_NUMBER >= 22000 || SUN_HYPRE_VERSION_MAJOR > 2 || \ + (SUN_HYPRE_VERSION_MAJOR == 2 && SUN_HYPRE_VERSION_MINOR >= 20) + flag = HYPRE_Finalize(); + if (check_flag(&flag, "HYPRE_Finalize", 1)) { return 1; } +#endif + CVodeFree(&cvode_mem); // Free integrator memory SUNLinSolFree(LS); // Free linear solver N_VDestroy(u); // Free vectors diff --git a/examples/cvode/CXX_serial/cv_kpr.out b/examples/cvode/CXX_serial/cv_kpr.out index bc74d07ec1..e08dd2f10a 100644 --- a/examples/cvode/CXX_serial/cv_kpr.out +++ b/examples/cvode/CXX_serial/cv_kpr.out @@ -2,32 +2,32 @@ ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00 1.127017686767897e+00 1.551821503613988e+00 7.858534767146708e-06 2.188323338225828e-05 - 2.000000000000000e+00 8.899103332792471e-01 1.154608370771088e+00 7.764608704996512e-06 2.535584849794326e-05 - 3.000000000000000e+00 7.106411292975151e-01 1.023536808224800e+00 4.969438071045218e-06 1.982273562739501e-05 - 4.000000000000000e+00 8.204838923453025e-01 1.374669642759487e+00 9.523721763993187e-06 3.778071025029028e-05 - 5.000000000000000e+00 1.068571738765126e+00 1.691858739922128e+00 6.769878529766515e-06 1.983734077248833e-05 - 6.000000000000000e+00 1.216596138753578e+00 1.677586205148419e+00 8.639506119845208e-06 3.412830354121432e-05 - 7.000000000000000e+00 1.173445555523058e+00 1.342501389353217e+00 9.947075942040584e-06 4.601728465791766e-05 - 8.000000000000000e+00 9.629437694992675e-01 1.012111079263365e+00 5.566344104868115e-06 9.141468324536106e-07 - 9.000000000000000e+00 7.378567118749449e-01 1.183847487150188e+00 1.586890923443995e-06 1.903021658944404e-05 - 1.000000000000000e+01 7.618782369340520e-01 1.577065913116525e+00 3.798201160920556e-06 1.609965484838938e-05 + 2.000000000000000e+00 8.899103332791866e-01 1.154608370768354e+00 7.764608644489357e-06 2.535584576346395e-05 + 3.000000000000000e+00 7.106410660756778e-01 1.023529279576880e+00 4.906216233724336e-06 1.229408770742069e-05 + 4.000000000000000e+00 8.204730617922310e-01 1.374621086116680e+00 1.306831307501533e-06 1.077593255716103e-05 + 5.000000000000000e+00 1.068564764620663e+00 1.691839212204075e+00 2.042659332790464e-07 3.096227194632206e-07 + 6.000000000000000e+00 1.216586539798704e+00 1.677542924381987e+00 9.594487537789576e-07 9.152462890238411e-06 + 7.000000000000000e+00 1.173434026092493e+00 1.342453786414837e+00 1.582354622442494e-06 1.585653721880576e-06 + 8.000000000000000e+00 9.629416122015924e-01 1.012142316337908e+00 3.409046429703189e-06 3.032292771099065e-05 + 9.000000000000000e+00 7.378651980553826e-01 1.183892379308912e+00 6.899289514250562e-06 2.586194213471948e-05 + 1.000000000000000e+01 7.618838841024592e-01 1.577079185839070e+00 1.848967246309563e-06 2.826932303578999e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00040955930806 -Steps = 1559 -Error test fails = 143 +Current time = 10.00136810102964 +Steps = 1577 +Error test fails = 147 NLS step fails = 0 Initial step size = 0.0001029860256095084 -Last step size = 0.006823439174537314 -Current step size = 0.006823439174537314 +Last step size = 0.006383607841908422 +Current step size = 0.006383607841908422 Last method order = 4 Current method order = 4 Stab. lim. order reductions = 0 -RHS fn evals = 2155 -NLS iters = 2152 +RHS fn evals = 2197 +NLS iters = 2194 NLS fails = 0 -NLS iters per step = 1.380372033354714 -LS setups = 266 -Jac fn evals = 28 +NLS iters per step = 1.391249207355739 +LS setups = 272 +Jac fn evals = 29 LS RHS fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.01301115241635688 +Jac evals per NLS iter = 0.01321786690975387 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/examples/cvode/C_mpimanyvector/cvDiurnal_kry_mpimanyvec.out b/examples/cvode/C_mpimanyvector/cvDiurnal_kry_mpimanyvec.out index a91a41dfe8..761d4006e9 100644 --- a/examples/cvode/C_mpimanyvector/cvDiurnal_kry_mpimanyvec.out +++ b/examples/cvode/C_mpimanyvector/cvDiurnal_kry_mpimanyvec.out @@ -17,51 +17,51 @@ t = 2.16e+04 no. steps = 289 order = 4 stepsize = 2.96e+02 At bottom left: c1, c2 = 2.665e+07 2.993e+11 At top right: c1, c2 = 2.931e+07 3.313e+11 -t = 2.88e+04 no. steps = 330 order = 4 stepsize = 1.58e+02 +t = 2.88e+04 no. steps = 330 order = 4 stepsize = 1.00e+02 At bottom left: c1, c2 = 8.702e+06 3.380e+11 At top right: c1, c2 = 9.650e+06 3.751e+11 -t = 3.60e+04 no. steps = 369 order = 5 stepsize = 1.29e+02 +t = 3.60e+04 no. steps = 371 order = 4 stepsize = 7.53e+01 At bottom left: c1, c2 = 1.404e+04 3.387e+11 At top right: c1, c2 = 1.561e+04 3.765e+11 -t = 4.32e+04 no. steps = 420 order = 5 stepsize = 5.76e+02 -At bottom left: c1, c2 = 6.108e-10 3.382e+11 -At top right: c1, c2 = 7.055e-10 3.804e+11 +t = 4.32e+04 no. steps = 442 order = 4 stepsize = 3.67e+02 +At bottom left: c1, c2 = 1.540e-09 3.382e+11 +At top right: c1, c2 = 1.086e-09 3.804e+11 -t = 5.04e+04 no. steps = 433 order = 5 stepsize = 6.48e+02 -At bottom left: c1, c2 = -3.799e-10 3.358e+11 -At top right: c1, c2 = 4.316e-10 3.864e+11 +t = 5.04e+04 no. steps = 455 order = 5 stepsize = 3.88e+02 +At bottom left: c1, c2 = -5.142e-12 3.358e+11 +At top right: c1, c2 = -1.575e-11 3.864e+11 -t = 5.76e+04 no. steps = 445 order = 5 stepsize = 3.90e+02 -At bottom left: c1, c2 = 9.462e-12 3.320e+11 -At top right: c1, c2 = -2.609e-12 3.909e+11 +t = 5.76e+04 no. steps = 469 order = 4 stepsize = 2.10e+02 +At bottom left: c1, c2 = -4.462e-07 3.320e+11 +At top right: c1, c2 = -4.738e-07 3.909e+11 -t = 6.48e+04 no. steps = 455 order = 5 stepsize = 7.79e+02 -At bottom left: c1, c2 = 6.361e-12 3.313e+11 -At top right: c1, c2 = -2.663e-11 3.963e+11 +t = 6.48e+04 no. steps = 484 order = 4 stepsize = 5.41e+02 +At bottom left: c1, c2 = 1.188e-10 3.313e+11 +At top right: c1, c2 = 4.248e-12 3.963e+11 -t = 7.20e+04 no. steps = 465 order = 5 stepsize = 7.79e+02 -At bottom left: c1, c2 = 3.382e-12 3.330e+11 -At top right: c1, c2 = 3.011e-12 4.039e+11 +t = 7.20e+04 no. steps = 498 order = 4 stepsize = 5.41e+02 +At bottom left: c1, c2 = -1.561e-11 3.330e+11 +At top right: c1, c2 = 3.527e-12 4.039e+11 -t = 7.92e+04 no. steps = 474 order = 5 stepsize = 7.79e+02 -At bottom left: c1, c2 = 3.075e-13 3.334e+11 -At top right: c1, c2 = 6.124e-13 4.120e+11 +t = 7.92e+04 no. steps = 511 order = 4 stepsize = 5.41e+02 +At bottom left: c1, c2 = 4.246e-11 3.334e+11 +At top right: c1, c2 = 4.577e-11 4.120e+11 -t = 8.64e+04 no. steps = 483 order = 5 stepsize = 7.79e+02 -At bottom left: c1, c2 = -1.232e-13 3.352e+11 -At top right: c1, c2 = -7.096e-14 4.163e+11 +t = 8.64e+04 no. steps = 524 order = 4 stepsize = 5.41e+02 +At bottom left: c1, c2 = 1.106e-10 3.352e+11 +At top right: c1, c2 = -2.106e-11 4.163e+11 Final Statistics: lenrw = 2689 leniw = 248 lenrwls = 2454 leniwls = 222 -nst = 483 -nfe = 601 nfels = 1149 -nni = 598 nli = 1149 -nsetups = 82 netf = 25 -npe = 9 nps = 1658 -ncfn = 0 ncfl = 2 +nst = 524 +nfe = 660 nfels = 1250 +nni = 657 nli = 1250 +nsetups = 92 netf = 28 +npe = 9 nps = 1801 +ncfn = 0 ncfl = 1 diff --git a/examples/cvode/F2003_serial/cv_advdiff_bnd_f2003.out b/examples/cvode/F2003_serial/cv_advdiff_bnd_f2003.out index b4fd7acec7..42d504bc9d 100644 --- a/examples/cvode/F2003_serial/cv_advdiff_bnd_f2003.out +++ b/examples/cvode/F2003_serial/cv_advdiff_bnd_f2003.out @@ -6,7 +6,7 @@ t max.norm(u) | lnst ------------------------------ - 0.00 8.954716E+01 0 + 0.00 8.954716E+01 ***** 0.10 4.132887E+00 83 0.20 1.039298E+00 113 0.30 2.980039E-01 142 diff --git a/examples/cvode/F2003_serial/cv_analytic_fp_f2003.out b/examples/cvode/F2003_serial/cv_analytic_fp_f2003.out index 37d74b40fa..b2cb071fb8 100644 --- a/examples/cvode/F2003_serial/cv_analytic_fp_f2003.out +++ b/examples/cvode/F2003_serial/cv_analytic_fp_f2003.out @@ -16,16 +16,16 @@ 1.00000E+01 1.47113E+00 General Solver Stats: - Total internal steps taken = 1817 - Total rhs function calls = 3933 + Total internal steps taken = 2065 + Total rhs function calls = 4552 Num lin solver setup calls = 0 Num error test failures = 0 Last method order = 1 Next method order = 1 First internal step size = 6.10352E-12 - Last internal step size = 3.95234E-03 - Next internal step size = 3.95234E-03 - Current internal time = 1.00010E+01 - Num nonlinear solver iters = 3930 - Num nonlinear solver fails = 614 + Last internal step size = 3.95126E-03 + Next internal step size = 1.58240E-02 + Current internal time = 1.00031E+01 + Num nonlinear solver iters = 4549 + Num nonlinear solver fails = 755 diff --git a/examples/cvode/F2003_serial/cv_diurnal_kry_bp_f2003.out b/examples/cvode/F2003_serial/cv_diurnal_kry_bp_f2003.out index 4eb0e6fa74..688422952d 100644 --- a/examples/cvode/F2003_serial/cv_diurnal_kry_bp_f2003.out +++ b/examples/cvode/F2003_serial/cv_diurnal_kry_bp_f2003.out @@ -14,19 +14,19 @@ 4.627736E+11 9.345413E+11 4.054191E+11 3.600000E+04 2.342995E+04 2.291401E+04 2.522350E+04 285 1.992953E+02 5.651797E+11 5.527335E+11 6.084463E+11 - 4.320000E+04 2.608063E-04 4.048821E-05 -4.802744E-04 336 5.653068E+02 + 4.320000E+04 2.608064E-04 4.048834E-05 -4.802745E-04 336 5.653068E+02 3.689229E+11 8.238195E+11 4.623800E+11 - 5.040000E+04 1.817289E-04 -1.516970E-06 3.755188E-04 349 5.653068E+02 + 5.040000E+04 1.817288E-04 -1.516972E-06 3.755188E-04 349 5.653068E+02 3.862522E+11 1.017917E+12 3.536680E+11 - 5.760000E+04 3.523733E-10 1.237556E-11 -3.779706E-10 362 5.653068E+02 + 5.760000E+04 3.523725E-10 1.253596E-11 -3.779776E-10 362 5.653068E+02 5.833332E+11 6.187025E+11 5.789597E+11 - 6.480000E+04 1.065643E-13 -1.378092E-13 -2.363348E-12 374 5.653068E+02 + 6.480000E+04 1.065643E-13 -4.111258E-14 -2.363348E-12 374 5.653068E+02 4.273617E+11 6.789731E+11 5.386164E+11 - 7.200000E+04 -2.565418E-14 -7.919368E-14 -2.889844E-13 387 5.653068E+02 + 7.200000E+04 -2.565418E-14 -9.575273E-16 -2.889844E-13 387 5.653068E+02 3.453809E+11 1.030257E+12 3.448164E+11 - 7.920000E+04 -7.212118E-14 1.770733E-13 1.512967E-12 400 5.653068E+02 + 7.920000E+04 -7.212118E-14 5.339836E-13 1.512967E-12 400 5.653068E+02 5.451911E+11 7.328821E+11 5.110635E+11 - 8.640000E+04 5.298797E-14 -2.802708E-14 2.918795E-13 413 5.653068E+02 + 8.640000E+04 5.298797E-14 -4.298260E-14 2.918795E-13 413 5.653068E+02 5.089882E+11 5.756321E+11 5.984473E+11 ----------------------------------------------------------------------------------- diff --git a/examples/cvode/ginkgo/cv_heat2D_ginkgo.OMP.out b/examples/cvode/ginkgo/cv_heat2D_ginkgo.OMP.out index d7dbab5971..b3d51005b2 100644 --- a/examples/cvode/ginkgo/cv_heat2D_ginkgo.OMP.out +++ b/examples/cvode/ginkgo/cv_heat2D_ginkgo.OMP.out @@ -23,26 +23,26 @@ t ||u||_rms max error ----------------------------------------------------------------------- 0.000000000000000e+00 1.273091462283007e+00 0.000000000000000e+00 - 5.000000000000000e-02 1.265953031236582e+00 5.779434651704829e-04 - 1.000000000000000e-01 1.245126468059233e+00 8.596371323619234e-04 - 1.500000000000000e-01 1.212971694671920e+00 1.027159741342043e-03 - 2.000000000000000e-01 1.173149587107013e+00 1.048316291904605e-03 - 2.500000000000000e-01 1.129971459465251e+00 7.766164878266757e-04 - 3.000000000000000e-01 1.088069232733257e+00 3.879012295047168e-04 - 3.500000000000000e-01 1.051569636593604e+00 2.299338882598700e-04 - 4.000000000000000e-01 1.023519626560000e+00 1.143503203353546e-04 - 4.500000000000000e-01 1.005966581054818e+00 3.504386739527909e-05 - 4.999999999999999e-01 9.999944352133132e-01 6.530782157398995e-05 - 5.499999999999999e-01 1.005919953930694e+00 1.083573684623751e-04 - 6.000000000000000e-01 1.023439764352228e+00 1.261608201565956e-04 - 6.500000000000000e-01 1.051474377941265e+00 4.413607713593670e-05 - 7.000000000000001e-01 1.087966646175562e+00 8.355938233250981e-05 - 7.500000000000001e-01 1.129793345784647e+00 2.407556608268191e-04 - 8.000000000000002e-01 1.172918894918144e+00 4.328061049605481e-04 - 8.500000000000002e-01 1.212839721967015e+00 6.911881401023834e-04 - 9.000000000000002e-01 1.245175023335623e+00 9.860117994393569e-04 - 9.500000000000003e-01 1.266235164300803e+00 1.302162239507298e-03 - 1.000000000000000e+00 1.273469520598684e+00 1.184360647055183e-03 + 5.000000000000000e-02 1.265953031236583e+00 5.779434651733695e-04 + 1.000000000000000e-01 1.245126468059200e+00 8.596371367310951e-04 + 1.500000000000000e-01 1.212971694644337e+00 1.027159986731085e-03 + 2.000000000000000e-01 1.173149587049374e+00 1.048316587442200e-03 + 2.500000000000000e-01 1.129971459090234e+00 7.766184896484951e-04 + 3.000000000000000e-01 1.088069234095868e+00 3.879011885818962e-04 + 3.500000000000000e-01 1.051569637595707e+00 2.299295020968817e-04 + 4.000000000000000e-01 1.023519628936071e+00 1.143420744249557e-04 + 4.500000000000000e-01 1.005966588534454e+00 3.506424150501175e-05 + 4.999999999999999e-01 9.999944391885425e-01 6.530584026864794e-05 + 5.499999999999999e-01 1.005919954217393e+00 1.083578170322230e-04 + 6.000000000000000e-01 1.023439763252210e+00 1.261630754589849e-04 + 6.500000000000000e-01 1.051474371068769e+00 4.411406485393954e-05 + 7.000000000000001e-01 1.087966638327127e+00 8.354289701761886e-05 + 7.500000000000001e-01 1.129793345365315e+00 2.407617851292176e-04 + 8.000000000000002e-01 1.172918896916807e+00 4.328196443814658e-04 + 8.500000000000002e-01 1.212839701048727e+00 6.911742323112424e-04 + 9.000000000000002e-01 1.245175023462088e+00 9.860170630831000e-04 + 9.500000000000003e-01 1.266235199813977e+00 1.302391563965610e-03 + 1.000000000000000e+00 1.273469507667277e+00 1.184379500988708e-03 ----------------------------------------------------------------------- Final integrator statistics: @@ -51,8 +51,8 @@ Steps = 41 Error test fails = 0 NLS step fails = 0 Initial step size = 0.002110117768486902 -Last step size = 0.02867848038434426 -Current step size = 0.02867848038434426 +Last step size = 0.02865120722136558 +Current step size = 0.02865120722136558 Last method order = 3 Current method order = 3 Stab. lim. order reductions = 0 @@ -74,4 +74,4 @@ Jac evals per NLS iter = 0.02040816326530612 Prec evals per NLS iter = 0 Root fn evals = 0 -Max error = 1.184360647055183e-03 +Max error = 1.184379500988708e-03 diff --git a/examples/cvode/ginkgo/cv_heat2D_ginkgo.cpp b/examples/cvode/ginkgo/cv_heat2D_ginkgo.cpp index 0d96af65fc..3d8c918bb8 100644 --- a/examples/cvode/ginkgo/cv_heat2D_ginkgo.cpp +++ b/examples/cvode/ginkgo/cv_heat2D_ginkgo.cpp @@ -117,11 +117,19 @@ int main(int argc, char* argv[]) // --------------------------------------- #if defined(USE_CUDA) +#if GKO_VERSION_MAJOR > 1 || (GKO_VERSION_MAJOR == 1 && GKO_VERSION_MINOR >= 7) + auto gko_exec{gko::CudaExecutor::create(0, gko::OmpExecutor::create())}; +#else auto gko_exec{gko::CudaExecutor::create(0, gko::OmpExecutor::create(), false, gko::allocation_mode::device)}; +#endif #elif defined(USE_HIP) +#if GKO_VERSION_MAJOR > 1 || (GKO_VERSION_MAJOR == 1 && GKO_VERSION_MINOR >= 7) + auto gko_exec{gko::HipExecutor::create(0, gko::OmpExecutor::create())}; +#else auto gko_exec{gko::HipExecutor::create(0, gko::OmpExecutor::create(), false, gko::allocation_mode::device)}; +#endif #elif defined(USE_SYCL) auto gko_exec{gko::DpcppExecutor::create(0, gko::ReferenceExecutor::create())}; #elif defined(USE_OMP) diff --git a/examples/cvode/ginkgo/cv_kpr_ginkgo.OMP.out b/examples/cvode/ginkgo/cv_kpr_ginkgo.OMP.out index 48c9b54e29..5e97148a81 100644 --- a/examples/cvode/ginkgo/cv_kpr_ginkgo.OMP.out +++ b/examples/cvode/ginkgo/cv_kpr_ginkgo.OMP.out @@ -2,40 +2,40 @@ ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00 1.127015255760251e+00 1.551834236014491e+00 5.427527120849263e-06 3.461563388551525e-05 - 2.000000000000000e+00 8.899063052159882e-01 1.154580618898990e+00 3.736545446164641e-06 2.396023600637065e-06 - 3.000000000000000e+00 7.106357897254315e-01 1.023511014117009e+00 3.701340125505936e-07 5.971372163626754e-06 - 4.000000000000000e+00 8.204730434770026e-01 1.374633204303529e+00 1.325146535946509e-06 1.342254291936129e-06 - 5.000000000000000e+00 1.068567206732827e+00 1.691859872652205e+00 2.237846230324081e-06 2.097007084955749e-05 - 6.000000000000000e+00 1.216591477076802e+00 1.677549905979624e+00 3.977829344581352e-06 2.170865254003118e-06 - 7.000000000000000e+00 1.173440398485579e+00 1.342489756549872e+00 4.790038462987312e-06 3.438448131332095e-05 - 8.000000000000000e+00 9.629422734371874e-01 1.012130360056326e+00 4.070282024759564e-06 1.836664612886452e-05 - 9.000000000000000e+00 7.378653508314323e-01 1.183912595295466e+00 7.052065563950549e-06 4.607792868904781e-05 - 1.000000000000000e+01 7.618860082744591e-01 1.577087825621668e+00 3.973139246160606e-06 5.812850294883987e-06 + 2.000000000000000e+00 8.899063052160227e-01 1.154580618899685e+00 3.736545480581555e-06 2.396022905637452e-06 + 3.000000000000000e+00 7.106357897282861e-01 1.023511014266122e+00 3.701311579451527e-07 5.971223050904584e-06 + 4.000000000000000e+00 8.204737066423865e-01 1.374645697471208e+00 6.619811520058860e-07 1.383542197141985e-05 + 5.000000000000000e+00 1.068565569299513e+00 1.691845504002911e+00 6.004129167180849e-07 6.601421555618714e-06 + 6.000000000000000e+00 1.216590434430995e+00 1.677565465618063e+00 2.935183537555730e-06 1.338877318590725e-05 + 7.000000000000000e+00 1.173442077390312e+00 1.342502650714524e+00 6.468943196447086e-06 4.727864596532072e-05 + 8.000000000000000e+00 9.629502113806588e-01 1.012158812621809e+00 1.200822549618508e-05 4.681921161231450e-05 + 9.000000000000000e+00 7.378653673097488e-01 1.183877036028049e+00 7.068543880439648e-06 1.051866127199652e-05 + 1.000000000000000e+01 7.618846538383774e-01 1.577088845530052e+00 2.618703164536385e-06 6.832758678632089e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.0065538929512 -Steps = 1561 -Error test fails = 126 -NLS step fails = 2 +Current time = 10.00589721581489 +Steps = 1540 +Error test fails = 145 +NLS step fails = 1 Initial step size = 0.0001029860256095084 -Last step size = 0.01296396850522329 -Current step size = 0.01296396850522329 +Last step size = 0.00839188185788128 +Current step size = 0.00839188185788128 Last method order = 5 Current method order = 5 Stab. lim. order reductions = 0 -RHS fn evals = 2127 -NLS iters = 2124 -NLS fails = 4 -NLS iters per step = 1.360666239590006 -LS setups = 241 -Jac fn evals = 31 +RHS fn evals = 2153 +NLS iters = 2150 +NLS fails = 2 +NLS iters per step = 1.396103896103896 +LS setups = 269 +Jac fn evals = 28 LS RHS fn evals = 0 Prec setup evals = 0 Prec solves = 0 -LS iters = 1978 +LS iters = 1996 LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 -LS iters per NLS iter = 0.931261770244821 -Jac evals per NLS iter = 0.01459510357815443 +LS iters per NLS iter = 0.9283720930232559 +Jac evals per NLS iter = 0.01302325581395349 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/examples/cvode/ginkgo/cv_kpr_ginkgo.REF.out b/examples/cvode/ginkgo/cv_kpr_ginkgo.REF.out index 0f09653946..0c2beb53b0 100644 --- a/examples/cvode/ginkgo/cv_kpr_ginkgo.REF.out +++ b/examples/cvode/ginkgo/cv_kpr_ginkgo.REF.out @@ -1,41 +1,41 @@ t u v u err v err ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 - 1.000000000000000e+00 1.127015255760460e+00 1.551834235951876e+00 5.427527329349147e-06 3.461557127049097e-05 - 2.000000000000000e+00 8.899062418025651e-01 1.154579388557133e+00 3.673132022985470e-06 3.626365457032321e-06 - 3.000000000000000e+00 7.106372003170185e-01 1.023541117584009e+00 1.040457574430498e-06 2.413209483664858e-05 - 4.000000000000000e+00 8.204792893366972e-01 1.374660701807539e+00 4.920713158718115e-06 2.883975830236807e-05 - 5.000000000000000e+00 1.068569458535815e+00 1.691842152674116e+00 4.489649217953584e-06 3.250092760476164e-06 - 6.000000000000000e+00 1.216591319830518e+00 1.677575467762750e+00 3.820583059921390e-06 2.339091787217917e-05 - 7.000000000000000e+00 1.173438706764417e+00 1.342470449257923e+00 3.098317301830633e-06 1.507718936410996e-05 - 8.000000000000000e+00 9.629406197442182e-01 1.012135520323376e+00 2.416589055531659e-06 2.352691317852873e-05 - 9.000000000000000e+00 7.378601815098237e-01 1.183877132313276e+00 1.882743955294863e-06 1.061494649823302e-05 - 1.000000000000000e+01 7.618901162607479e-01 1.577111105965819e+00 8.081125534964428e-06 2.909319444577285e-05 + 1.000000000000000e+00 1.127015255760461e+00 1.551834235951888e+00 5.427527330681414e-06 3.461557128225934e-05 + 2.000000000000000e+00 8.899062418311091e-01 1.154579389055788e+00 3.673160567041478e-06 3.625866802137168e-06 + 3.000000000000000e+00 7.106372003676831e-01 1.023541117637381e+00 1.040508239014137e-06 2.413214820862208e-05 + 4.000000000000000e+00 8.204776106355206e-01 1.374644898383895e+00 3.242011982096393e-06 1.303633465776777e-05 + 5.000000000000000e+00 1.068564489425404e+00 1.691825292483085e+00 4.794611920821978e-07 1.361009826994497e-05 + 6.000000000000000e+00 1.216589874084136e+00 1.677560264733187e+00 2.374836678420422e-06 8.187888309807434e-06 + 7.000000000000000e+00 1.173439604619271e+00 1.342482029285117e+00 3.996172155185107e-06 2.665721655881192e-05 + 8.000000000000000e+00 9.629431686313948e-01 1.012139331244370e+00 4.965476232188237e-06 2.733783417285807e-05 + 9.000000000000000e+00 7.378655717825112e-01 1.183894485535914e+00 7.273016642828090e-06 2.796816913663847e-05 + 1.000000000000000e+01 7.618861274994186e-01 1.577091661650115e+00 4.092364205732224e-06 9.648878741996825e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.0062929489372 -Steps = 1569 -Error test fails = 141 -NLS step fails = 2 +Current time = 10.00101108153275 +Steps = 1560 +Error test fails = 129 +NLS step fails = 1 Initial step size = 0.0001029860256095084 -Last step size = 0.01309369414763129 -Current step size = 0.02449709879261396 -Last method order = 5 -Current method order = 5 +Last step size = 0.00583268159666712 +Current step size = 0.00583268159666712 +Last method order = 4 +Current method order = 4 Stab. lim. order reductions = 0 -RHS fn evals = 2185 -NLS iters = 2182 -NLS fails = 4 -NLS iters per step = 1.390694710006374 -LS setups = 267 -Jac fn evals = 31 +RHS fn evals = 2131 +NLS iters = 2128 +NLS fails = 2 +NLS iters per step = 1.364102564102564 +LS setups = 242 +Jac fn evals = 29 LS RHS fn evals = 0 Prec setup evals = 0 Prec solves = 0 -LS iters = 2027 +LS iters = 1982 LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 -LS iters per NLS iter = 0.9289642529789184 -Jac evals per NLS iter = 0.01420714940421632 +LS iters per NLS iter = 0.931390977443609 +Jac evals per NLS iter = 0.01362781954887218 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/examples/cvode/parallel/cvDiurnal_kry_bbd_p.out b/examples/cvode/parallel/cvDiurnal_kry_bbd_p.out index 43405a3728..80ef50f734 100644 --- a/examples/cvode/parallel/cvDiurnal_kry_bbd_p.out +++ b/examples/cvode/parallel/cvDiurnal_kry_bbd_p.out @@ -28,43 +28,43 @@ At bottom left: c1, c2 = 1.404e+04 3.387e+11 At top right: c1, c2 = 1.561e+04 3.765e+11 t = 4.32e+04 no. steps = 368 order = 4 stepsize = 3.95e+02 -At bottom left: c1, c2 = 6.243e-08 3.382e+11 -At top right: c1, c2 = 7.021e-08 3.804e+11 +At bottom left: c1, c2 = 6.245e-08 3.382e+11 +At top right: c1, c2 = 7.023e-08 3.804e+11 t = 5.04e+04 no. steps = 388 order = 5 stepsize = 4.74e+02 -At bottom left: c1, c2 = 3.000e-07 3.358e+11 -At top right: c1, c2 = 3.306e-07 3.864e+11 +At bottom left: c1, c2 = 3.031e-07 3.358e+11 +At top right: c1, c2 = 3.340e-07 3.864e+11 -t = 5.76e+04 no. steps = 401 order = 5 stepsize = 3.61e+02 -At bottom left: c1, c2 = -1.096e-10 3.320e+11 -At top right: c1, c2 = -6.268e-11 3.909e+11 +t = 5.76e+04 no. steps = 401 order = 5 stepsize = 3.50e+02 +At bottom left: c1, c2 = 4.503e-11 3.320e+11 +At top right: c1, c2 = 1.065e-10 3.909e+11 -t = 6.48e+04 no. steps = 414 order = 5 stepsize = 6.38e+02 -At bottom left: c1, c2 = 1.186e-11 3.313e+11 -At top right: c1, c2 = 6.568e-14 3.963e+11 +t = 6.48e+04 no. steps = 418 order = 5 stepsize = 5.80e+02 +At bottom left: c1, c2 = -5.893e-09 3.313e+11 +At top right: c1, c2 = -1.672e-08 3.963e+11 -t = 7.20e+04 no. steps = 425 order = 5 stepsize = 6.38e+02 -At bottom left: c1, c2 = -7.713e-12 3.330e+11 -At top right: c1, c2 = 5.432e-13 4.039e+11 +t = 7.20e+04 no. steps = 430 order = 5 stepsize = 5.80e+02 +At bottom left: c1, c2 = -7.098e-11 3.330e+11 +At top right: c1, c2 = -2.001e-10 4.039e+11 -t = 7.92e+04 no. steps = 436 order = 5 stepsize = 6.38e+02 -At bottom left: c1, c2 = 2.525e-13 3.334e+11 -At top right: c1, c2 = -2.072e-14 4.120e+11 +t = 7.92e+04 no. steps = 443 order = 5 stepsize = 5.80e+02 +At bottom left: c1, c2 = 7.023e-13 3.334e+11 +At top right: c1, c2 = 1.967e-12 4.120e+11 -t = 8.64e+04 no. steps = 448 order = 5 stepsize = 6.38e+02 -At bottom left: c1, c2 = 4.758e-15 3.352e+11 -At top right: c1, c2 = 7.572e-17 4.163e+11 +t = 8.64e+04 no. steps = 455 order = 5 stepsize = 5.80e+02 +At bottom left: c1, c2 = 5.803e-14 3.352e+11 +At top right: c1, c2 = 1.602e-13 4.163e+11 Final Statistics: lenrw = 2689 leniw = 144 lenrwls = 2454 leniwls = 126 -nst = 448 -nfe = 580 nfels = 509 -nni = 577 nli = 509 -nsetups = 76 netf = 26 -npe = 8 nps = 1029 +nst = 455 +nfe = 596 nfels = 531 +nni = 593 nli = 531 +nsetups = 83 netf = 30 +npe = 8 nps = 1066 ncfn = 0 ncfl = 0 In CVBBDPRE: real/integer local work space sizes = 1300, 192 diff --git a/examples/cvode/parallel/cvDiurnal_kry_p.out b/examples/cvode/parallel/cvDiurnal_kry_p.out index 184735ecbd..9639084c30 100644 --- a/examples/cvode/parallel/cvDiurnal_kry_p.out +++ b/examples/cvode/parallel/cvDiurnal_kry_p.out @@ -13,51 +13,51 @@ t = 2.16e+04 no. steps = 277 order = 5 stepsize = 2.75e+02 At bottom left: c1, c2 = 2.665e+07 2.993e+11 At top right: c1, c2 = 2.931e+07 3.313e+11 -t = 2.88e+04 no. steps = 321 order = 3 stepsize = 5.19e+01 +t = 2.88e+04 no. steps = 316 order = 4 stepsize = 1.51e+02 At bottom left: c1, c2 = 8.702e+06 3.380e+11 At top right: c1, c2 = 9.650e+06 3.751e+11 -t = 3.60e+04 no. steps = 384 order = 4 stepsize = 8.70e+01 +t = 3.60e+04 no. steps = 355 order = 4 stepsize = 7.19e+01 At bottom left: c1, c2 = 1.404e+04 3.387e+11 At top right: c1, c2 = 1.561e+04 3.765e+11 -t = 4.32e+04 no. steps = 456 order = 4 stepsize = 8.77e+02 -At bottom left: c1, c2 = 1.077e-06 3.382e+11 -At top right: c1, c2 = 4.057e-07 3.804e+11 +t = 4.32e+04 no. steps = 416 order = 4 stepsize = 3.62e+02 +At bottom left: c1, c2 = -1.316e-07 3.382e+11 +At top right: c1, c2 = -1.475e-07 3.804e+11 -t = 5.04e+04 no. steps = 471 order = 4 stepsize = 3.29e+02 -At bottom left: c1, c2 = -1.176e-08 3.358e+11 -At top right: c1, c2 = -5.053e-08 3.864e+11 +t = 5.04e+04 no. steps = 430 order = 5 stepsize = 6.16e+02 +At bottom left: c1, c2 = -3.937e-07 3.358e+11 +At top right: c1, c2 = -4.373e-07 3.864e+11 -t = 5.76e+04 no. steps = 488 order = 5 stepsize = 3.95e+02 -At bottom left: c1, c2 = -9.464e-11 3.320e+11 -At top right: c1, c2 = -3.493e-10 3.909e+11 +t = 5.76e+04 no. steps = 442 order = 5 stepsize = 4.00e+02 +At bottom left: c1, c2 = -4.342e-10 3.320e+11 +At top right: c1, c2 = -4.873e-10 3.909e+11 -t = 6.48e+04 no. steps = 501 order = 5 stepsize = 6.20e+02 -At bottom left: c1, c2 = 5.057e-11 3.313e+11 -At top right: c1, c2 = 1.868e-10 3.963e+11 +t = 6.48e+04 no. steps = 453 order = 5 stepsize = 6.52e+02 +At bottom left: c1, c2 = 2.031e-10 3.313e+11 +At top right: c1, c2 = 2.236e-10 3.963e+11 -t = 7.20e+04 no. steps = 512 order = 5 stepsize = 6.20e+02 -At bottom left: c1, c2 = -4.454e-11 3.330e+11 -At top right: c1, c2 = -1.629e-10 4.039e+11 +t = 7.20e+04 no. steps = 465 order = 5 stepsize = 6.52e+02 +At bottom left: c1, c2 = -2.118e-12 3.330e+11 +At top right: c1, c2 = -2.335e-12 4.039e+11 -t = 7.92e+04 no. steps = 524 order = 5 stepsize = 6.20e+02 -At bottom left: c1, c2 = -2.189e-13 3.334e+11 -At top right: c1, c2 = -8.112e-13 4.120e+11 +t = 7.92e+04 no. steps = 476 order = 5 stepsize = 6.52e+02 +At bottom left: c1, c2 = -6.684e-14 3.334e+11 +At top right: c1, c2 = -7.358e-14 4.120e+11 -t = 8.64e+04 no. steps = 535 order = 5 stepsize = 6.20e+02 -At bottom left: c1, c2 = 1.080e-15 3.352e+11 -At top right: c1, c2 = 3.729e-15 4.163e+11 +t = 8.64e+04 no. steps = 487 order = 5 stepsize = 6.52e+02 +At bottom left: c1, c2 = -1.055e-15 3.352e+11 +At top right: c1, c2 = -1.168e-15 4.163e+11 Final Statistics: lenrw = 2689 leniw = 144 lenrwls = 2454 leniwls = 126 -nst = 535 -nfe = 687 nfels = 668 -nni = 684 nli = 668 -nsetups = 92 netf = 33 -npe = 10 nps = 1294 -ncfn = 0 ncfl = 1 +nst = 487 +nfe = 618 nfels = 623 +nni = 615 nli = 623 +nsetups = 79 netf = 26 +npe = 9 nps = 1179 +ncfn = 0 ncfl = 0 diff --git a/examples/cvode/petsc/cvAdvDiff_petsc.out b/examples/cvode/petsc/cvAdvDiff_petsc.out index 2a57756f73..f77d5079dc 100644 --- a/examples/cvode/petsc/cvAdvDiff_petsc.out +++ b/examples/cvode/petsc/cvAdvDiff_petsc.out @@ -11,9 +11,9 @@ At t = 2.00 max.norm(u) = 7.110166e-02 nst = 191 At t = 2.50 max.norm(u) = 2.026588e-02 nst = 200 At t = 3.00 max.norm(u) = 5.777465e-03 nst = 208 At t = 3.50 max.norm(u) = 1.648873e-03 nst = 215 -At t = 4.00 max.norm(u) = 4.618997e-04 nst = 222 +At t = 4.00 max.norm(u) = 4.618996e-04 nst = 222 At t = 4.50 max.norm(u) = 1.368196e-04 nst = 233 -At t = 5.00 max.norm(u) = 3.827558e-05 nst = 245 +At t = 5.00 max.norm(u) = 3.827557e-05 nst = 245 Final Statistics: diff --git a/examples/cvode/petsc/cv_petsc_ex7.out b/examples/cvode/petsc/cv_petsc_ex7.out index 77afe7dcd7..7eff31b1f7 100644 --- a/examples/cvode/petsc/cv_petsc_ex7.out +++ b/examples/cvode/petsc/cv_petsc_ex7.out @@ -4,35 +4,35 @@ timestep 0 time 0. norm 1.9391 0 SNES Function norm < 1.e-11 1 SNES Function norm < 1.e-11 timestep 1 time 2.02546e-09 norm 1.9391 - 0 SNES Function norm 3.89123e-05 - 1 SNES Function norm 1.914e-11 + 0 SNES Function norm 3.89123e-05 + 1 SNES Function norm 1.914e-11 2 SNES Function norm < 1.e-11 timestep 2 time 2.02566e-05 norm 1.93261 - 0 SNES Function norm 0.000467204 - 1 SNES Function norm 3.68438e-09 + 0 SNES Function norm 0.000467204 + 1 SNES Function norm 3.68438e-09 2 SNES Function norm < 1.e-11 timestep 3 time 9.08689e-05 norm 1.91043 - 0 SNES Function norm 0.000453649 - 1 SNES Function norm 3.32905e-09 + 0 SNES Function norm 0.000453649 + 1 SNES Function norm 3.32905e-09 2 SNES Function norm < 1.e-11 timestep 4 time 0.000161481 norm 1.88869 - 0 SNES Function norm 0.000440607 - 1 SNES Function norm 2.95853e-09 + 0 SNES Function norm 0.000440607 + 1 SNES Function norm 2.95853e-09 2 SNES Function norm < 1.e-11 timestep 5 time 0.000232093 norm 1.8674 - 0 SNES Function norm 0.000428052 - 1 SNES Function norm 2.57762e-09 + 0 SNES Function norm 0.000428052 + 1 SNES Function norm 2.57763e-09 2 SNES Function norm < 1.e-11 timestep 6 time 0.000302706 norm 1.84652 - 0 SNES Function norm 0.000415963 - 1 SNES Function norm 2.19265e-09 + 0 SNES Function norm 0.000415963 + 1 SNES Function norm 2.19265e-09 2 SNES Function norm < 1.e-11 timestep 7 time 0.000373318 norm 1.82607 - 0 SNES Function norm 0.000404318 - 1 SNES Function norm 1.81429e-09 + 0 SNES Function norm 0.000404318 + 1 SNES Function norm 1.81429e-09 2 SNES Function norm < 1.e-11 timestep 8 time 0.00044393 norm 1.80601 - 0 SNES Function norm 0.000393097 - 1 SNES Function norm 1.46241e-09 + 0 SNES Function norm 0.000393097 + 1 SNES Function norm 1.46239e-09 2 SNES Function norm < 1.e-11 timestep 9 time 0.000514542 norm 1.78634 diff --git a/examples/cvode/serial/cvAnalytic_mels.c b/examples/cvode/serial/cvAnalytic_mels.c index 9a84c380c9..b16b5dd7e3 100644 --- a/examples/cvode/serial/cvAnalytic_mels.c +++ b/examples/cvode/serial/cvAnalytic_mels.c @@ -334,8 +334,8 @@ static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, sunrealtype at /* compute solution error */ ans = atan(t); - ewt = SUN_RCONST(1.0) / (rtol * fabs(ans) + atol); - err = ewt * fabs(NV_Ith_S(y, 0) - ans); + ewt = SUN_RCONST(1.0) / (rtol * SUNRabs(ans) + atol); + err = ewt * SUNRabs(NV_Ith_S(y, 0) - ans); /* is the solution within the tolerances? */ passfail = (err < SUN_RCONST(1.0)) ? 0 : 1; diff --git a/examples/cvode/serial/cvDirectDemo_ls.c b/examples/cvode/serial/cvDirectDemo_ls.c index 82b841682d..7f4564dcf4 100644 --- a/examples/cvode/serial/cvDirectDemo_ls.c +++ b/examples/cvode/serial/cvDirectDemo_ls.c @@ -252,7 +252,7 @@ static int Problem1(void) } if (iout % 2 == 0) { - er = fabs(NV_Ith_S(y, 0)) / abstol; + er = SUNRabs(NV_Ith_S(y, 0)) / abstol; if (er > ero) { ero = er; } if (er > P1_TOL_FACTOR) { @@ -320,7 +320,7 @@ static int Problem1(void) } if (iout % 2 == 0) { - er = fabs(NV_Ith_S(y, 0)) / abstol; + er = SUNRabs(NV_Ith_S(y, 0)) / abstol; if (er > ero) { ero = er; } if (er > P1_TOL_FACTOR) { @@ -701,7 +701,7 @@ static sunrealtype MaxError(N_Vector y, sunrealtype t) { k = i + j * P2_MESHX; yt = pow(t, i + j) * ex * ifact_inv * jfact_inv; - er = fabs(ydata[k] - yt); + er = SUNRabs(ydata[k] - yt); if (er > maxError) { maxError = er; } ifact_inv /= (i + 1); } diff --git a/examples/cvode/serial/cvDiurnal_kry.out b/examples/cvode/serial/cvDiurnal_kry.out index 5cb024040e..3db1024d7c 100644 --- a/examples/cvode/serial/cvDiurnal_kry.out +++ b/examples/cvode/serial/cvDiurnal_kry.out @@ -22,31 +22,31 @@ c1 (bot.left/middle/top rt.) = 1.404e+04 2.029e+04 1.561e+04 c2 (bot.left/middle/top rt.) = 3.387e+11 4.894e+11 3.765e+11 t = 4.32e+04 no. steps = 393 order = 4 stepsize = 2.57e+02 -c1 (bot.left/middle/top rt.) = -7.891e-06 -1.123e-06 -8.723e-06 +c1 (bot.left/middle/top rt.) = -7.924e-06 -1.148e-06 -8.759e-06 c2 (bot.left/middle/top rt.) = 3.382e+11 1.355e+11 3.804e+11 t = 5.04e+04 no. steps = 421 order = 5 stepsize = 4.96e+02 -c1 (bot.left/middle/top rt.) = -1.595e-08 -1.771e-06 -3.117e-08 +c1 (bot.left/middle/top rt.) = -1.599e-08 -1.775e-06 -3.124e-08 c2 (bot.left/middle/top rt.) = 3.358e+11 4.930e+11 3.864e+11 -t = 5.76e+04 no. steps = 439 order = 4 stepsize = 1.19e+02 -c1 (bot.left/middle/top rt.) = -2.127e-06 -1.513e-04 -2.951e-06 +t = 5.76e+04 no. steps = 437 order = 5 stepsize = 2.10e+02 +c1 (bot.left/middle/top rt.) = -1.239e-08 -8.964e-07 -1.736e-08 c2 (bot.left/middle/top rt.) = 3.320e+11 9.650e+11 3.909e+11 -t = 6.48e+04 no. steps = 458 order = 5 stepsize = 6.60e+02 -c1 (bot.left/middle/top rt.) = -1.084e-09 -7.686e-08 -1.499e-09 +t = 6.48e+04 no. steps = 464 order = 5 stepsize = 7.69e+02 +c1 (bot.left/middle/top rt.) = 4.297e-11 2.962e-09 5.854e-11 c2 (bot.left/middle/top rt.) = 3.313e+11 8.922e+11 3.963e+11 -t = 7.20e+04 no. steps = 469 order = 5 stepsize = 6.60e+02 -c1 (bot.left/middle/top rt.) = -1.093e-10 -7.736e-09 -1.510e-10 +t = 7.20e+04 no. steps = 473 order = 5 stepsize = 7.69e+02 +c1 (bot.left/middle/top rt.) = 1.150e-11 7.919e-10 1.566e-11 c2 (bot.left/middle/top rt.) = 3.330e+11 6.186e+11 4.039e+11 -t = 7.92e+04 no. steps = 480 order = 5 stepsize = 6.60e+02 -c1 (bot.left/middle/top rt.) = -1.624e-12 -1.151e-10 -2.246e-12 +t = 7.92e+04 no. steps = 483 order = 5 stepsize = 7.69e+02 +c1 (bot.left/middle/top rt.) = -4.188e-13 -2.884e-11 -5.703e-13 c2 (bot.left/middle/top rt.) = 3.334e+11 6.669e+11 4.120e+11 -t = 8.64e+04 no. steps = 491 order = 5 stepsize = 6.60e+02 -c1 (bot.left/middle/top rt.) = 3.501e-14 2.474e-12 4.816e-14 +t = 8.64e+04 no. steps = 492 order = 5 stepsize = 7.69e+02 +c1 (bot.left/middle/top rt.) = -3.268e-14 -2.246e-12 -4.447e-14 c2 (bot.left/middle/top rt.) = 3.352e+11 9.107e+11 4.163e+11 @@ -54,10 +54,10 @@ Final Statistics.. lenrw = 2689 leniw = 53 lenrwLS = 2454 leniwLS = 42 -nst = 491 -nfe = 630 nfeLS = 0 -nni = 627 nli = 643 -nsetups = 82 netf = 29 -npe = 9 nps = 1214 +nst = 492 +nfe = 637 nfeLS = 0 +nni = 634 nli = 649 +nsetups = 88 netf = 32 +npe = 9 nps = 1223 ncfn = 0 ncfl = 0 diff --git a/examples/cvode/serial/cvDiurnal_kry_bp.out b/examples/cvode/serial/cvDiurnal_kry_bp.out index 715f28bf22..06b0c57bcd 100644 --- a/examples/cvode/serial/cvDiurnal_kry_bp.out +++ b/examples/cvode/serial/cvDiurnal_kry_bp.out @@ -26,32 +26,32 @@ c1 (bot.left/middle/top rt.) = 1.404e+04 2.029e+04 1.561e+04 c2 (bot.left/middle/top rt.) = 3.387e+11 4.894e+11 3.765e+11 t = 4.32e+04 no. steps = 402 order = 4 stepsize = 4.48e+02 -c1 (bot.left/middle/top rt.) = 1.915e-07 -6.130e-06 4.395e-07 +c1 (bot.left/middle/top rt.) = 1.929e-07 -6.029e-06 4.403e-07 c2 (bot.left/middle/top rt.) = 3.382e+11 1.355e+11 3.804e+11 -t = 5.04e+04 no. steps = 422 order = 4 stepsize = 3.17e+02 -c1 (bot.left/middle/top rt.) = -7.746e-11 -3.073e-08 -3.512e-11 +t = 5.04e+04 no. steps = 421 order = 4 stepsize = 3.30e+02 +c1 (bot.left/middle/top rt.) = 1.559e-09 6.319e-07 6.062e-10 c2 (bot.left/middle/top rt.) = 3.358e+11 4.930e+11 3.864e+11 -t = 5.76e+04 no. steps = 436 order = 5 stepsize = 3.58e+02 -c1 (bot.left/middle/top rt.) = 1.801e-11 7.177e-09 8.588e-12 +t = 5.76e+04 no. steps = 435 order = 5 stepsize = 4.67e+02 +c1 (bot.left/middle/top rt.) = -2.660e-12 -1.080e-09 -1.030e-12 c2 (bot.left/middle/top rt.) = 3.320e+11 9.650e+11 3.909e+11 -t = 6.48e+04 no. steps = 449 order = 5 stepsize = 5.95e+02 -c1 (bot.left/middle/top rt.) = -2.845e-14 -1.063e-11 -1.382e-14 +t = 6.48e+04 no. steps = 447 order = 5 stepsize = 7.06e+02 +c1 (bot.left/middle/top rt.) = -7.375e-15 -2.742e-12 -2.920e-15 c2 (bot.left/middle/top rt.) = 3.313e+11 8.922e+11 3.963e+11 -t = 7.20e+04 no. steps = 461 order = 5 stepsize = 5.95e+02 -c1 (bot.left/middle/top rt.) = 2.710e-16 1.011e-13 1.307e-16 +t = 7.20e+04 no. steps = 457 order = 5 stepsize = 7.06e+02 +c1 (bot.left/middle/top rt.) = -1.202e-17 -4.105e-15 -5.445e-18 c2 (bot.left/middle/top rt.) = 3.330e+11 6.186e+11 4.039e+11 -t = 7.92e+04 no. steps = 473 order = 5 stepsize = 5.95e+02 -c1 (bot.left/middle/top rt.) = 5.698e-16 2.058e-13 2.690e-16 +t = 7.92e+04 no. steps = 467 order = 5 stepsize = 7.06e+02 +c1 (bot.left/middle/top rt.) = -8.193e-21 -1.461e-15 -7.837e-19 c2 (bot.left/middle/top rt.) = 3.334e+11 6.669e+11 4.120e+11 -t = 8.64e+04 no. steps = 485 order = 5 stepsize = 5.95e+02 -c1 (bot.left/middle/top rt.) = 2.707e-16 1.899e-17 2.156e-15 -c2 (bot.left/middle/top rt.) = 3.352e+11 9.106e+11 4.163e+11 +t = 8.64e+04 no. steps = 477 order = 5 stepsize = 7.06e+02 +c1 (bot.left/middle/top rt.) = -7.290e-20 -3.730e-15 -4.364e-20 +c2 (bot.left/middle/top rt.) = 3.352e+11 9.106e+11 4.162e+11 Final Statistics.. @@ -59,12 +59,12 @@ Final Statistics.. lenrw = 2689 leniw = 53 lenrwls = 2454 leniwls = 42 lenrwbp = 2800 leniwbp = 622 -nst = 485 -nfe = 616 nfetot = 1258 -nfeLS = 597 nfeBP = 45 -nni = 613 nli = 597 +nst = 477 +nfe = 613 nfetot = 1267 +nfeLS = 614 nfeBP = 40 +nni = 610 nli = 614 nsetups = 85 netf = 28 -npe = 9 nps = 1134 +npe = 8 nps = 1142 ncfn = 0 ncfl = 0 diff --git a/examples/cvode/serial/cvKrylovDemo_prec.c b/examples/cvode/serial/cvKrylovDemo_prec.c index c3c886f6d3..da68763269 100644 --- a/examples/cvode/serial/cvKrylovDemo_prec.c +++ b/examples/cvode/serial/cvKrylovDemo_prec.c @@ -847,7 +847,7 @@ static int Precond(sunrealtype t, N_Vector c, N_Vector fc, sunbooleantype jok, f1 = N_VGetArrayPointer(wdata->tmp); fac = N_VWrmsNorm(fc, rewt); - r0 = SUN_RCONST(1000.0) * fabs(gamma) * uround * NEQ * fac; + r0 = SUN_RCONST(1000.0) * SUNRabs(gamma) * uround * NEQ * fac; if (r0 == ZERO) { r0 = ONE; } for (igy = 0; igy < ngy; igy++) @@ -865,7 +865,7 @@ static int Precond(sunrealtype t, N_Vector c, N_Vector fc, sunbooleantype jok, /* Generate the jth column as a difference quotient */ jj = if0 + j; save = cdata[jj]; - r = MAX(srur * fabs(save), r0 / rewtdata[jj]); + r = MAX(srur * SUNRabs(save), r0 / rewtdata[jj]); cdata[jj] += r; fac = -gamma / r; fblock(t, cdata, jx, jy, f1, wdata); diff --git a/examples/cvode/serial/cvParticle_dns.out b/examples/cvode/serial/cvParticle_dns.out index 15517a2bd3..0901a32138 100644 --- a/examples/cvode/serial/cvParticle_dns.out +++ b/examples/cvode/serial/cvParticle_dns.out @@ -14,13 +14,13 @@ tstop = 0 t x y err x err y err constr 0.0000e+00 1.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -6.2832e+02 9.977240e-01 6.742947e-02 -2.275957e-03 6.742947e-02 2.220446e-16 +6.2832e+02 9.979545e-01 6.392827e-02 -2.045504e-03 6.392827e-02 0.000000e+00 Integration Statistics: -Number of steps taken = 4044 -Number of function evaluations = 5831 -Number of linear solver setups = 806 -Number of Jacobian evaluations = 103 -Number of nonlinear solver iterations = 5828 -Number of convergence failures = 40 -Number of error test failures = 329 +Number of steps taken = 4131 +Number of function evaluations = 6030 +Number of linear solver setups = 862 +Number of Jacobian evaluations = 115 +Number of nonlinear solver iterations = 6027 +Number of convergence failures = 52 +Number of error test failures = 343 diff --git a/examples/cvode/superludist/cvAdvDiff_sludist_64.out b/examples/cvode/superludist/cvAdvDiff_sludist_64.out index 952fa6165b..3b78452b29 100644 --- a/examples/cvode/superludist/cvAdvDiff_sludist_64.out +++ b/examples/cvode/superludist/cvAdvDiff_sludist_64.out @@ -7,15 +7,15 @@ At t = 0.00 max.norm(u) = 1.569909e+01 nst = 0 At t = 0.50 max.norm(u) = 3.052882e+00 nst = 87 At t = 1.00 max.norm(u) = 8.753282e-01 nst = 111 At t = 1.50 max.norm(u) = 2.494975e-01 nst = 127 -At t = 2.00 max.norm(u) = 7.110209e-02 nst = 140 -At t = 2.50 max.norm(u) = 2.026483e-02 nst = 152 -At t = 3.00 max.norm(u) = 5.779707e-03 nst = 160 -At t = 3.50 max.norm(u) = 1.647758e-03 nst = 169 -At t = 4.00 max.norm(u) = 4.804265e-04 nst = 177 -At t = 4.50 max.norm(u) = 1.379288e-04 nst = 190 -At t = 5.00 max.norm(u) = 3.850547e-05 nst = 201 +At t = 2.00 max.norm(u) = 7.110208e-02 nst = 140 +At t = 2.50 max.norm(u) = 2.025919e-02 nst = 152 +At t = 3.00 max.norm(u) = 5.773399e-03 nst = 164 +At t = 3.50 max.norm(u) = 1.643311e-03 nst = 171 +At t = 4.00 max.norm(u) = 4.687907e-04 nst = 175 +At t = 4.50 max.norm(u) = 1.389315e-04 nst = 178 +At t = 5.00 max.norm(u) = 4.703179e-05 nst = 183 Final Statistics: -nst = 201 nfe = 285 nni = 282 ncfn = 0 netf = 17 +nst = 183 nfe = 259 nni = 256 ncfn = 0 netf = 15 diff --git a/examples/cvodes/F2003_serial/cvs_analytic_fp_f2003.out b/examples/cvodes/F2003_serial/cvs_analytic_fp_f2003.out index 37d74b40fa..b2cb071fb8 100644 --- a/examples/cvodes/F2003_serial/cvs_analytic_fp_f2003.out +++ b/examples/cvodes/F2003_serial/cvs_analytic_fp_f2003.out @@ -16,16 +16,16 @@ 1.00000E+01 1.47113E+00 General Solver Stats: - Total internal steps taken = 1817 - Total rhs function calls = 3933 + Total internal steps taken = 2065 + Total rhs function calls = 4552 Num lin solver setup calls = 0 Num error test failures = 0 Last method order = 1 Next method order = 1 First internal step size = 6.10352E-12 - Last internal step size = 3.95234E-03 - Next internal step size = 3.95234E-03 - Current internal time = 1.00010E+01 - Num nonlinear solver iters = 3930 - Num nonlinear solver fails = 614 + Last internal step size = 3.95126E-03 + Next internal step size = 1.58240E-02 + Current internal time = 1.00031E+01 + Num nonlinear solver iters = 4549 + Num nonlinear solver fails = 755 diff --git a/examples/cvodes/parallel/cvsDiurnal_FSA_kry_p_-sensi_sim_t.out b/examples/cvodes/parallel/cvsDiurnal_FSA_kry_p_-sensi_sim_t.out index f75c143a94..41a2300a7b 100644 --- a/examples/cvodes/parallel/cvsDiurnal_FSA_kry_p_-sensi_sim_t.out +++ b/examples/cvodes/parallel/cvsDiurnal_FSA_kry_p_-sensi_sim_t.out @@ -15,7 +15,7 @@ Sensitivity: YES ( SIMULTANEOUS + FULL ERROR CONTROL ) Sensitivity 2 -4.3853e+14 -5.0065e+14 -2.4407e+18 -2.7843e+18 ------------------------------------------------------------------------ -1.440e+04 3 5.071e+01 862 +1.440e+04 3 1.064e+02 612 Solution 6.6590e+06 7.3008e+06 2.5819e+11 2.8329e+11 ---------------------------------------- @@ -25,7 +25,7 @@ Sensitivity: YES ( SIMULTANEOUS + FULL ERROR CONTROL ) Sensitivity 2 -4.5235e+17 -5.4318e+17 -6.5418e+21 -7.8315e+21 ------------------------------------------------------------------------ -2.160e+04 3 5.422e+01 1115 +2.160e+04 3 7.174e+01 890 Solution 2.6650e+07 2.9308e+07 2.9928e+11 3.3134e+11 ---------------------------------------- @@ -35,8 +35,8 @@ Sensitivity: YES ( SIMULTANEOUS + FULL ERROR CONTROL ) Sensitivity 2 -7.6601e+18 -9.4433e+18 -7.6459e+22 -9.4501e+22 ------------------------------------------------------------------------ -2.880e+04 3 4.027e+01 1446 - Solution 8.7021e+06 9.6501e+06 +2.880e+04 3 6.438e+01 1123 + Solution 8.7021e+06 9.6500e+06 3.3804e+11 3.7510e+11 ---------------------------------------- Sensitivity 1 -5.3375e+22 -5.9187e+22 @@ -45,95 +45,95 @@ Sensitivity: YES ( SIMULTANEOUS + FULL ERROR CONTROL ) Sensitivity 2 -4.8855e+18 -6.1040e+18 -1.7194e+23 -2.1518e+23 ------------------------------------------------------------------------ -3.600e+04 4 6.446e+01 1550 +3.600e+04 4 3.134e+01 1265 Solution 1.4040e+04 1.5609e+04 3.3868e+11 3.7652e+11 ---------------------------------------- - Sensitivity 1 -8.6141e+19 -9.5762e+19 + Sensitivity 1 -8.6141e+19 -9.5761e+19 5.2718e+23 6.6030e+23 ---------------------------------------- Sensitivity 2 -8.4328e+15 -1.0549e+16 -1.8439e+23 -2.3096e+23 ------------------------------------------------------------------------ -4.320e+04 4 1.552e+02 1802 - Solution -6.7943e-09 -1.7531e-08 +4.320e+04 4 2.857e+02 1891 + Solution -3.3615e-10 -3.9530e-10 3.3823e+11 3.8035e+11 ---------------------------------------- - Sensitivity 1 1.5377e+08 -1.8226e+09 + Sensitivity 1 7.3630e+08 8.0958e+08 5.2753e+23 6.7448e+23 ---------------------------------------- - Sensitivity 2 4.9296e+03 -1.7707e+04 + Sensitivity 2 2.1809e+05 1.1760e+05 -1.8454e+23 -2.3595e+23 ------------------------------------------------------------------------ -5.040e+04 4 1.552e+02 1848 - Solution -3.3333e-09 -1.0074e-08 +5.040e+04 5 3.151e+02 1962 + Solution -8.0116e-11 -2.5727e-10 3.3582e+11 3.8645e+11 ---------------------------------------- - Sensitivity 1 7.6593e+08 2.3212e+09 - 5.2067e+23 6.9664e+23 + Sensitivity 1 3.5267e+07 1.1344e+08 + 5.2066e+23 6.9664e+23 ---------------------------------------- - Sensitivity 2 3.2953e+07 1.2254e+08 + Sensitivity 2 8.5297e+02 3.2356e+03 -1.8214e+23 -2.4370e+23 ------------------------------------------------------------------------ -5.760e+04 5 2.333e+02 1871 - Solution -8.0165e-13 -2.6806e-12 +5.760e+04 5 4.748e+02 1978 + Solution -9.9136e-10 -3.1770e-09 3.3203e+11 3.9090e+11 ---------------------------------------- - Sensitivity 1 -1.3115e+05 -4.2823e+05 + Sensitivity 1 -1.1351e+08 -3.5554e+08 5.0825e+23 7.1205e+23 ---------------------------------------- - Sensitivity 2 6.8742e+01 1.6059e+02 + Sensitivity 2 -7.2327e+02 -2.6860e+03 -1.7780e+23 -2.4910e+23 ------------------------------------------------------------------------ -6.480e+04 5 2.801e+02 1893 - Solution -2.8173e-08 -9.8429e-08 +6.480e+04 3 1.695e+02 2091 + Solution 2.2622e-12 5.4339e-13 3.3130e+11 3.9634e+11 ---------------------------------------- - Sensitivity 1 2.2918e+09 7.9585e+09 + Sensitivity 1 2.6502e+07 7.2017e+06 5.0442e+23 7.3274e+23 ---------------------------------------- - Sensitivity 2 7.1238e+05 2.7790e+06 + Sensitivity 2 1.3184e+06 1.8801e+06 -1.7646e+23 -2.5633e+23 ------------------------------------------------------------------------ -7.200e+04 4 1.003e+02 2580 - Solution -1.1403e-08 -6.9110e-08 +7.200e+04 4 3.017e+02 2123 + Solution -1.3609e-12 -5.8149e-13 3.3297e+11 4.0389e+11 ---------------------------------------- - Sensitivity 1 6.8126e+08 4.1340e+09 + Sensitivity 1 -3.3229e+06 -1.2125e+06 5.0783e+23 7.6382e+23 ---------------------------------------- - Sensitivity 2 -3.8340e+07 -2.6839e+08 + Sensitivity 2 -4.3073e+03 -6.2477e+03 -1.7765e+23 -2.6721e+23 ------------------------------------------------------------------------ -7.920e+04 4 4.453e+02 2608 - Solution 4.8775e-18 2.7563e-17 +7.920e+04 5 5.440e+02 2140 + Solution 7.8343e-11 1.5542e-11 3.3344e+11 4.1203e+11 ---------------------------------------- - Sensitivity 1 1.2984e+02 7.7701e+02 + Sensitivity 1 3.3505e+06 6.6024e+05 5.0730e+23 7.9960e+23 ---------------------------------------- - Sensitivity 2 -4.4037e-01 -3.1248e+00 + Sensitivity 2 2.3901e+01 -2.0257e+00 -1.7747e+23 -2.7972e+23 ------------------------------------------------------------------------ -8.640e+04 5 7.396e+02 2619 - Solution -2.5590e-20 -1.5317e-19 +8.640e+04 5 5.440e+02 2153 + Solution 3.1822e-13 3.6061e-14 3.3518e+11 4.1625e+11 ---------------------------------------- - Sensitivity 1 1.6342e+00 9.8016e+00 + Sensitivity 1 6.2294e+05 1.8989e+05 5.1171e+23 8.2142e+23 ---------------------------------------- - Sensitivity 2 -5.6895e-03 -4.0306e-02 + Sensitivity 2 5.8847e+00 2.9717e+00 -1.7901e+23 -2.8736e+23 ------------------------------------------------------------------------ Final Statistics -nst = 2619 +nst = 2153 -nfe = 3582 -netf = 150 nsetups = 436 -nni = 3580 ncfn = 12 +nfe = 3024 +netf = 130 nsetups = 383 +nni = 3020 ncfn = 8 -nfSe = 7164 nfeS = 14328 +nfSe = 6048 nfeS = 12096 netfs = 0 nsetupsS = 0 nniS = 0 ncfnS = 0 diff --git a/examples/cvodes/parallel/cvsDiurnal_FSA_kry_p_-sensi_stg_t.out b/examples/cvodes/parallel/cvsDiurnal_FSA_kry_p_-sensi_stg_t.out index e18e1f5274..436d47edd6 100644 --- a/examples/cvodes/parallel/cvsDiurnal_FSA_kry_p_-sensi_stg_t.out +++ b/examples/cvodes/parallel/cvsDiurnal_FSA_kry_p_-sensi_stg_t.out @@ -5,7 +5,7 @@ Sensitivity: YES ( STAGGERED + FULL ERROR CONTROL ) ======================================================================== T Q H NST Bottom left Top right ======================================================================== -7.200e+03 4 3.759e+01 457 +7.200e+03 4 6.240e+01 456 Solution 1.0468e+04 1.1185e+04 2.5267e+11 2.6998e+11 ---------------------------------------- @@ -15,7 +15,7 @@ Sensitivity: YES ( STAGGERED + FULL ERROR CONTROL ) Sensitivity 2 -4.3853e+14 -5.0065e+14 -2.4408e+18 -2.7843e+18 ------------------------------------------------------------------------ -1.440e+04 5 1.700e+02 504 +1.440e+04 4 1.666e+02 521 Solution 6.6590e+06 7.3008e+06 2.5819e+11 2.8329e+11 ---------------------------------------- @@ -25,7 +25,7 @@ Sensitivity: YES ( STAGGERED + FULL ERROR CONTROL ) Sensitivity 2 -4.5235e+17 -5.4317e+17 -6.5418e+21 -7.8315e+21 ------------------------------------------------------------------------ -2.160e+04 5 1.741e+02 533 +2.160e+04 4 1.992e+02 606 Solution 2.6650e+07 2.9308e+07 2.9928e+11 3.3134e+11 ---------------------------------------- @@ -33,10 +33,10 @@ Sensitivity: YES ( STAGGERED + FULL ERROR CONTROL ) 3.8203e+23 4.4991e+23 ---------------------------------------- Sensitivity 2 -7.6601e+18 -9.4433e+18 - -7.6459e+22 -9.4502e+22 + -7.6459e+22 -9.4501e+22 ------------------------------------------------------------------------ -2.880e+04 3 7.386e+01 591 - Solution 8.7021e+06 9.6501e+06 +2.880e+04 3 1.091e+02 673 + Solution 8.7021e+06 9.6500e+06 3.3804e+11 3.7510e+11 ---------------------------------------- Sensitivity 1 -5.3375e+22 -5.9187e+22 @@ -45,7 +45,7 @@ Sensitivity: YES ( STAGGERED + FULL ERROR CONTROL ) Sensitivity 2 -4.8855e+18 -6.1040e+18 -1.7194e+23 -2.1518e+23 ------------------------------------------------------------------------ -3.600e+04 4 6.747e+01 640 +3.600e+04 4 8.486e+01 726 Solution 1.4040e+04 1.5609e+04 3.3868e+11 3.7652e+11 ---------------------------------------- @@ -55,85 +55,85 @@ Sensitivity: YES ( STAGGERED + FULL ERROR CONTROL ) Sensitivity 2 -8.4328e+15 -1.0549e+16 -1.8439e+23 -2.3096e+23 ------------------------------------------------------------------------ -4.320e+04 4 5.501e+01 711 - Solution -3.4085e-05 -3.8038e-05 +4.320e+04 5 2.007e+02 799 + Solution -3.2053e-07 -8.2067e-08 3.3823e+11 3.8035e+11 ---------------------------------------- - Sensitivity 1 2.0457e+11 2.2833e+11 + Sensitivity 1 2.5041e+09 1.1068e+09 5.2753e+23 6.7448e+23 ---------------------------------------- - Sensitivity 2 -3.7432e+07 -4.4338e+07 + Sensitivity 2 -2.7306e+08 -3.2516e+08 -1.8454e+23 -2.3595e+23 ------------------------------------------------------------------------ -5.040e+04 4 3.193e+02 749 - Solution 4.9786e-09 1.8755e-08 +5.040e+04 4 3.505e+02 834 + Solution -3.8285e-06 -4.1822e-06 3.3582e+11 3.8645e+11 ---------------------------------------- - Sensitivity 1 -5.9351e+05 -1.4673e+06 + Sensitivity 1 1.6643e+10 1.8174e+10 5.2067e+23 6.9664e+23 ---------------------------------------- - Sensitivity 2 -5.0185e+03 -7.2241e+03 + Sensitivity 2 4.0895e+10 4.6693e+10 -1.8214e+23 -2.4371e+23 ------------------------------------------------------------------------ -5.760e+04 5 3.685e+02 765 - Solution 3.6528e-09 1.3449e-08 +5.760e+04 5 3.805e+02 851 + Solution -3.3001e-09 -3.6176e-09 3.3203e+11 3.9090e+11 ---------------------------------------- - Sensitivity 1 -1.3328e+07 -4.9088e+07 - 5.0825e+23 7.1206e+23 + Sensitivity 1 -8.4985e+07 -9.3979e+07 + 5.0825e+23 7.1205e+23 ---------------------------------------- - Sensitivity 2 -1.2606e+02 -5.3214e+02 + Sensitivity 2 2.0322e+07 2.4170e+07 -1.7780e+23 -2.4910e+23 ------------------------------------------------------------------------ -6.480e+04 5 4.028e+02 787 - Solution -2.6095e-08 -1.2673e-07 +6.480e+04 5 3.938e+02 872 + Solution 1.1051e-06 1.2213e-06 3.3130e+11 3.9634e+11 ---------------------------------------- - Sensitivity 1 -4.5250e+08 -1.4629e+09 + Sensitivity 1 7.1018e+10 7.8084e+10 5.0442e+23 7.3274e+23 ---------------------------------------- - Sensitivity 2 1.2621e+08 5.4709e+08 + Sensitivity 2 -4.9939e+06 -5.8955e+06 -1.7646e+23 -2.5633e+23 ------------------------------------------------------------------------ -7.200e+04 5 4.028e+02 805 - Solution 1.3468e-08 7.3586e-08 +7.200e+04 5 3.938e+02 890 + Solution -4.0822e-06 -4.3014e-06 3.3297e+11 4.0389e+11 ---------------------------------------- - Sensitivity 1 -1.8639e+08 -9.6848e+08 + Sensitivity 1 3.7438e+10 3.9806e+10 5.0783e+23 7.6382e+23 ---------------------------------------- - Sensitivity 2 4.8773e+07 2.1183e+08 + Sensitivity 2 -2.8120e+07 -3.3371e+07 -1.7765e+23 -2.6721e+23 ------------------------------------------------------------------------ -7.920e+04 5 6.063e+02 818 - Solution 3.2625e-11 7.7753e-11 +7.920e+04 5 6.446e+02 905 + Solution -5.9523e-06 -6.1213e-06 3.3344e+11 4.1203e+11 ---------------------------------------- - Sensitivity 1 -7.3331e+05 -1.7444e+06 - 5.0731e+23 7.9960e+23 + Sensitivity 1 7.5332e+10 7.7483e+10 + 5.0730e+23 7.9960e+23 ---------------------------------------- - Sensitivity 2 9.4023e+04 4.0719e+05 + Sensitivity 2 7.4326e+05 9.4687e+05 -1.7747e+23 -2.7972e+23 ------------------------------------------------------------------------ -8.640e+04 5 6.063e+02 830 - Solution 4.0699e-13 1.0930e-12 +8.640e+04 5 6.446e+02 916 + Solution -1.2279e-07 -1.2697e-07 3.3518e+11 4.1625e+11 ---------------------------------------- - Sensitivity 1 -7.8747e+04 -1.7295e+05 + Sensitivity 1 3.2765e+09 3.3795e+09 5.1171e+23 8.2142e+23 ---------------------------------------- - Sensitivity 2 -2.8540e+02 -1.2871e+03 + Sensitivity 2 3.1113e+04 4.0059e+04 -1.7901e+23 -2.8736e+23 ------------------------------------------------------------------------ Final Statistics -nst = 830 +nst = 916 -nfe = 1789 -netf = 12 nsetups = 115 -nni = 937 ncfn = 0 +nfe = 1986 +netf = 12 nsetups = 134 +nni = 1039 ncfn = 0 -nfSe = 1938 nfeS = 3876 -netfs = 20 nsetupsS = 0 -nniS = 967 ncfnS = 0 +nfSe = 2198 nfeS = 4396 +netfs = 29 nsetupsS = 0 +nniS = 1097 ncfnS = 0 diff --git a/examples/cvodes/parallel/cvsDiurnal_kry_bbd_p.out b/examples/cvodes/parallel/cvsDiurnal_kry_bbd_p.out index 288a631346..e526a71063 100644 --- a/examples/cvodes/parallel/cvsDiurnal_kry_bbd_p.out +++ b/examples/cvodes/parallel/cvsDiurnal_kry_bbd_p.out @@ -28,43 +28,43 @@ At bottom left: c1, c2 = 1.404e+04 3.387e+11 At top right: c1, c2 = 1.561e+04 3.765e+11 t = 4.32e+04 no. steps = 368 order = 4 stepsize = 3.95e+02 -At bottom left: c1, c2 = 6.243e-08 3.382e+11 -At top right: c1, c2 = 7.021e-08 3.804e+11 +At bottom left: c1, c2 = 6.245e-08 3.382e+11 +At top right: c1, c2 = 7.023e-08 3.804e+11 t = 5.04e+04 no. steps = 388 order = 5 stepsize = 4.74e+02 -At bottom left: c1, c2 = 3.000e-07 3.358e+11 -At top right: c1, c2 = 3.306e-07 3.864e+11 +At bottom left: c1, c2 = 3.031e-07 3.358e+11 +At top right: c1, c2 = 3.340e-07 3.864e+11 -t = 5.76e+04 no. steps = 401 order = 5 stepsize = 3.61e+02 -At bottom left: c1, c2 = -1.096e-10 3.320e+11 -At top right: c1, c2 = -6.268e-11 3.909e+11 +t = 5.76e+04 no. steps = 401 order = 5 stepsize = 3.50e+02 +At bottom left: c1, c2 = 4.503e-11 3.320e+11 +At top right: c1, c2 = 1.065e-10 3.909e+11 -t = 6.48e+04 no. steps = 414 order = 5 stepsize = 6.38e+02 -At bottom left: c1, c2 = 1.186e-11 3.313e+11 -At top right: c1, c2 = 6.568e-14 3.963e+11 +t = 6.48e+04 no. steps = 418 order = 5 stepsize = 5.80e+02 +At bottom left: c1, c2 = -5.893e-09 3.313e+11 +At top right: c1, c2 = -1.672e-08 3.963e+11 -t = 7.20e+04 no. steps = 425 order = 5 stepsize = 6.38e+02 -At bottom left: c1, c2 = -7.713e-12 3.330e+11 -At top right: c1, c2 = 5.432e-13 4.039e+11 +t = 7.20e+04 no. steps = 430 order = 5 stepsize = 5.80e+02 +At bottom left: c1, c2 = -7.098e-11 3.330e+11 +At top right: c1, c2 = -2.001e-10 4.039e+11 -t = 7.92e+04 no. steps = 436 order = 5 stepsize = 6.38e+02 -At bottom left: c1, c2 = 2.525e-13 3.334e+11 -At top right: c1, c2 = -2.072e-14 4.120e+11 +t = 7.92e+04 no. steps = 443 order = 5 stepsize = 5.80e+02 +At bottom left: c1, c2 = 7.023e-13 3.334e+11 +At top right: c1, c2 = 1.967e-12 4.120e+11 -t = 8.64e+04 no. steps = 448 order = 5 stepsize = 6.38e+02 -At bottom left: c1, c2 = 4.758e-15 3.352e+11 -At top right: c1, c2 = 7.572e-17 4.163e+11 +t = 8.64e+04 no. steps = 455 order = 5 stepsize = 5.80e+02 +At bottom left: c1, c2 = 5.803e-14 3.352e+11 +At top right: c1, c2 = 1.602e-13 4.163e+11 Final Statistics: lenrw = 2696 leniw = 156 lenrwls = 2454 leniwls = 126 -nst = 448 -nfe = 580 nfels = 509 -nni = 577 nli = 509 -nsetups = 76 netf = 26 -npe = 8 nps = 1029 +nst = 455 +nfe = 596 nfels = 531 +nni = 593 nli = 531 +nsetups = 83 netf = 30 +npe = 8 nps = 1066 ncfn = 0 ncfl = 0 In CVBBDPRE: real/integer local work space sizes = 1300, 192 diff --git a/examples/cvodes/parallel/cvsDiurnal_kry_p.out b/examples/cvodes/parallel/cvsDiurnal_kry_p.out index cd02887cf2..9d51f8eb28 100644 --- a/examples/cvodes/parallel/cvsDiurnal_kry_p.out +++ b/examples/cvodes/parallel/cvsDiurnal_kry_p.out @@ -13,51 +13,51 @@ t = 2.16e+04 no. steps = 277 order = 5 stepsize = 2.75e+02 At bottom left: c1, c2 = 2.665e+07 2.993e+11 At top right: c1, c2 = 2.931e+07 3.313e+11 -t = 2.88e+04 no. steps = 321 order = 3 stepsize = 5.19e+01 +t = 2.88e+04 no. steps = 316 order = 4 stepsize = 1.51e+02 At bottom left: c1, c2 = 8.702e+06 3.380e+11 At top right: c1, c2 = 9.650e+06 3.751e+11 -t = 3.60e+04 no. steps = 384 order = 4 stepsize = 8.70e+01 +t = 3.60e+04 no. steps = 355 order = 4 stepsize = 7.19e+01 At bottom left: c1, c2 = 1.404e+04 3.387e+11 At top right: c1, c2 = 1.561e+04 3.765e+11 -t = 4.32e+04 no. steps = 456 order = 4 stepsize = 8.77e+02 -At bottom left: c1, c2 = 1.077e-06 3.382e+11 -At top right: c1, c2 = 4.057e-07 3.804e+11 +t = 4.32e+04 no. steps = 416 order = 4 stepsize = 3.62e+02 +At bottom left: c1, c2 = -1.316e-07 3.382e+11 +At top right: c1, c2 = -1.475e-07 3.804e+11 -t = 5.04e+04 no. steps = 471 order = 4 stepsize = 3.29e+02 -At bottom left: c1, c2 = -1.176e-08 3.358e+11 -At top right: c1, c2 = -5.053e-08 3.864e+11 +t = 5.04e+04 no. steps = 430 order = 5 stepsize = 6.16e+02 +At bottom left: c1, c2 = -3.937e-07 3.358e+11 +At top right: c1, c2 = -4.373e-07 3.864e+11 -t = 5.76e+04 no. steps = 488 order = 5 stepsize = 3.95e+02 -At bottom left: c1, c2 = -9.464e-11 3.320e+11 -At top right: c1, c2 = -3.493e-10 3.909e+11 +t = 5.76e+04 no. steps = 442 order = 5 stepsize = 4.00e+02 +At bottom left: c1, c2 = -4.342e-10 3.320e+11 +At top right: c1, c2 = -4.873e-10 3.909e+11 -t = 6.48e+04 no. steps = 501 order = 5 stepsize = 6.20e+02 -At bottom left: c1, c2 = 5.057e-11 3.313e+11 -At top right: c1, c2 = 1.868e-10 3.963e+11 +t = 6.48e+04 no. steps = 453 order = 5 stepsize = 6.52e+02 +At bottom left: c1, c2 = 2.031e-10 3.313e+11 +At top right: c1, c2 = 2.236e-10 3.963e+11 -t = 7.20e+04 no. steps = 512 order = 5 stepsize = 6.20e+02 -At bottom left: c1, c2 = -4.454e-11 3.330e+11 -At top right: c1, c2 = -1.629e-10 4.039e+11 +t = 7.20e+04 no. steps = 465 order = 5 stepsize = 6.52e+02 +At bottom left: c1, c2 = -2.118e-12 3.330e+11 +At top right: c1, c2 = -2.335e-12 4.039e+11 -t = 7.92e+04 no. steps = 524 order = 5 stepsize = 6.20e+02 -At bottom left: c1, c2 = -2.189e-13 3.334e+11 -At top right: c1, c2 = -8.112e-13 4.120e+11 +t = 7.92e+04 no. steps = 476 order = 5 stepsize = 6.52e+02 +At bottom left: c1, c2 = -6.684e-14 3.334e+11 +At top right: c1, c2 = -7.358e-14 4.120e+11 -t = 8.64e+04 no. steps = 535 order = 5 stepsize = 6.20e+02 -At bottom left: c1, c2 = 1.080e-15 3.352e+11 -At top right: c1, c2 = 3.729e-15 4.163e+11 +t = 8.64e+04 no. steps = 487 order = 5 stepsize = 6.52e+02 +At bottom left: c1, c2 = -1.055e-15 3.352e+11 +At top right: c1, c2 = -1.168e-15 4.163e+11 Final Statistics: lenrw = 2696 leniw = 156 lenrwls = 2454 leniwls = 126 -nst = 535 -nfe = 687 nfels = 668 -nni = 684 nli = 668 -nsetups = 92 netf = 33 -npe = 10 nps = 1294 -ncfn = 0 ncfl = 1 +nst = 487 +nfe = 618 nfels = 623 +nni = 615 nli = 623 +nsetups = 79 netf = 26 +npe = 9 nps = 1179 +ncfn = 0 ncfl = 0 diff --git a/examples/cvodes/serial/cvsAnalytic_mels.c b/examples/cvodes/serial/cvsAnalytic_mels.c index 33d957a0e2..2eb17bda9d 100644 --- a/examples/cvodes/serial/cvsAnalytic_mels.c +++ b/examples/cvodes/serial/cvsAnalytic_mels.c @@ -334,8 +334,8 @@ static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, sunrealtype at /* compute solution error */ ans = atan(t); - ewt = SUN_RCONST(1.0) / (rtol * fabs(ans) + atol); - err = ewt * fabs(NV_Ith_S(y, 0) - ans); + ewt = SUN_RCONST(1.0) / (rtol * SUNRabs(ans) + atol); + err = ewt * SUNRabs(NV_Ith_S(y, 0) - ans); /* is the solution within the tolerances? */ passfail = (err < SUN_RCONST(1.0)) ? 0 : 1; diff --git a/examples/cvodes/serial/cvsDirectDemo_ls.c b/examples/cvodes/serial/cvsDirectDemo_ls.c index 8303f1e8cf..acfc7eed51 100644 --- a/examples/cvodes/serial/cvsDirectDemo_ls.c +++ b/examples/cvodes/serial/cvsDirectDemo_ls.c @@ -251,7 +251,7 @@ static int Problem1(void) } if (iout % 2 == 0) { - er = fabs(NV_Ith_S(y, 0)) / abstol; + er = SUNRabs(NV_Ith_S(y, 0)) / abstol; if (er > ero) { ero = er; } if (er > P1_TOL_FACTOR) { @@ -319,7 +319,7 @@ static int Problem1(void) } if (iout % 2 == 0) { - er = fabs(NV_Ith_S(y, 0)) / abstol; + er = SUNRabs(NV_Ith_S(y, 0)) / abstol; if (er > ero) { ero = er; } if (er > P1_TOL_FACTOR) { @@ -700,7 +700,7 @@ static sunrealtype MaxError(N_Vector y, sunrealtype t) { k = i + j * P2_MESHX; yt = pow(t, i + j) * ex * ifact_inv * jfact_inv; - er = fabs(ydata[k] - yt); + er = SUNRabs(ydata[k] - yt); if (er > maxError) { maxError = er; } ifact_inv /= (i + 1); } diff --git a/examples/cvodes/serial/cvsDiurnal_FSA_kry_-sensi_sim_t.out b/examples/cvodes/serial/cvsDiurnal_FSA_kry_-sensi_sim_t.out index 199714823c..337b222f38 100644 --- a/examples/cvodes/serial/cvsDiurnal_FSA_kry_-sensi_sim_t.out +++ b/examples/cvodes/serial/cvsDiurnal_FSA_kry_-sensi_sim_t.out @@ -5,7 +5,7 @@ Sensitivity: YES ( SIMULTANEOUS + FULL ERROR CONTROL ) ======================================================================== T Q H NST Bottom left Top right ======================================================================== -7.200e+03 3 3.239e+01 644 +7.200e+03 3 3.247e+01 644 Solution 1.0593e+04 1.1152e+04 2.5567e+11 2.6917e+11 ---------------------------------------- @@ -15,27 +15,27 @@ Sensitivity: YES ( SIMULTANEOUS + FULL ERROR CONTROL ) Sensitivity 2 -4.4900e+14 -4.9768e+14 -2.5039e+18 -2.7672e+18 ------------------------------------------------------------------------ -1.440e+04 2 2.205e+01 1009 +1.440e+04 2 2.683e+01 1018 Solution 6.9172e+06 7.2517e+06 2.6829e+11 2.8137e+11 ---------------------------------------- Sensitivity 1 -4.2432e+22 -4.4483e+22 - 6.2762e+22 6.6564e+22 + 6.2762e+22 6.6563e+22 ---------------------------------------- Sensitivity 2 -4.8955e+17 -5.3580e+17 - -7.1116e+21 -7.7237e+21 + -7.1116e+21 -7.7236e+21 ------------------------------------------------------------------------ -2.160e+04 2 4.049e+01 1600 +2.160e+04 2 1.865e+01 1614 Solution 2.7558e+07 2.9196e+07 3.1024e+11 3.3000e+11 ---------------------------------------- Sensitivity 1 -1.6903e+23 -1.7907e+23 4.0588e+23 4.4683e+23 ---------------------------------------- - Sensitivity 2 -8.2851e+18 -9.3611e+18 - -8.2852e+22 -9.3662e+22 + Sensitivity 2 -8.2851e+18 -9.3610e+18 + -8.2851e+22 -9.3662e+22 ------------------------------------------------------------------------ -2.880e+04 3 6.108e+01 1899 +2.880e+04 3 8.477e+01 1863 Solution 8.9631e+06 9.8602e+06 3.4824e+11 3.8331e+11 ---------------------------------------- @@ -45,98 +45,98 @@ Sensitivity: YES ( SIMULTANEOUS + FULL ERROR CONTROL ) Sensitivity 2 -5.2367e+18 -6.4007e+18 -1.8450e+23 -2.2574e+23 ------------------------------------------------------------------------ -3.600e+04 3 3.424e+01 2018 +3.600e+04 2 8.923e+00 2073 Solution 1.4433e+04 1.6660e+04 3.4814e+11 4.0186e+11 ---------------------------------------- - Sensitivity 1 -8.8547e+19 -1.0220e+20 + Sensitivity 1 -8.8547e+19 -1.0221e+20 5.6474e+23 7.6273e+23 ---------------------------------------- - Sensitivity 2 -9.0220e+15 -1.2170e+16 + Sensitivity 2 -9.0221e+15 -1.2170e+16 -1.9753e+23 -2.6679e+23 ------------------------------------------------------------------------ -4.320e+04 4 3.490e+02 2538 - Solution 2.5038e-13 2.7023e-13 +4.320e+04 4 4.127e+02 2392 + Solution -7.6378e-13 -5.2974e-13 3.4900e+11 4.0867e+11 ---------------------------------------- - Sensitivity 1 -1.5796e+05 -2.3807e+05 + Sensitivity 1 2.3442e+05 2.2420e+05 5.7083e+23 7.9553e+23 ---------------------------------------- - Sensitivity 2 -1.7187e+00 -5.1787e+01 + Sensitivity 2 -9.0425e+00 -4.6301e+01 -1.9969e+23 -2.7830e+23 ------------------------------------------------------------------------ -5.040e+04 4 3.490e+02 2559 - Solution -6.0654e-16 -1.7637e-15 +5.040e+04 4 4.127e+02 2410 + Solution -1.2200e-16 -1.0627e-16 3.5570e+11 4.1225e+11 ---------------------------------------- - Sensitivity 1 -1.0195e+03 -2.4393e+03 + Sensitivity 1 2.6846e+02 2.0083e+02 5.9553e+23 8.1823e+23 ---------------------------------------- - Sensitivity 2 -1.0096e-02 -2.7454e-02 + Sensitivity 2 1.1054e-03 -3.9916e-03 -2.0833e+23 -2.8624e+23 ------------------------------------------------------------------------ -5.760e+04 4 1.634e+02 2584 - Solution 4.4474e-08 1.1903e-07 +5.760e+04 3 5.281e+01 2549 + Solution -4.7059e-08 -4.8769e-08 3.6425e+11 4.1628e+11 ---------------------------------------- - Sensitivity 1 -1.8179e+09 -4.8687e+09 + Sensitivity 1 -6.4064e+08 -6.6478e+08 6.2592e+23 8.4334e+23 ---------------------------------------- - Sensitivity 2 -1.7780e+04 -5.4422e+04 - -2.1896e+23 -2.9502e+23 + Sensitivity 2 4.3302e+05 1.7919e+05 + -2.1897e+23 -2.9503e+23 ------------------------------------------------------------------------ -6.480e+04 3 9.518e+01 2636 - Solution -3.1083e-09 -1.3895e-08 +6.480e+04 4 1.937e+02 2599 + Solution 2.1648e-07 2.3190e-07 3.6334e+11 4.2182e+11 ---------------------------------------- - Sensitivity 1 -5.8937e+08 -2.6001e+09 + Sensitivity 1 -6.6816e+09 -7.1969e+09 6.2461e+23 8.7310e+23 ---------------------------------------- - Sensitivity 2 -5.2314e+03 -2.6357e+04 + Sensitivity 2 9.5725e+04 1.2031e+05 -2.1851e+23 -3.0544e+23 ------------------------------------------------------------------------ -7.200e+04 4 1.729e+02 2699 - Solution -1.8227e-08 5.8153e-08 +7.200e+04 4 3.045e+02 2634 + Solution 6.7125e-09 6.6994e-09 3.6192e+11 4.3354e+11 ---------------------------------------- - Sensitivity 1 1.2752e+09 -4.6275e+09 - 6.2310e+23 9.2797e+23 + Sensitivity 1 6.3368e+09 6.3708e+09 + 6.2311e+23 9.2797e+23 ---------------------------------------- - Sensitivity 2 8.7152e+06 -4.0981e+07 + Sensitivity 2 -2.0880e+07 -2.5165e+07 -2.1798e+23 -3.2463e+23 ------------------------------------------------------------------------ -7.920e+04 4 1.729e+02 2741 - Solution -1.1560e-08 8.4429e-09 +7.920e+04 5 4.818e+02 2652 + Solution 5.4650e-12 5.4746e-12 3.6148e+11 4.4474e+11 ---------------------------------------- - Sensitivity 1 -3.9209e+09 3.0221e+09 + Sensitivity 1 -2.4107e+07 -2.3698e+07 6.2481e+23 9.8067e+23 ---------------------------------------- - Sensitivity 2 2.4469e+07 -1.1022e+07 + Sensitivity 2 -1.6403e+06 -1.9530e+06 -2.1858e+23 -3.4307e+23 ------------------------------------------------------------------------ -8.640e+04 4 1.729e+02 2783 - Solution -2.0626e-09 3.2649e-10 +8.640e+04 5 4.818e+02 2667 + Solution 1.6088e-14 1.6027e-14 3.6318e+11 4.4524e+11 ---------------------------------------- - Sensitivity 1 -3.1145e+09 6.7710e+08 + Sensitivity 1 3.5626e+04 3.5472e+04 6.3248e+23 9.8820e+23 ---------------------------------------- - Sensitivity 2 -2.1820e+07 -4.8408e+06 + Sensitivity 2 2.6242e+03 3.1708e+03 -2.2126e+23 -3.4570e+23 ------------------------------------------------------------------------ Final Statistics -nst = 2783 +nst = 2667 -nfe = 3955 -netf = 186 nsetups = 534 -nni = 3952 ncfn = 24 +nfe = 3902 +netf = 166 nsetups = 477 +nni = 3899 ncfn = 8 -nfSe = 7910 nfeS = 15820 +nfSe = 7804 nfeS = 15608 netfs = 0 nsetupsS = 0 nniS = 0 ncfnS = 0 -nli = 8402 ncfl = 0 -npe = 69 nps = 18230 +nli = 8496 ncfl = 0 +npe = 52 nps = 18412 diff --git a/examples/cvodes/serial/cvsDiurnal_kry.out b/examples/cvodes/serial/cvsDiurnal_kry.out index 4d695384cc..56aae6c198 100644 --- a/examples/cvodes/serial/cvsDiurnal_kry.out +++ b/examples/cvodes/serial/cvsDiurnal_kry.out @@ -22,31 +22,31 @@ c1 (bot.left/middle/top rt.) = 1.404e+04 2.029e+04 1.561e+04 c2 (bot.left/middle/top rt.) = 3.387e+11 4.894e+11 3.765e+11 t = 4.32e+04 no. steps = 393 order = 4 stepsize = 2.57e+02 -c1 (bot.left/middle/top rt.) = -7.891e-06 -1.123e-06 -8.723e-06 +c1 (bot.left/middle/top rt.) = -7.924e-06 -1.148e-06 -8.759e-06 c2 (bot.left/middle/top rt.) = 3.382e+11 1.355e+11 3.804e+11 t = 5.04e+04 no. steps = 421 order = 5 stepsize = 4.96e+02 -c1 (bot.left/middle/top rt.) = -1.595e-08 -1.771e-06 -3.117e-08 +c1 (bot.left/middle/top rt.) = -1.599e-08 -1.775e-06 -3.124e-08 c2 (bot.left/middle/top rt.) = 3.358e+11 4.930e+11 3.864e+11 -t = 5.76e+04 no. steps = 439 order = 4 stepsize = 1.19e+02 -c1 (bot.left/middle/top rt.) = -2.127e-06 -1.513e-04 -2.951e-06 +t = 5.76e+04 no. steps = 437 order = 5 stepsize = 2.10e+02 +c1 (bot.left/middle/top rt.) = -1.239e-08 -8.964e-07 -1.736e-08 c2 (bot.left/middle/top rt.) = 3.320e+11 9.650e+11 3.909e+11 -t = 6.48e+04 no. steps = 458 order = 5 stepsize = 6.60e+02 -c1 (bot.left/middle/top rt.) = -1.084e-09 -7.686e-08 -1.499e-09 +t = 6.48e+04 no. steps = 464 order = 5 stepsize = 7.69e+02 +c1 (bot.left/middle/top rt.) = 4.297e-11 2.962e-09 5.854e-11 c2 (bot.left/middle/top rt.) = 3.313e+11 8.922e+11 3.963e+11 -t = 7.20e+04 no. steps = 469 order = 5 stepsize = 6.60e+02 -c1 (bot.left/middle/top rt.) = -1.093e-10 -7.736e-09 -1.510e-10 +t = 7.20e+04 no. steps = 473 order = 5 stepsize = 7.69e+02 +c1 (bot.left/middle/top rt.) = 1.150e-11 7.919e-10 1.566e-11 c2 (bot.left/middle/top rt.) = 3.330e+11 6.186e+11 4.039e+11 -t = 7.92e+04 no. steps = 480 order = 5 stepsize = 6.60e+02 -c1 (bot.left/middle/top rt.) = -1.624e-12 -1.151e-10 -2.246e-12 +t = 7.92e+04 no. steps = 483 order = 5 stepsize = 7.69e+02 +c1 (bot.left/middle/top rt.) = -4.188e-13 -2.884e-11 -5.703e-13 c2 (bot.left/middle/top rt.) = 3.334e+11 6.669e+11 4.120e+11 -t = 8.64e+04 no. steps = 491 order = 5 stepsize = 6.60e+02 -c1 (bot.left/middle/top rt.) = 3.501e-14 2.474e-12 4.816e-14 +t = 8.64e+04 no. steps = 492 order = 5 stepsize = 7.69e+02 +c1 (bot.left/middle/top rt.) = -3.268e-14 -2.246e-12 -4.447e-14 c2 (bot.left/middle/top rt.) = 3.352e+11 9.107e+11 4.163e+11 @@ -54,10 +54,10 @@ Final Statistics.. lenrw = 2696 leniw = 65 lenrwLS = 2454 leniwLS = 42 -nst = 491 -nfe = 630 nfeLS = 0 -nni = 627 nli = 643 -nsetups = 82 netf = 29 -npe = 9 nps = 1214 +nst = 492 +nfe = 637 nfeLS = 0 +nni = 634 nli = 649 +nsetups = 88 netf = 32 +npe = 9 nps = 1223 ncfn = 0 ncfl = 0 diff --git a/examples/cvodes/serial/cvsDiurnal_kry_bp.out b/examples/cvodes/serial/cvsDiurnal_kry_bp.out index df9b31edb1..8f837871a9 100644 --- a/examples/cvodes/serial/cvsDiurnal_kry_bp.out +++ b/examples/cvodes/serial/cvsDiurnal_kry_bp.out @@ -26,32 +26,32 @@ c1 (bot.left/middle/top rt.) = 1.404e+04 2.029e+04 1.561e+04 c2 (bot.left/middle/top rt.) = 3.387e+11 4.894e+11 3.765e+11 t = 4.32e+04 no. steps = 402 order = 4 stepsize = 4.48e+02 -c1 (bot.left/middle/top rt.) = 1.915e-07 -6.130e-06 4.395e-07 +c1 (bot.left/middle/top rt.) = 1.929e-07 -6.029e-06 4.403e-07 c2 (bot.left/middle/top rt.) = 3.382e+11 1.355e+11 3.804e+11 -t = 5.04e+04 no. steps = 422 order = 4 stepsize = 3.17e+02 -c1 (bot.left/middle/top rt.) = -7.746e-11 -3.073e-08 -3.512e-11 +t = 5.04e+04 no. steps = 421 order = 4 stepsize = 3.30e+02 +c1 (bot.left/middle/top rt.) = 1.559e-09 6.319e-07 6.062e-10 c2 (bot.left/middle/top rt.) = 3.358e+11 4.930e+11 3.864e+11 -t = 5.76e+04 no. steps = 436 order = 5 stepsize = 3.58e+02 -c1 (bot.left/middle/top rt.) = 1.801e-11 7.177e-09 8.588e-12 +t = 5.76e+04 no. steps = 435 order = 5 stepsize = 4.67e+02 +c1 (bot.left/middle/top rt.) = -2.660e-12 -1.080e-09 -1.030e-12 c2 (bot.left/middle/top rt.) = 3.320e+11 9.650e+11 3.909e+11 -t = 6.48e+04 no. steps = 449 order = 5 stepsize = 5.95e+02 -c1 (bot.left/middle/top rt.) = -2.845e-14 -1.063e-11 -1.382e-14 +t = 6.48e+04 no. steps = 447 order = 5 stepsize = 7.06e+02 +c1 (bot.left/middle/top rt.) = -7.375e-15 -2.742e-12 -2.920e-15 c2 (bot.left/middle/top rt.) = 3.313e+11 8.922e+11 3.963e+11 -t = 7.20e+04 no. steps = 461 order = 5 stepsize = 5.95e+02 -c1 (bot.left/middle/top rt.) = 2.710e-16 1.011e-13 1.307e-16 +t = 7.20e+04 no. steps = 457 order = 5 stepsize = 7.06e+02 +c1 (bot.left/middle/top rt.) = -1.202e-17 -4.105e-15 -5.445e-18 c2 (bot.left/middle/top rt.) = 3.330e+11 6.186e+11 4.039e+11 -t = 7.92e+04 no. steps = 473 order = 5 stepsize = 5.95e+02 -c1 (bot.left/middle/top rt.) = 5.698e-16 2.058e-13 2.690e-16 +t = 7.92e+04 no. steps = 467 order = 5 stepsize = 7.06e+02 +c1 (bot.left/middle/top rt.) = -8.193e-21 -1.461e-15 -7.837e-19 c2 (bot.left/middle/top rt.) = 3.334e+11 6.669e+11 4.120e+11 -t = 8.64e+04 no. steps = 485 order = 5 stepsize = 5.95e+02 -c1 (bot.left/middle/top rt.) = 2.707e-16 1.899e-17 2.156e-15 -c2 (bot.left/middle/top rt.) = 3.352e+11 9.106e+11 4.163e+11 +t = 8.64e+04 no. steps = 477 order = 5 stepsize = 7.06e+02 +c1 (bot.left/middle/top rt.) = -7.290e-20 -3.730e-15 -4.364e-20 +c2 (bot.left/middle/top rt.) = 3.352e+11 9.106e+11 4.162e+11 Final Statistics.. @@ -59,12 +59,12 @@ Final Statistics.. lenrw = 2696 leniw = 65 lenrwls = 2454 leniwls = 42 lenrwbp = 2800 leniwbp = 622 -nst = 485 -nfe = 616 nfetot = 1258 -nfeLS = 597 nfeBP = 45 -nni = 613 nli = 597 +nst = 477 +nfe = 613 nfetot = 1267 +nfeLS = 614 nfeBP = 40 +nni = 610 nli = 614 nsetups = 85 netf = 28 -npe = 9 nps = 1134 +npe = 8 nps = 1142 ncfn = 0 ncfl = 0 diff --git a/examples/cvodes/serial/cvsFoodWeb_ASAi_kry.c b/examples/cvodes/serial/cvsFoodWeb_ASAi_kry.c index e8409e6e91..03817e3ad7 100644 --- a/examples/cvodes/serial/cvsFoodWeb_ASAi_kry.c +++ b/examples/cvodes/serial/cvsFoodWeb_ASAi_kry.c @@ -516,7 +516,7 @@ static int Precond(sunrealtype t, N_Vector c, N_Vector fc, sunbooleantype jok, f1 = N_VGetArrayPointer(wdata->vtemp); fac = N_VWrmsNorm(fc, rewt); - r0 = SUN_RCONST(1000.0) * fabs(gamma) * uround * (NEQ + 1) * fac; + r0 = SUN_RCONST(1000.0) * SUNRabs(gamma) * uround * (NEQ + 1) * fac; if (r0 == ZERO) { r0 = ONE; } for (igy = 0; igy < ngy; igy++) @@ -534,7 +534,7 @@ static int Precond(sunrealtype t, N_Vector c, N_Vector fc, sunbooleantype jok, /* Generate the jth column as a difference quotient */ jj = if0 + j; save = cdata[jj]; - r = MAX(srur * fabs(save), r0 / rewtdata[jj]); + r = MAX(srur * SUNRabs(save), r0 / rewtdata[jj]); cdata[jj] += r; fac = -gamma / r; fblock(t, cdata, jx, jy, f1, wdata); @@ -736,7 +736,7 @@ static int PrecondB(sunrealtype t, N_Vector c, N_Vector cB, N_Vector fcB, f1 = N_VGetArrayPointer(wdata->vtempB); fac = N_VWrmsNorm(fcB, rewt); - r0 = SUN_RCONST(1000.0) * fabs(gamma) * uround * NEQ * fac; + r0 = SUN_RCONST(1000.0) * SUNRabs(gamma) * uround * NEQ * fac; if (r0 == ZERO) { r0 = ONE; } for (igy = 0; igy < ngy; igy++) @@ -754,7 +754,7 @@ static int PrecondB(sunrealtype t, N_Vector c, N_Vector cB, N_Vector fcB, /* Generate the jth column as a difference quotient */ jj = if0 + j; save = cdata[jj]; - r = MAX(srur * fabs(save), r0 / rewtdata[jj]); + r = MAX(srur * SUNRabs(save), r0 / rewtdata[jj]); cdata[jj] += r; fac = gamma / r; fblock(t, cdata, jx, jy, f1, wdata); @@ -1291,7 +1291,7 @@ static void PrintOutput(N_Vector cB, int ns, int mxns, WebData wdata) for (jx = 0; jx < MX; jx++) { cij = cdata[(i - 1) + jx * ns + jy * mxns]; - if (fabs(cij) > cmax) + if (SUNRabs(cij) > cmax) { cmax = cij; x = jx * wdata->dx; diff --git a/examples/cvodes/serial/cvsFoodWeb_ASAp_kry.c b/examples/cvodes/serial/cvsFoodWeb_ASAp_kry.c index 35f470bc45..67e46c484b 100644 --- a/examples/cvodes/serial/cvsFoodWeb_ASAp_kry.c +++ b/examples/cvodes/serial/cvsFoodWeb_ASAp_kry.c @@ -503,7 +503,7 @@ static int Precond(sunrealtype t, N_Vector c, N_Vector fc, sunbooleantype jok, f1 = N_VGetArrayPointer(wdata->vtemp); fac = N_VWrmsNorm(fc, rewt); - r0 = SUN_RCONST(1000.0) * fabs(gamma) * uround * NEQ * fac; + r0 = SUN_RCONST(1000.0) * SUNRabs(gamma) * uround * NEQ * fac; if (r0 == ZERO) { r0 = ONE; } for (igy = 0; igy < ngy; igy++) @@ -521,7 +521,7 @@ static int Precond(sunrealtype t, N_Vector c, N_Vector fc, sunbooleantype jok, /* Generate the jth column as a difference quotient */ jj = if0 + j; save = cdata[jj]; - r = MAX(srur * fabs(save), r0 / rewtdata[jj]); + r = MAX(srur * SUNRabs(save), r0 / rewtdata[jj]); cdata[jj] += r; fac = -gamma / r; fblock(t, cdata, jx, jy, f1, wdata); @@ -714,7 +714,7 @@ static int PrecondB(sunrealtype t, N_Vector c, N_Vector cB, N_Vector fcB, f1 = N_VGetArrayPointer(wdata->vtemp); fac = N_VWrmsNorm(fcB, rewt); - r0 = SUN_RCONST(1000.0) * fabs(gamma) * uround * NEQ * fac; + r0 = SUN_RCONST(1000.0) * SUNRabs(gamma) * uround * NEQ * fac; if (r0 == ZERO) { r0 = ONE; } for (igy = 0; igy < ngy; igy++) @@ -732,7 +732,7 @@ static int PrecondB(sunrealtype t, N_Vector c, N_Vector cB, N_Vector fcB, /* Generate the jth column as a difference quotient */ jj = if0 + j; save = cdata[jj]; - r = MAX(srur * fabs(save), r0 / rewtdata[jj]); + r = MAX(srur * SUNRabs(save), r0 / rewtdata[jj]); cdata[jj] += r; fac = gamma / r; fblock(t, cdata, jx, jy, f1, wdata); @@ -1295,7 +1295,7 @@ static void PrintOutput(N_Vector cB, int ns, int mxns, WebData wdata) for (jx = 0; jx < MX; jx++) { cij = cdata[(i - 1) + jx * ns + jy * mxns]; - if (fabs(cij) > cmax) + if (SUNRabs(cij) > cmax) { cmax = cij; x = jx * wdata->dx; diff --git a/examples/cvodes/serial/cvsKrylovDemo_prec.c b/examples/cvodes/serial/cvsKrylovDemo_prec.c index 376cd698fc..a64794640c 100644 --- a/examples/cvodes/serial/cvsKrylovDemo_prec.c +++ b/examples/cvodes/serial/cvsKrylovDemo_prec.c @@ -848,7 +848,7 @@ static int Precond(sunrealtype t, N_Vector c, N_Vector fc, sunbooleantype jok, f1 = N_VGetArrayPointer(wdata->tmp); fac = N_VWrmsNorm(fc, rewt); - r0 = SUN_RCONST(1000.0) * fabs(gamma) * uround * NEQ * fac; + r0 = SUN_RCONST(1000.0) * SUNRabs(gamma) * uround * NEQ * fac; if (r0 == ZERO) { r0 = ONE; } for (igy = 0; igy < ngy; igy++) @@ -866,7 +866,7 @@ static int Precond(sunrealtype t, N_Vector c, N_Vector fc, sunbooleantype jok, /* Generate the jth column as a difference quotient */ jj = if0 + j; save = cdata[jj]; - r = MAX(srur * fabs(save), r0 / rewtdata[jj]); + r = MAX(srur * SUNRabs(save), r0 / rewtdata[jj]); cdata[jj] += r; fac = -gamma / r; fblock(t, cdata, jx, jy, f1, wdata); diff --git a/examples/cvodes/serial/cvsParticle_dns.out b/examples/cvodes/serial/cvsParticle_dns.out index 15517a2bd3..0901a32138 100644 --- a/examples/cvodes/serial/cvsParticle_dns.out +++ b/examples/cvodes/serial/cvsParticle_dns.out @@ -14,13 +14,13 @@ tstop = 0 t x y err x err y err constr 0.0000e+00 1.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 0.000000e+00 -6.2832e+02 9.977240e-01 6.742947e-02 -2.275957e-03 6.742947e-02 2.220446e-16 +6.2832e+02 9.979545e-01 6.392827e-02 -2.045504e-03 6.392827e-02 0.000000e+00 Integration Statistics: -Number of steps taken = 4044 -Number of function evaluations = 5831 -Number of linear solver setups = 806 -Number of Jacobian evaluations = 103 -Number of nonlinear solver iterations = 5828 -Number of convergence failures = 40 -Number of error test failures = 329 +Number of steps taken = 4131 +Number of function evaluations = 6030 +Number of linear solver setups = 862 +Number of Jacobian evaluations = 115 +Number of nonlinear solver iterations = 6027 +Number of convergence failures = 52 +Number of error test failures = 343 diff --git a/examples/cvodes/serial/cvsRoberts_FSA_dns_-sensi_sim_t.out b/examples/cvodes/serial/cvsRoberts_FSA_dns_-sensi_sim_t.out index 9eda7cba0d..4482815e02 100644 --- a/examples/cvodes/serial/cvsRoberts_FSA_dns_-sensi_sim_t.out +++ b/examples/cvodes/serial/cvsRoberts_FSA_dns_-sensi_sim_t.out @@ -79,13 +79,13 @@ Sensitivity: YES ( SIMULTANEOUS + FULL ERROR CONTROL ) ----------------------------------------------------------------------- Final Statistics: -Current time = 43900737657.75381 +Current time = 43900558490.17576 Steps = 818 Error test fails = 28 NLS step fails = 2 Initial step size = 8.236259832589498e-14 -Last step size = 7184288709.869884 -Current step size = 7184288709.869884 +Last step size = 7184239983.513188 +Current step size = 7184239983.513188 Last method order = 3 Current method order = 3 Stab. lim. order reductions = 0 diff --git a/examples/cvodes/serial/cvsRoberts_FSA_dns_-sensi_stg1_t.out b/examples/cvodes/serial/cvsRoberts_FSA_dns_-sensi_stg1_t.out index 63f99b8085..984fb6bad1 100644 --- a/examples/cvodes/serial/cvsRoberts_FSA_dns_-sensi_stg1_t.out +++ b/examples/cvodes/serial/cvsRoberts_FSA_dns_-sensi_stg1_t.out @@ -73,19 +73,19 @@ Sensitivity: YES ( STAGGERED1 + FULL ERROR CONTROL ) ----------------------------------------------------------------------- 4.000e+10 3 1.237e+09 930 Solution 5.1573e-08 2.0629e-13 1.0000e+00 - Sensitivity 1 -2.6618e-06 -5.4901e-12 2.6619e-06 - Sensitivity 2 1.0763e-11 2.2422e-17 -1.0763e-11 + Sensitivity 1 -2.6618e-06 -5.4900e-12 2.6618e-06 + Sensitivity 2 1.0763e-11 2.2421e-17 -1.0763e-11 Sensitivity 3 -1.7339e-15 -6.9355e-21 1.7339e-15 ----------------------------------------------------------------------- Final Statistics: -Current time = 41016848848.50709 +Current time = 41016872194.61566 Steps = 930 Error test fails = 0 NLS step fails = 0 Initial step size = 8.236259832589498e-14 -Last step size = 1236650880.556721 -Current step size = 1236650880.556721 +Last step size = 1236651497.958958 +Current step size = 1236651497.958958 Last method order = 3 Current method order = 3 Stab. lim. order reductions = 0 diff --git a/examples/cvodes/serial/cvsRoberts_FSA_sps_-sensi_stg1_t.out b/examples/cvodes/serial/cvsRoberts_FSA_sps_-sensi_stg1_t.out index baccc08523..c6190b4a05 100644 --- a/examples/cvodes/serial/cvsRoberts_FSA_sps_-sensi_stg1_t.out +++ b/examples/cvodes/serial/cvsRoberts_FSA_sps_-sensi_stg1_t.out @@ -73,8 +73,8 @@ Sensitivity: YES ( STAGGERED1 + FULL ERROR CONTROL ) ----------------------------------------------------------------------- 4.000e+10 3 1.237e+09 930 Solution 5.1573e-08 2.0629e-13 1.0000e+00 - Sensitivity 1 -2.6618e-06 -5.4901e-12 2.6619e-06 - Sensitivity 2 1.0763e-11 2.2422e-17 -1.0763e-11 + Sensitivity 1 -2.6618e-06 -5.4900e-12 2.6618e-06 + Sensitivity 2 1.0763e-11 2.2421e-17 -1.0763e-11 Sensitivity 3 -1.7339e-15 -6.9355e-21 1.7339e-15 ----------------------------------------------------------------------- diff --git a/examples/ida/C_openmp/idaFoodWeb_kry_omp.c b/examples/ida/C_openmp/idaFoodWeb_kry_omp.c index eb15b44994..68e497b9cf 100644 --- a/examples/ida/C_openmp/idaFoodWeb_kry_omp.c +++ b/examples/ida/C_openmp/idaFoodWeb_kry_omp.c @@ -471,8 +471,8 @@ static int Precond(sunrealtype tt, N_Vector cc, N_Vector cp, N_Vector rr, for (js = 0; js < NUM_SPECIES; js++) { - inc = sqru * - (MAX(fabs(cxy[js]), MAX(hh * fabs(cpxy[js]), ONE / ewtxy[js]))); + inc = sqru * (MAX(SUNRabs(cxy[js]), + MAX(hh * SUNRabs(cpxy[js]), ONE / ewtxy[js]))); cctmp = cxy[js]; cxy[js] += inc; fac = -ONE / inc; diff --git a/examples/ida/parallel/idaFoodWeb_kry_p.c b/examples/ida/parallel/idaFoodWeb_kry_p.c index b916fb63c9..befc25cdb6 100644 --- a/examples/ida/parallel/idaFoodWeb_kry_p.c +++ b/examples/ida/parallel/idaFoodWeb_kry_p.c @@ -1287,8 +1287,8 @@ static int Precondbd(sunrealtype tt, N_Vector cc, N_Vector cp, N_Vector rr, for (js = 0; js < ns; js++) { - inc = sqru * - (MAX(fabs(cxy[js]), MAX(hh * fabs(cpxy[js]), ONE / ewtxy[js]))); + inc = sqru * (MAX(SUNRabs(cxy[js]), + MAX(hh * SUNRabs(cpxy[js]), ONE / ewtxy[js]))); cctemp = cxy[js]; /* Save the (js,ix,jy) element of cc. */ cxy[js] += inc; /* Perturb the (js,ix,jy) element of cc. */ fac = -ONE / inc; diff --git a/examples/ida/petsc/CMakeLists.txt b/examples/ida/petsc/CMakeLists.txt index 098ce24569..b57438a03a 100644 --- a/examples/ida/petsc/CMakeLists.txt +++ b/examples/ida/petsc/CMakeLists.txt @@ -21,9 +21,16 @@ set(IDA_examples "idaHeat2D_petsc_spgmr\;\;1\;4\;develop" "idaHeat2D_petsc_snes\;\;1\;4\;develop" - "idaHeat2D_petsc_snes\;-pre\;1\;4\;develop" - "idaHeat2D_petsc_snes\;-jac\;1\;4\;develop" - "idaHeat2D_petsc_snes\;-jac -pre\;1\;4\;develop") + "idaHeat2D_petsc_snes\;-pre\;1\;4\;develop") + +# Previous tests with PETSc v3.17.1 installed with Spack v0.18.1 had identical +# results with 32 and 64-bit indexing. Now with PETSc v3.21.4 installed with +# Spack v0.23.0.dev0 (73fc86cbc3ae6dea5f69e3a0516e1a7691864fa3) the results are +# slightly different. +if(SUNDIALS_INDEX_SIZE STREQUAL "32") + list(APPEND IDA_examples "idaHeat2D_petsc_snes\;-jac\;1\;4\;develop" + "idaHeat2D_petsc_snes\;-jac -pre\;1\;4\;develop") +endif() if(MPI_C_COMPILER) # use MPI wrapper as the compiler diff --git a/examples/ida/petsc/idaHeat2D_petsc_snes.out b/examples/ida/petsc/idaHeat2D_petsc_snes.out index cff5c7495a..1d8792161b 100644 --- a/examples/ida/petsc/idaHeat2D_petsc_snes.out +++ b/examples/ida/petsc/idaHeat2D_petsc_snes.out @@ -22,13 +22,13 @@ Use the SNES command line options to override defaults. 0.02 6.88087e-01 3 19 38 156 251 2.38e-03 0.04 4.70971e-01 4 24 48 216 336 4.75e-03 0.08 2.16290e-01 5 30 60 295 445 9.50e-03 - 0.16 4.53347e-02 5 37 74 401 586 1.71e-02 - 0.32 1.99922e-03 5 46 92 543 773 1.71e-02 - 0.64 7.56973e-18 2 54 108 670 940 6.84e-02 - 1.28 1.48329e-17 1 57 114 753 1038 5.47e-01 - 2.56 3.78999e-19 1 58 116 778 1068 1.09e+00 - 5.12 1.71542e-21 1 60 120 823 1123 4.38e+00 - 10.24 1.84930e-23 1 61 122 842 1147 8.75e+00 + 0.16 4.53347e-02 5 37 74 400 585 1.71e-02 + 0.32 1.99922e-03 5 46 92 542 772 1.71e-02 + 0.64 7.51674e-18 2 54 108 669 939 6.84e-02 + 1.28 1.47260e-17 1 57 114 752 1037 5.47e-01 + 2.56 3.76285e-19 1 58 116 777 1067 1.09e+00 + 5.12 1.70319e-21 1 60 120 822 1122 4.38e+00 + 10.24 1.83612e-23 1 61 122 841 1146 8.75e+00 Error test failures = 0 Nonlinear convergence failures = 0 diff --git a/examples/ida/petsc/idaHeat2D_petsc_snes_-jac.out b/examples/ida/petsc/idaHeat2D_petsc_snes_-jac.out index 987b965635..45d5dfdec8 100644 --- a/examples/ida/petsc/idaHeat2D_petsc_snes_-jac.out +++ b/examples/ida/petsc/idaHeat2D_petsc_snes_-jac.out @@ -24,11 +24,11 @@ Use the SNES command line options to override defaults. 0.08 2.16290e-01 5 30 60 247 90 9.50e-03 0.16 4.53347e-02 5 37 74 337 111 1.71e-02 0.32 1.99922e-03 5 46 92 463 138 1.71e-02 - 0.64 5.55626e-18 2 54 108 598 162 6.84e-02 - 1.28 3.39532e-18 1 57 114 663 171 5.47e-01 - 2.56 9.12051e-20 1 58 116 683 174 1.09e+00 - 5.12 4.17001e-22 1 60 120 723 180 4.38e+00 - 10.24 4.49674e-24 1 61 122 744 183 8.75e+00 + 0.64 5.55615e-18 2 54 108 598 162 6.84e-02 + 1.28 3.39520e-18 1 57 114 663 171 5.47e-01 + 2.56 9.12020e-20 1 58 116 683 174 1.09e+00 + 5.12 4.16987e-22 1 60 120 723 180 4.38e+00 + 10.24 4.49659e-24 1 61 122 744 183 8.75e+00 Error test failures = 0 Nonlinear convergence failures = 0 diff --git a/examples/ida/petsc/idaHeat2D_petsc_snes_-jac_-pre.out b/examples/ida/petsc/idaHeat2D_petsc_snes_-jac_-pre.out index afdc6e6303..83682d8291 100644 --- a/examples/ida/petsc/idaHeat2D_petsc_snes_-jac_-pre.out +++ b/examples/ida/petsc/idaHeat2D_petsc_snes_-jac_-pre.out @@ -24,10 +24,10 @@ Use the SNES command line options to override defaults. 0.08 2.16290e-01 5 30 60 295 90 9.50e-03 0.16 4.53347e-02 5 37 74 401 111 1.71e-02 0.32 1.99922e-03 5 46 92 543 138 1.71e-02 - 0.64 7.53458e-18 2 54 108 669 162 6.84e-02 - 1.28 1.47695e-17 1 57 114 744 171 5.47e-01 + 0.64 7.53534e-18 2 54 108 670 162 6.84e-02 + 1.28 1.47695e-17 1 57 114 745 171 5.47e-01 2.56 3.77409e-19 1 58 116 767 174 1.09e+00 - 5.12 1.70831e-21 1 60 120 804 180 4.38e+00 + 5.12 1.70831e-21 1 60 120 803 180 4.38e+00 10.24 1.84164e-23 1 61 122 820 183 8.75e+00 Error test failures = 0 diff --git a/examples/ida/petsc/idaHeat2D_petsc_snes_-pre.out b/examples/ida/petsc/idaHeat2D_petsc_snes_-pre.out index 79c47d1eef..0321697c8a 100644 --- a/examples/ida/petsc/idaHeat2D_petsc_snes_-pre.out +++ b/examples/ida/petsc/idaHeat2D_petsc_snes_-pre.out @@ -22,13 +22,13 @@ Use the SNES command line options to override defaults. 0.02 6.88087e-01 3 19 38 156 251 2.38e-03 0.04 4.70971e-01 4 24 48 216 336 4.75e-03 0.08 2.16290e-01 5 30 60 295 445 9.50e-03 - 0.16 4.53347e-02 5 37 74 400 585 1.71e-02 - 0.32 1.99922e-03 5 46 92 542 772 1.71e-02 - 0.64 7.46526e-18 2 54 108 669 939 6.84e-02 - 1.28 1.46307e-17 1 57 114 752 1037 5.47e-01 - 2.56 3.73813e-19 1 58 116 778 1068 1.09e+00 - 5.12 1.69191e-21 1 60 120 824 1124 4.38e+00 - 10.24 1.82395e-23 1 61 122 842 1147 8.75e+00 + 0.16 4.53347e-02 5 37 74 401 586 1.71e-02 + 0.32 1.99922e-03 5 46 92 543 773 1.71e-02 + 0.64 7.53164e-18 2 54 108 670 940 6.84e-02 + 1.28 1.47601e-17 1 57 114 753 1038 5.47e-01 + 2.56 3.77136e-19 1 58 116 778 1068 1.09e+00 + 5.12 1.70699e-21 1 60 120 823 1123 4.38e+00 + 10.24 1.84021e-23 1 61 122 842 1147 8.75e+00 Error test failures = 0 Nonlinear convergence failures = 0 diff --git a/examples/ida/petsc/idaHeat2D_petsc_spgmr.out b/examples/ida/petsc/idaHeat2D_petsc_spgmr.out index a04af4d126..295f347232 100644 --- a/examples/ida/petsc/idaHeat2D_petsc_spgmr.out +++ b/examples/ida/petsc/idaHeat2D_petsc_spgmr.out @@ -22,11 +22,11 @@ This example uses the PETSc N_Vector. 0.08 2.16330e-01 4 30 38 36 36 38 36 8.55e-03 10 74 0.16 4.52095e-02 4 37 47 54 54 47 54 1.50e-02 11 101 0.32 1.96868e-03 5 48 59 82 82 59 82 1.50e-02 11 141 - 0.64 1.21506e-05 1 57 73 108 108 73 108 1.20e-01 14 181 - 1.28 6.51352e-22 1 59 75 108 108 75 108 4.78e-01 16 183 - 2.56 7.44406e-22 1 61 77 108 108 77 108 1.91e+00 18 185 - 5.12 1.43242e-21 1 62 78 108 108 78 108 3.83e+00 19 186 - 10.24 2.62776e-21 1 63 79 108 108 79 108 7.66e+00 20 187 + 0.64 1.22783e-05 1 57 73 108 108 73 108 1.20e-01 14 181 + 1.28 6.17716e-22 1 59 75 108 108 75 108 4.78e-01 16 183 + 2.56 4.38516e-22 1 61 77 108 108 77 108 1.91e+00 18 185 + 5.12 1.00191e-21 1 62 78 108 108 78 108 3.83e+00 19 186 + 10.24 1.64570e-21 1 63 79 108 108 79 108 7.66e+00 20 187 Error test failures = 0 Nonlinear convergence failures = 0 diff --git a/examples/ida/serial/idaFoodWeb_kry.c b/examples/ida/serial/idaFoodWeb_kry.c index e81e07c0ad..9ce75a1191 100644 --- a/examples/ida/serial/idaFoodWeb_kry.c +++ b/examples/ida/serial/idaFoodWeb_kry.c @@ -439,8 +439,8 @@ static int Precond(sunrealtype tt, N_Vector cc, N_Vector cp, N_Vector rr, for (js = 0; js < NUM_SPECIES; js++) { - inc = sqru * - (MAX(fabs(cxy[js]), MAX(hh * fabs(cpxy[js]), ONE / ewtxy[js]))); + inc = sqru * (MAX(SUNRabs(cxy[js]), + MAX(hh * SUNRabs(cpxy[js]), ONE / ewtxy[js]))); cctmp = cxy[js]; cxy[js] += inc; fac = -ONE / inc; diff --git a/examples/ida/trilinos/CMakeLists.txt b/examples/ida/trilinos/CMakeLists.txt index 0a1a28eac4..b9ee330ad8 100644 --- a/examples/ida/trilinos/CMakeLists.txt +++ b/examples/ida/trilinos/CMakeLists.txt @@ -18,22 +18,13 @@ # for examples excluded from 'make test' in releases # Examples using SUNDIALS linear solvers -if(Trilinos_INTERFACE_MPI_CXX_FOUND) +if(MPI_CXX_FOUND) set(IDA_examples "idaHeat2D_kry_tpetra\;1\;1\;develop" "idaHeat2D_kry_p_tpetra\;1\;4\;develop") else() set(IDA_examples "idaHeat2D_kry_tpetra\;1\;1\;develop") endif() -# Set Trilinos compilers/flags -set(CMAKE_CXX_COMPILER ${Trilinos_INTERFACE_CXX_COMPILER}) -set(CMAKE_C_COMPILER ${Trilinos_INTERFACE_C_COMPILER}) -set(CMAKE_CXX_FLAGS - "${CMAKE_CXX_FLAGS} ${Trilinos_INTERFACE_CXX_COMPILER_FLAGS}") -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${Trilinos_INTERFACE_C_COMPILER_FLAGS}") - -set(MPIEXEC_EXECUTABLE ${Trilinos_INTERFACE_MPIEXEC}) - # Specify libraries to link against set(IDA_LIB sundials_ida) set(NVECS_LIB sundials_nvectrilinos) diff --git a/examples/ida/trilinos/idaHeat2D_kry_tpetra.out b/examples/ida/trilinos/idaHeat2D_kry_tpetra.out index 8c7d6596db..fadcabe348 100644 --- a/examples/ida/trilinos/idaHeat2D_kry_tpetra.out +++ b/examples/ida/trilinos/idaHeat2D_kry_tpetra.out @@ -44,11 +44,11 @@ Case 2: gstype = SUN_CLASSICAL_GS 0.08 2.16509e-01 3 22 29 30 29 30 1.32e-02 9 59 0.16 4.57687e-02 4 28 36 44 36 44 1.32e-02 9 80 0.32 2.09938e-03 4 35 44 67 44 67 2.63e-02 10 111 - 0.64 2.15648e-20 1 39 51 77 51 77 1.05e-01 12 128 - 1.28 5.77813e-20 1 41 53 77 53 77 4.21e-01 14 130 - 2.56 7.49337e-20 1 43 55 77 55 77 1.69e+00 16 132 - 5.12 2.26172e-19 1 44 56 77 56 77 3.37e+00 17 133 - 10.24 6.90227e-19 1 45 57 77 57 77 6.74e+00 18 134 + 0.64 0.00000e+00 1 39 51 77 51 77 1.05e-01 12 128 + 1.28 0.00000e+00 1 41 53 77 53 77 4.21e-01 14 130 + 2.56 0.00000e+00 1 43 55 77 55 77 1.69e+00 16 132 + 5.12 0.00000e+00 1 44 56 77 56 77 3.37e+00 17 133 + 10.24 0.00000e+00 1 45 57 77 57 77 6.74e+00 18 134 Error test failures = 1 Nonlinear convergence failures = 0 diff --git a/examples/idas/C_openmp/idasFoodWeb_kry_omp.c b/examples/idas/C_openmp/idasFoodWeb_kry_omp.c index 91fa4f4c4d..00b2487143 100644 --- a/examples/idas/C_openmp/idasFoodWeb_kry_omp.c +++ b/examples/idas/C_openmp/idasFoodWeb_kry_omp.c @@ -469,8 +469,8 @@ static int Precond(sunrealtype tt, N_Vector cc, N_Vector cp, N_Vector rr, for (js = 0; js < NUM_SPECIES; js++) { - inc = sqru * - (MAX(fabs(cxy[js]), MAX(hh * fabs(cpxy[js]), ONE / ewtxy[js]))); + inc = sqru * (MAX(SUNRabs(cxy[js]), + MAX(hh * SUNRabs(cpxy[js]), ONE / ewtxy[js]))); cctmp = cxy[js]; cxy[js] += inc; fac = -ONE / inc; diff --git a/examples/idas/parallel/idasFoodWeb_kry_p.c b/examples/idas/parallel/idasFoodWeb_kry_p.c index be9e4e1abb..795c8f5d98 100644 --- a/examples/idas/parallel/idasFoodWeb_kry_p.c +++ b/examples/idas/parallel/idasFoodWeb_kry_p.c @@ -1286,8 +1286,8 @@ static int Precondbd(sunrealtype tt, N_Vector cc, N_Vector cp, N_Vector rr, for (js = 0; js < ns; js++) { - inc = sqru * - (MAX(fabs(cxy[js]), MAX(hh * fabs(cpxy[js]), ONE / ewtxy[js]))); + inc = sqru * (MAX(SUNRabs(cxy[js]), + MAX(hh * SUNRabs(cpxy[js]), ONE / ewtxy[js]))); cctemp = cxy[js]; /* Save the (js,ix,jy) element of cc. */ cxy[js] += inc; /* Perturb the (js,ix,jy) element of cc. */ fac = -ONE / inc; diff --git a/examples/idas/serial/idasSlCrank_FSA_dns.out b/examples/idas/serial/idasSlCrank_FSA_dns.out index 25ff86dfc0..be03615949 100644 --- a/examples/idas/serial/idasSlCrank_FSA_dns.out +++ b/examples/idas/serial/idasSlCrank_FSA_dns.out @@ -5,15 +5,15 @@ Forward integration ... done! Final Run Statistics: -Number of steps = 231 -Number of residual evaluations = 1131 -Number of Jacobian evaluations = 42 -Number of nonlinear iterations = 711 +Number of steps = 233 +Number of residual evaluations = 1180 +Number of Jacobian evaluations = 46 +Number of nonlinear iterations = 720 Number of error test failures = 0 -Number of nonlinear conv. failures = 24 -Number of step solver failures = 0 +Number of nonlinear conv. failures = 26 +Number of step solver failures = 1 -------------------------------------------- - G = 3.3366157997761721 + G = 3.3366155611545363 -------------------------------------------- -------------F O R W A R D------------------ @@ -25,7 +25,7 @@ Number of step solver failures = 0 Checking using Finite Differences ---------------BACKWARD------------------ - dG/dp: 3.3344e-01 -3.6375e-01 + dG/dp: 3.3345e-01 -3.6375e-01 ----------------------------------------- ---------------FORWARD------------------- diff --git a/examples/idas/serial/idasSlCrank_dns.out b/examples/idas/serial/idasSlCrank_dns.out index 81ef2cc330..dc79d2a775 100644 --- a/examples/idas/serial/idasSlCrank_dns.out +++ b/examples/idas/serial/idasSlCrank_dns.out @@ -42,6 +42,6 @@ Number of error test failures = 1 Number of nonlinear conv. failures = 20 Number of step solver failures = 0 -------------------------------------------- - G = 3.3366160662934146 + G = 3.3366160662909388 -------------------------------------------- diff --git a/examples/kinsol/CXX_parhyp/kin_bratu2D_hypre_pfmg.cpp b/examples/kinsol/CXX_parhyp/kin_bratu2D_hypre_pfmg.cpp index baf7ecd847..a25c16dfe5 100644 --- a/examples/kinsol/CXX_parhyp/kin_bratu2D_hypre_pfmg.cpp +++ b/examples/kinsol/CXX_parhyp/kin_bratu2D_hypre_pfmg.cpp @@ -87,6 +87,13 @@ int main(int argc, char* argv[]) // SUNDIALS context sundials::Context sunctx(comm_w); + // Initialize hypre if v2.20.0 or newer +#if HYPRE_RELEASE_NUMBER >= 22000 || SUN_HYPRE_VERSION_MAJOR > 2 || \ + (SUN_HYPRE_VERSION_MAJOR == 2 && SUN_HYPRE_VERSION_MINOR >= 20) + retval = HYPRE_Init(); + if (check_retval(&retval, "HYPRE_Init", 1)) { return 1; } +#endif + // ------------------------------------------ // Setup UserData and parallel decomposition // ------------------------------------------ @@ -246,6 +253,13 @@ int main(int argc, char* argv[]) // Free memory // -------------------- + // Finalize hypre if v2.20.0 or newer +#if HYPRE_RELEASE_NUMBER >= 22000 || SUN_HYPRE_VERSION_MAJOR > 2 || \ + (SUN_HYPRE_VERSION_MAJOR == 2 && SUN_HYPRE_VERSION_MINOR >= 20) + retval = HYPRE_Finalize(); + if (check_retval(&retval, "HYPRE_Finalize", 1)) { return 1; } +#endif + KINFree(&kin_mem); // Free solver memory N_VDestroy(u); // Free vectors N_VDestroy(scale); diff --git a/examples/kinsol/CXX_parhyp/kin_heat2D_nonlin_hypre_pfmg.cpp b/examples/kinsol/CXX_parhyp/kin_heat2D_nonlin_hypre_pfmg.cpp index ae43c84d5f..34681d2449 100644 --- a/examples/kinsol/CXX_parhyp/kin_heat2D_nonlin_hypre_pfmg.cpp +++ b/examples/kinsol/CXX_parhyp/kin_heat2D_nonlin_hypre_pfmg.cpp @@ -87,6 +87,13 @@ int main(int argc, char* argv[]) // SUNDIALS context sundials::Context sunctx(comm_w); + // Initialize hypre if v2.20.0 or newer +#if HYPRE_RELEASE_NUMBER >= 22000 || SUN_HYPRE_VERSION_MAJOR > 2 || \ + (SUN_HYPRE_VERSION_MAJOR == 2 && SUN_HYPRE_VERSION_MINOR >= 20) + retval = HYPRE_Init(); + if (check_retval(&retval, "HYPRE_Init", 1)) { return 1; } +#endif + // ------------------------------------------ // Setup UserData and parallel decomposition // ------------------------------------------ @@ -275,6 +282,13 @@ int main(int argc, char* argv[]) // Free memory // -------------------- + // Finalize hypre if v2.20.0 or newer +#if HYPRE_RELEASE_NUMBER >= 22000 || SUN_HYPRE_VERSION_MAJOR > 2 || \ + (SUN_HYPRE_VERSION_MAJOR == 2 && SUN_HYPRE_VERSION_MINOR >= 20) + retval = HYPRE_Finalize(); + if (check_retval(&retval, "HYPRE_Finalize", 1)) { return 1; } +#endif + KINFree(&kin_mem); // Free solver memory N_VDestroy(u); // Free vectors N_VDestroy(scale); diff --git a/examples/kinsol/C_openmp/kinFoodWeb_kry_omp.c b/examples/kinsol/C_openmp/kinFoodWeb_kry_omp.c index d6b979581a..3ca40e26e6 100644 --- a/examples/kinsol/C_openmp/kinFoodWeb_kry_omp.c +++ b/examples/kinsol/C_openmp/kinFoodWeb_kry_omp.c @@ -444,7 +444,7 @@ static int PrecSetupBD(N_Vector cc, N_Vector cscale, N_Vector fval, for (j = 0; j < NUM_SPECIES; j++) { csave = cxy[j]; /* Save the j,jx,jy element of cc */ - r = MAX(sqruround * fabs(csave), r0 / scxy[j]); + r = MAX(sqruround * SUNRabs(csave), r0 / scxy[j]); cxy[j] += r; /* Perturb the j,jx,jy element of cc */ fac = ONE / r; diff --git a/examples/kinsol/parallel/kinFoodWeb_kry_p.c b/examples/kinsol/parallel/kinFoodWeb_kry_p.c index f434e1522c..b1c2ce3868 100644 --- a/examples/kinsol/parallel/kinFoodWeb_kry_p.c +++ b/examples/kinsol/parallel/kinFoodWeb_kry_p.c @@ -466,7 +466,7 @@ static int Precondbd(N_Vector cc, N_Vector cscale, N_Vector fval, for (j = 0; j < NUM_SPECIES; j++) { csave = cxy[j]; /* Save the j,jx,jy element of cc */ - r = MAX(sqruround * fabs(csave), r0 / scxy[j]); + r = MAX(sqruround * SUNRabs(csave), r0 / scxy[j]); cxy[j] += r; /* Perturb the j,jx,jy element of cc */ fac = ONE / r; diff --git a/examples/kinsol/serial/kinKrylovDemo_ls.c b/examples/kinsol/serial/kinKrylovDemo_ls.c index 631ef36efd..1647da2297 100644 --- a/examples/kinsol/serial/kinKrylovDemo_ls.c +++ b/examples/kinsol/serial/kinKrylovDemo_ls.c @@ -506,7 +506,7 @@ static int PrecSetupBD(N_Vector cc, N_Vector cscale, N_Vector fval, for (j = 0; j < NUM_SPECIES; j++) { csave = cxy[j]; /* Save the j,jx,jy element of cc */ - r = MAX(sqruround * fabs(csave), r0 / scxy[j]); + r = MAX(sqruround * SUNRabs(csave), r0 / scxy[j]); cxy[j] += r; /* Perturb the j,jx,jy element of cc */ fac = ONE / r; diff --git a/examples/nvector/trilinos/CMakeLists.txt b/examples/nvector/trilinos/CMakeLists.txt index 06874d0e41..6713c5a9f3 100644 --- a/examples/nvector/trilinos/CMakeLists.txt +++ b/examples/nvector/trilinos/CMakeLists.txt @@ -18,7 +18,7 @@ # for examples excluded from 'make test' in releases # Examples using SUNDIALS Trilinos nvector wrapper -if(Trilinos_INTERFACE_MPI_CXX_FOUND) +if(MPI_CXX_FOUND) set(nvector_trilinos_examples "test_nvector_trilinos\;1000 0\;\;\;" # run sequentially "test_nvector_trilinos\;1000 0\;1\;4\;" # run parallel on 4 procs @@ -30,22 +30,12 @@ else() endif() # Dependencies for nvector examples -if(Trilinos_MPI) +if(ENABLE_MPI) set(nvector_examples_dependencies test_nvector test_mpinvector) else() set(nvector_examples_dependencies test_nvector) endif() -# Set Trilinos compilers/flags -set(CMAKE_CXX_COMPILER ${Trilinos_INTERFACE_CXX_COMPILER}) -set(CMAKE_C_COMPILER ${Trilinos_INTERFACE_C_COMPILER}) -set(CMAKE_CXX_FLAGS - "${CMAKE_CXX_FLAGS} ${Trilinos_INTERFACE_CXX_COMPILER_FLAGS}") -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${Trilinos_INTERFACE_C_COMPILER_FLAGS}") - -# Set Trilinos MPI executable for trilinos tests -set(MPIEXEC_EXECUTABLE ${Trilinos_INTERFACE_MPIEXEC}) - # Add source directory to include directories include_directories(. ..) @@ -73,7 +63,7 @@ foreach(example_tuple ${nvector_trilinos_examples}) # link vector test utilities target_link_libraries(${example} PRIVATE test_nvector_obj) - if(Trilinos_MPI) + if(ENABLE_MPI) target_link_libraries(${example} PRIVATE test_nvectormpi_obj) endif() diff --git a/examples/sunlinsol/ginkgo/CMakeLists.txt b/examples/sunlinsol/ginkgo/CMakeLists.txt index c701ffc672..97eb4f69e5 100644 --- a/examples/sunlinsol/ginkgo/CMakeLists.txt +++ b/examples/sunlinsol/ginkgo/CMakeLists.txt @@ -17,8 +17,6 @@ set(examples "test_sunlinsol_ginkgo.cpp\;bicg csr 100 0 100 0\;" # "test_sunlinsol_ginkgo.cpp\;bicg dense 100 0 100 0\;" - "test_sunlinsol_ginkgo.cpp\;bicgstab csr 100 0 100 0\;" - # "test_sunlinsol_ginkgo.cpp\;bicgstab dense 100 0 100 0\;" "test_sunlinsol_ginkgo.cpp\;cgs csr 100 0 100 0\;" # "test_sunlinsol_ginkgo.cpp\;cgs dense 100 0 100 0\;" "test_sunlinsol_ginkgo.cpp\;gmres csr 100 0 100 0\;" @@ -27,6 +25,14 @@ set(examples # "test_sunlinsol_ginkgo.cpp\;idr dense 100 0 100 0\;" ) +# The BiCGStab solver has a known bug with the OpenMP backend +# https://github.com/ginkgo-project/ginkgo/issues/1563 which should be fixed in +# the next release (1.9.0) by https://github.com/ginkgo-project/ginkgo/pull/1676 +set(examples_bicgstab + "test_sunlinsol_ginkgo.cpp\;bicgstab csr 100 0 100 0\;" + # "test_sunlinsol_ginkgo.cpp\;bicgstab dense 100 0 100 0\;" +) + # Add source directory to include directories include_directories(..) @@ -36,6 +42,12 @@ sundials_add_examples_ginkgo( BACKENDS REF OMP CUDA HIP SYCL UNIT_TEST) +sundials_add_examples_ginkgo( + examples_bicgstab + TARGETS test_sunlinsol_obj + BACKENDS REF CUDA HIP SYCL + UNIT_TEST) + # Install the targets if(EXAMPLES_INSTALL) diff --git a/examples/sunlinsol/ginkgo/test_sunlinsol_ginkgo.cpp b/examples/sunlinsol/ginkgo/test_sunlinsol_ginkgo.cpp index 9a979b2c9a..521be82167 100644 --- a/examples/sunlinsol/ginkgo/test_sunlinsol_ginkgo.cpp +++ b/examples/sunlinsol/ginkgo/test_sunlinsol_ginkgo.cpp @@ -350,11 +350,19 @@ int main(int argc, char* argv[]) sundials::Context sunctx; #if defined(USE_HIP) +#if GKO_VERSION_MAJOR > 1 || (GKO_VERSION_MAJOR == 1 && GKO_VERSION_MINOR >= 7) + auto gko_exec{gko::HipExecutor::create(0, gko::OmpExecutor::create())}; +#else auto gko_exec{gko::HipExecutor::create(0, gko::OmpExecutor::create(), false, gko::allocation_mode::device)}; +#endif #elif defined(USE_CUDA) +#if GKO_VERSION_MAJOR > 1 || (GKO_VERSION_MAJOR == 1 && GKO_VERSION_MINOR >= 7) + auto gko_exec{gko::CudaExecutor::create(0, gko::OmpExecutor::create())}; +#else auto gko_exec{gko::CudaExecutor::create(0, gko::OmpExecutor::create(), false, gko::allocation_mode::device)}; +#endif #elif defined(USE_SYCL) auto gko_exec{gko::DpcppExecutor::create(0, gko::ReferenceExecutor::create())}; #elif defined(USE_OMP) diff --git a/examples/sunmatrix/ginkgo/test_sunmatrix_ginkgo.cpp b/examples/sunmatrix/ginkgo/test_sunmatrix_ginkgo.cpp index b29ac171aa..cbb1ff3d5a 100644 --- a/examples/sunmatrix/ginkgo/test_sunmatrix_ginkgo.cpp +++ b/examples/sunmatrix/ginkgo/test_sunmatrix_ginkgo.cpp @@ -96,18 +96,25 @@ int main(int argc, char* argv[]) /* Create SUNDIALS context before calling any other SUNDIALS function*/ sundials::Context sunctx; - auto gko_exec{ - REF_OR_OMP_OR_HIP_OR_CUDA_OR_SYCL(gko::ReferenceExecutor::create(), - gko::OmpExecutor::create(), - gko::HipExecutor::create(0, - gko::OmpExecutor::create(), - true), - gko::CudaExecutor::create(0, - gko::OmpExecutor::create(), - true), - gko::DpcppExecutor:: - create(0, - gko::ReferenceExecutor::create()))}; +#if defined(USE_CUDA) +#if GKO_VERSION_MAJOR > 1 || (GKO_VERSION_MAJOR == 1 && GKO_VERSION_MINOR >= 7) + auto gko_exec{gko::CudaExecutor::create(0, gko::OmpExecutor::create())}; +#else + auto gko_exec{gko::CudaExecutor::create(0, gko::OmpExecutor::create(), true)}; +#endif +#elif defined(USE_HIP) +#if GKO_VERSION_MAJOR > 1 || (GKO_VERSION_MAJOR == 1 && GKO_VERSION_MINOR >= 7) + auto gko_exec { gko::HipExecutor::create(0, gko::OmpExecutor::create()) } +#else + auto gko_exec{gko::HipExecutor::create(0, gko::OmpExecutor::create(), true)}; +#endif +#elif defined(USE_SYCL) + auto gko_exec{gko::DpcppExecutor::create(0, gko::ReferenceExecutor::create())}; +#elif defined(USE_OMP) + auto gko_exec{gko::OmpExecutor::create()}; +#else + auto gko_exec{gko::ReferenceExecutor::create()}; +#endif /* check input and set vector length */ if (argc < 4) diff --git a/include/nvector/trilinos/SundialsTpetraVectorKernels.hpp b/include/nvector/trilinos/SundialsTpetraVectorKernels.hpp index 8b2d68eb08..c8742ba4bf 100644 --- a/include/nvector/trilinos/SundialsTpetraVectorKernels.hpp +++ b/include/nvector/trilinos/SundialsTpetraVectorKernels.hpp @@ -48,11 +48,6 @@ typedef vector_type::local_ordinal_type local_ordinal_type; typedef vector_type::node_type::memory_space memory_space; typedef vector_type::execution_space execution_space; -static constexpr scalar_type zero = 0; -static constexpr scalar_type half = 0.5; -static constexpr scalar_type one = 1.0; -static constexpr scalar_type onept5 = 1.5; - /*---------------------------------------------------------------- * Streaming vector kernels *---------------------------------------------------------------*/ @@ -147,7 +142,8 @@ inline void compare(scalar_type c, const vector_type& x, vector_type& z) Kokkos::parallel_for( "compare", Kokkos::RangePolicy(0, N), KOKKOS_LAMBDA(const local_ordinal_type& i) { - z_1d(i) = std::abs(x_1d(i)) >= c ? one : zero; + z_1d(i) = std::abs(x_1d(i)) >= c ? static_cast(1.0) + : static_cast(0.0); }); } @@ -180,7 +176,7 @@ inline mag_type normWrms(const vector_type& x, const vector_type& w) auto w_1d = Kokkos::subview(w_2d, Kokkos::ALL(), 0); #endif - mag_type sum = zero; + mag_type sum = static_cast(0.0); Kokkos::parallel_reduce( "normWrms", Kokkos::RangePolicy(0, N), KOKKOS_LAMBDA(const local_ordinal_type& i, mag_type& local_sum) { @@ -188,7 +184,7 @@ inline mag_type normWrms(const vector_type& x, const vector_type& w) }, sum); - mag_type globalSum = zero; + mag_type globalSum = static_cast(0.0); reduceAll(*comm, REDUCE_SUM, sum, outArg(globalSum)); return std::sqrt(globalSum / static_cast(Nglob)); } @@ -225,15 +221,16 @@ inline mag_type normWrmsMask(const vector_type& x, const vector_type& w, auto id_1d = Kokkos::subview(id_2d, Kokkos::ALL(), 0); #endif - mag_type sum = zero; + mag_type sum = static_cast(0.0); Kokkos::parallel_reduce( "normWrmsMask", Kokkos::RangePolicy(0, N), KOKKOS_LAMBDA(const local_ordinal_type& i, mag_type& local_sum) { - if (id_1d(i) > zero) local_sum += x_1d(i) * w_1d(i) * (x_1d(i) * w_1d(i)); + if (id_1d(i) > static_cast(0.0)) + local_sum += x_1d(i) * w_1d(i) * (x_1d(i) * w_1d(i)); }, sum); - mag_type globalSum = zero; + mag_type globalSum = static_cast(0.0); reduceAll(*comm, REDUCE_SUM, sum, outArg(globalSum)); return std::sqrt(globalSum / static_cast(Nglob)); } @@ -295,7 +292,7 @@ inline mag_type normWL2(const vector_type& x, const vector_type& w) auto w_1d = Kokkos::subview(w_2d, Kokkos::ALL(), 0); #endif - mag_type sum = zero; + mag_type sum = static_cast(0.0); Kokkos::parallel_reduce( "normWL2", Kokkos::RangePolicy(0, N), KOKKOS_LAMBDA(const local_ordinal_type& i, mag_type& local_sum) { @@ -303,7 +300,7 @@ inline mag_type normWL2(const vector_type& x, const vector_type& w) }, sum); - mag_type globalSum = zero; + mag_type globalSum = static_cast(0.0); reduceAll(*comm, REDUCE_SUM, sum, outArg(globalSum)); return std::sqrt(globalSum); } @@ -339,14 +336,17 @@ inline bool invTest(const vector_type& x, vector_type& z) Kokkos::parallel_reduce( "invTest", Kokkos::RangePolicy(0, N), KOKKOS_LAMBDA(const local_ordinal_type& i, scalar_type& local_min) { - if (x_1d(i) == zero) { min_reducer.join(local_min, zero); } - else { z_1d(i) = one / x_1d(i); } + if (x_1d(i) == static_cast(0.0)) + { + min_reducer.join(local_min, static_cast(0.0)); + } + else { z_1d(i) = static_cast(1.0) / x_1d(i); } }, min_reducer); scalar_type globalMin; reduceAll(*comm, REDUCE_MIN, minimum, outArg(globalMin)); - return (globalMin > half); + return (globalMin > static_cast(0.5)); } /// Find constraint violations @@ -379,20 +379,23 @@ inline bool constraintMask(const vector_type& c, const vector_type& x, auto m_1d = Kokkos::subview(m_2d, Kokkos::ALL(), 0); #endif - mag_type sum = zero; + mag_type sum = static_cast(0.0); Kokkos::parallel_reduce( "constraintMask", Kokkos::RangePolicy(0, N), KOKKOS_LAMBDA(const local_ordinal_type& i, mag_type& local_sum) { - const bool test = (std::abs(c_1d(i)) > onept5 && c_1d(i) * x_1d(i) <= zero) || - (std::abs(c_1d(i)) > half && c_1d(i) * x_1d(i) < zero); - m_1d(i) = test ? one : zero; + const bool test = (std::abs(c_1d(i)) > static_cast(1.5) && + c_1d(i) * x_1d(i) <= static_cast(0.0)) || + (std::abs(c_1d(i)) > static_cast(0.5) && + c_1d(i) * x_1d(i) < static_cast(0.0)); + m_1d(i) = test ? static_cast(1.0) + : static_cast(0.0); local_sum += m_1d(i); }, sum); - mag_type globalSum = zero; + mag_type globalSum = static_cast(0.0); reduceAll(*comm, REDUCE_SUM, sum, outArg(globalSum)); - return (globalSum < half); + return (globalSum < static_cast(0.5)); } /// Minimum quotient: min_i(num(i)/den(i)) @@ -427,7 +430,8 @@ inline scalar_type minQuotient(const vector_type& num, const vector_type& den) Kokkos::parallel_reduce( "minQuotient", Kokkos::RangePolicy(0, N), KOKKOS_LAMBDA(const local_ordinal_type& i, scalar_type& local_min) { - if (den_1d(i) != zero) min_reducer.join(local_min, num_1d(i) / den_1d(i)); + if (den_1d(i) != static_cast(0.0)) + min_reducer.join(local_min, num_1d(i) / den_1d(i)); }, min_reducer); @@ -458,7 +462,7 @@ inline scalar_type dotProdLocal(const vector_type& x, const vector_type& y) auto y_1d = Kokkos::subview(y_2d, Kokkos::ALL(), 0); #endif - scalar_type sum = zero; + scalar_type sum = static_cast(0.0); Kokkos::parallel_reduce( "dotProdLocal", Kokkos::RangePolicy(0, N), KOKKOS_LAMBDA(const local_ordinal_type& i, scalar_type& local_sum) { @@ -549,7 +553,7 @@ inline mag_type L1NormLocal(const vector_type& x) auto x_1d = Kokkos::subview(x_2d, Kokkos::ALL(), 0); #endif - mag_type sum = zero; + mag_type sum = static_cast(0.0); Kokkos::parallel_reduce( "L1NormLocal", Kokkos::RangePolicy(0, N), KOKKOS_LAMBDA(const local_ordinal_type& i, mag_type& local_sum) { @@ -582,7 +586,7 @@ inline mag_type WSqrSumLocal(const vector_type& x, const vector_type& w) auto w_1d = Kokkos::subview(w_2d, Kokkos::ALL(), 0); #endif - mag_type sum = zero; + mag_type sum = static_cast(0.0); Kokkos::parallel_reduce( "WSqrSumLocal", Kokkos::RangePolicy(0, N), KOKKOS_LAMBDA(const local_ordinal_type& i, mag_type& local_sum) { @@ -622,11 +626,12 @@ inline mag_type WSqrSumMaskLocal(const vector_type& x, const vector_type& w, auto id_1d = Kokkos::subview(id_2d, Kokkos::ALL(), 0); #endif - mag_type sum = zero; + mag_type sum = static_cast(0.0); Kokkos::parallel_reduce( "WSqrSumMaskLocal", Kokkos::RangePolicy(0, N), KOKKOS_LAMBDA(const local_ordinal_type& i, mag_type& local_sum) { - if (id_1d(i) > zero) local_sum += x_1d(i) * w_1d(i) * (x_1d(i) * w_1d(i)); + if (id_1d(i) > static_cast(0.0)) + local_sum += x_1d(i) * w_1d(i) * (x_1d(i) * w_1d(i)); }, sum); @@ -663,12 +668,15 @@ inline bool invTestLocal(const vector_type& x, vector_type& z) Kokkos::parallel_reduce( "invTestLocal", Kokkos::RangePolicy(0, N), KOKKOS_LAMBDA(const local_ordinal_type& i, scalar_type& local_min) { - if (x_1d(i) == zero) { min_reducer.join(local_min, zero); } - else { z_1d(i) = one / x_1d(i); } + if (x_1d(i) == static_cast(0.0)) + { + min_reducer.join(local_min, static_cast(0.0)); + } + else { z_1d(i) = static_cast(1.0) / x_1d(i); } }, min_reducer); - return (minimum > half); + return (minimum > static_cast(0.5)); } /// MPI task-local constraint violation check @@ -700,18 +708,21 @@ inline bool constraintMaskLocal(const vector_type& c, const vector_type& x, auto m_1d = Kokkos::subview(m_2d, Kokkos::ALL(), 0); #endif - mag_type sum = zero; + mag_type sum = static_cast(0.0); Kokkos::parallel_reduce( "constraintMaskLocal", Kokkos::RangePolicy(0, N), KOKKOS_LAMBDA(const local_ordinal_type& i, mag_type& local_sum) { - const bool test = (std::abs(c_1d(i)) > onept5 && c_1d(i) * x_1d(i) <= zero) || - (std::abs(c_1d(i)) > half && c_1d(i) * x_1d(i) < zero); - m_1d(i) = test ? one : zero; + const bool test = (std::abs(c_1d(i)) > static_cast(1.5) && + c_1d(i) * x_1d(i) <= static_cast(0.0)) || + (std::abs(c_1d(i)) > static_cast(0.5) && + c_1d(i) * x_1d(i) < static_cast(0.0)); + m_1d(i) = test ? static_cast(1.0) + : static_cast(0.0); local_sum += m_1d(i); }, sum); - return (sum < half); + return (sum < static_cast(0.5)); } /// MPI task-local minimum quotient: min_i(num(i)/den(i)) @@ -745,7 +756,8 @@ inline scalar_type minQuotientLocal(const vector_type& num, const vector_type& d Kokkos::parallel_reduce( "minQuotient", Kokkos::RangePolicy(0, N), KOKKOS_LAMBDA(const local_ordinal_type& i, scalar_type& local_min) { - if (den_1d(i) != zero) min_reducer.join(local_min, num_1d(i) / den_1d(i)); + if (den_1d(i) != static_cast(0.0)) + min_reducer.join(local_min, num_1d(i) / den_1d(i)); }, min_reducer); diff --git a/include/sundials/sundials_config.in b/include/sundials/sundials_config.in index def1a87414..35422a73a6 100644 --- a/include/sundials/sundials_config.in +++ b/include/sundials/sundials_config.in @@ -144,6 +144,9 @@ /* HYPRE */ #cmakedefine SUNDIALS_HYPRE_ENABLED #define SUN_HYPRE_VERSION "@HYPRE_VERSION@" +#define SUN_HYPRE_VERSION_MAJOR @HYPRE_VERSION_MAJOR@ +#define SUN_HYPRE_VERSION_MINOR @HYPRE_VERSION_MINOR@ +#define SUN_HYPRE_VERSION_PATCH @HYPRE_VERSION_PATCH@ /* KLU */ #cmakedefine SUNDIALS_KLU_ENABLED diff --git a/include/sunlinsol/sunlinsol_klu.h b/include/sunlinsol/sunlinsol_klu.h index cdedc9d1d3..9c52c77c8f 100644 --- a/include/sunlinsol/sunlinsol_klu.h +++ b/include/sunlinsol/sunlinsol_klu.h @@ -84,9 +84,14 @@ extern "C" { /* Create a typedef for the KLU solver function pointer to suppress compiler * warning messages about sunindextype vs internal KLU index types. */ +#if SUITESPARSE_MAIN_VERSION >= 6 +typedef int (*KLUSolveFn)(sun_klu_symbolic*, sun_klu_numeric*, sunindextype, + sunindextype, double*, sun_klu_common*); +#else typedef sunindextype (*KLUSolveFn)(sun_klu_symbolic*, sun_klu_numeric*, sunindextype, sunindextype, double*, sun_klu_common*); +#endif struct _SUNLinearSolverContent_KLU { diff --git a/include/sunmatrix/sunmatrix_ginkgo.hpp b/include/sunmatrix/sunmatrix_ginkgo.hpp index bc9ce0ab7d..d21e400643 100644 --- a/include/sunmatrix/sunmatrix_ginkgo.hpp +++ b/include/sunmatrix/sunmatrix_ginkgo.hpp @@ -324,8 +324,14 @@ void Matvec(Matrix& A, N_Vector x, N_Vector y) template void ScaleAdd(const sunrealtype c, Matrix& A, Matrix& B) { +#if GKO_VERSION_MAJOR > 1 || (GKO_VERSION_MAJOR == 1 && GKO_VERSION_MINOR >= 8) + // Identity constructor always creates a square matrix + const auto I{ + gko::matrix::Identity::create(A.GkoExec(), A.GkoSize()[1])}; +#else const auto I{ gko::matrix::Identity::create(A.GkoExec(), A.GkoSize())}; +#endif const auto one{gko::initialize({1.0}, A.GkoExec())}; const auto cmat{gko::initialize({c}, A.GkoExec())}; // A = B + cA diff --git a/src/arkode/arkode.c b/src/arkode/arkode.c index 1473b8f204..be15bd2b2f 100644 --- a/src/arkode/arkode.c +++ b/src/arkode/arkode.c @@ -3536,7 +3536,8 @@ void arkProcessError(ARKodeMem ark_mem, int error_code, int line, /* Compose the message */ va_start(ap, msgfmt); - size_t msglen = vsnprintf(NULL, 0, msgfmt, ap) + 1; + size_t msglen = 1; + if (msgfmt) { msglen += vsnprintf(NULL, 0, msgfmt, ap); } va_end(ap); char* msg = (char*)malloc(msglen); diff --git a/src/cvode/cvode.c b/src/cvode/cvode.c index 3dc22b9a40..8b5e62b22d 100644 --- a/src/cvode/cvode.c +++ b/src/cvode/cvode.c @@ -4815,7 +4815,8 @@ void cvProcessError(CVodeMem cv_mem, int error_code, int line, const char* func, /* Compose the message */ va_start(ap, msgfmt); - size_t msglen = vsnprintf(NULL, 0, msgfmt, ap) + 1; + size_t msglen = 1; + if (msgfmt) { msglen += vsnprintf(NULL, 0, msgfmt, ap); } va_end(ap); char* msg = (char*)malloc(msglen); diff --git a/src/cvodes/cvodes.c b/src/cvodes/cvodes.c index 5350674269..1966d560c7 100644 --- a/src/cvodes/cvodes.c +++ b/src/cvodes/cvodes.c @@ -9914,7 +9914,8 @@ void cvProcessError(CVodeMem cv_mem, int error_code, int line, const char* func, /* Compose the message */ va_start(ap, msgfmt); - size_t msglen = vsnprintf(NULL, 0, msgfmt, ap) + 1; + size_t msglen = 1; + if (msgfmt) { msglen += vsnprintf(NULL, 0, msgfmt, ap); } va_end(ap); char* msg = (char*)malloc(msglen); diff --git a/src/ida/ida.c b/src/ida/ida.c index a349b63bb0..c532e2c7a5 100644 --- a/src/ida/ida.c +++ b/src/ida/ida.c @@ -3998,7 +3998,8 @@ void IDAProcessError(IDAMem IDA_mem, int error_code, int line, const char* func, /* Compose the message */ va_start(ap, msgfmt); - size_t msglen = vsnprintf(NULL, 0, msgfmt, ap) + 1; + size_t msglen = 1; + if (msgfmt) { msglen += vsnprintf(NULL, 0, msgfmt, ap); } va_end(ap); char* msg = (char*)malloc(msglen); diff --git a/src/idas/idas.c b/src/idas/idas.c index 3702dc6963..05f5c976cf 100644 --- a/src/idas/idas.c +++ b/src/idas/idas.c @@ -8763,7 +8763,8 @@ void IDAProcessError(IDAMem IDA_mem, int error_code, int line, const char* func, /* Compose the message */ va_start(ap, msgfmt); - size_t msglen = vsnprintf(NULL, 0, msgfmt, ap) + 1; + size_t msglen = 1; + if (msgfmt) { msglen += vsnprintf(NULL, 0, msgfmt, ap); } va_end(ap); char* msg = (char*)malloc(msglen); diff --git a/src/kinsol/kinsol.c b/src/kinsol/kinsol.c index d35c9b3393..cc3081e7b5 100644 --- a/src/kinsol/kinsol.c +++ b/src/kinsol/kinsol.c @@ -2571,7 +2571,8 @@ void KINProcessError(KINMem kin_mem, int error_code, int line, const char* func, /* Compose the message */ va_start(ap, msgfmt); - size_t msglen = vsnprintf(NULL, 0, msgfmt, ap) + 1; + size_t msglen = 1; + if (msgfmt) { msglen += vsnprintf(NULL, 0, msgfmt, ap); } va_end(ap); char* msg = (char*)malloc(msglen); diff --git a/src/nvector/trilinos/CMakeLists.txt b/src/nvector/trilinos/CMakeLists.txt index d2d119cb3e..dfe25d87ab 100644 --- a/src/nvector/trilinos/CMakeLists.txt +++ b/src/nvector/trilinos/CMakeLists.txt @@ -16,22 +16,13 @@ install(CODE "MESSAGE(\"\nInstall NVECTOR_Trilinos\n\")") -# Set Trilinos compilers/flags -set(CMAKE_CXX_COMPILER ${Trilinos_INTERFACE_CXX_COMPILER}) -set(CMAKE_C_COMPILER ${Trilinos_INTERFACE_C_COMPILER}) -set(CMAKE_CXX_FLAGS - "${CMAKE_CXX_FLAGS} ${Trilinos_INTERFACE_CXX_COMPILER_FLAGS}") -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${Trilinos_INTERFACE_C_COMPILER_FLAGS}") - # Create the library sundials_add_library( sundials_nvectrilinos SOURCES nvector_trilinos.cpp HEADERS ${SUNDIALS_SOURCE_DIR}/include/nvector/nvector_trilinos.h INCLUDE_SUBDIR nvector - LINK_LIBRARIES PUBLIC sundials_core - OBJECT_LIBRARIES - LINK_LIBRARIES PUBLIC SUNDIALS::TRILINOS + LINK_LIBRARIES PUBLIC sundials_core Tpetra::all_libs OUTPUT_NAME sundials_nvectrilinos VERSION ${nveclib_VERSION} SOVERSION ${nveclib_SOVERSION}) diff --git a/src/nvector/trilinos/nvector_trilinos.cpp b/src/nvector/trilinos/nvector_trilinos.cpp index 880bb33c95..85381e0850 100644 --- a/src/nvector/trilinos/nvector_trilinos.cpp +++ b/src/nvector/trilinos/nvector_trilinos.cpp @@ -238,7 +238,7 @@ void N_VSpace_Trilinos(N_Vector x, sunindextype* lrw, sunindextype* liw) /* * MPI communicator accessor */ -SUNComm N_VGetCommunicator_Trilinos(N_Vector x) +SUNComm N_VGetCommunicator_Trilinos(SUNDIALS_MAYBE_UNUSED N_Vector x) { #ifdef SUNDIALS_TRILINOS_HAVE_MPI Teuchos::RCP xv = N_VGetVector_Trilinos(x); diff --git a/test/answers b/test/answers index 6426658117..c9da3649ff 160000 --- a/test/answers +++ b/test/answers @@ -1 +1 @@ -Subproject commit 64266581174b2a2c31283e82f5d28ea5683f6bce +Subproject commit c9da3649ffcf693b0a6f8c12690e42ef83993bdd diff --git a/test/env/default.sh b/test/env/default.sh index 4f72c3f7f5..6ca282cb07 100644 --- a/test/env/default.sh +++ b/test/env/default.sh @@ -14,35 +14,11 @@ # ------------------------------------------------------------------------------ # Script that sets up the default SUNDIALS testing environment. # -# Usage: source default.sh -# -# Optional Inputs: -# = Compiler to build sundials with: -# gcc@4.9.4 -# = SUNDIALS build type: -# dbg : debug build -# opt : optimized build +# Usage: source default.sh # ------------------------------------------------------------------------------ echo "./default.sh $*" | tee -a setup_env.log -# set defaults for optional inputs -compiler="gcc@5.5.0" # compiler spec -bldtype="dbg" # build type dbg = debug or opt = optimized - -# set optional inputs if provided -if [ "$#" -gt 0 ]; then - compiler=$1 -fi - -if [ "$#" -gt 1 ]; then - bldtype=$2 -fi - -# get compiler name and version from spec -compilername="${compiler%%@*}" -compilerversion="${compiler##*@}" - # ------------------------------------------------------------------------------ # Check input values # ------------------------------------------------------------------------------ @@ -63,22 +39,6 @@ case "$SUNDIALS_INDEX_SIZE" in ;; esac -case "$compiler" in - gcc@5.5.0) ;; - *) - echo "ERROR: Unknown compiler spec: $compiler" - return 1 - ;; -esac - -case "$bldtype" in - dbg|opt) ;; - *) - echo "ERROR: Unknown build type: $bldtype" - return 1 - ;; -esac - # ------------------------------------------------------------------------------ # Setup environment # ------------------------------------------------------------------------------ @@ -86,77 +46,40 @@ esac # set file permissions (rwxrwxr-x) umask 002 -# path to shared installs -APPROOT=/usr/casc/sundials/share - # setup the python environment -source ${APPROOT}/python-venv/sundocs/bin/activate +source /usr/local/suntest/pyevn/sundials/bin/activate # setup spack -export SPACK_ROOT=${APPROOT}/sundials-tpls-spack-v0.18.1/spack - -# shellcheck disable=SC1090 +export SPACK_ROOT=/usr/local/suntest/spack source ${SPACK_ROOT}/share/spack/setup-env.sh -# load compiler -spack load "${compiler}" - -# make sure spack knows about the compiler -spack compiler find - -spack load cmake@3.18.6 - # add CUDA -if [[ ":${PATH}:" != *":/usr/local/cuda-11.5/bin:"* ]]; then - export PATH="/usr/local/cuda-11.5/bin${PATH:+:${PATH}}" +export CUDAARCHS=60 + +if [[ ":${PATH}:" != *":/usr/local/cuda/bin:"* ]]; then + export PATH="/usr/local/cuda/bin${PATH:+:${PATH}}" fi -if [[ ":${LD_LIBRARY_PATH}:" != *":/usr/local/cuda-11.5/lib64:"* ]]; then - export LD_LIBRARY_PATH="/usr/local/cuda-11.5/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}" +if [[ ":${LD_LIBRARY_PATH}:" != *":/usr/local/cuda/lib64:"* ]]; then + export LD_LIBRARY_PATH="/usr/local/cuda/lib64${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}" fi +# load CMake +spack load cmake@3.18.6 + # ------------------------------------------------------------------------------ # Compilers and flags # ------------------------------------------------------------------------------ -if [ "$compilername" == "gcc" ]; then - - COMPILER_ROOT="$(spack location -i "$compiler")" - export CC="${COMPILER_ROOT}/bin/gcc" - export CXX="${COMPILER_ROOT}/bin/g++" - export FC="${COMPILER_ROOT}/bin/gfortran" - - # optimization flags - if [ "$bldtype" == "dbg" ]; then - export CFLAGS="-g -O0" - export CXXFLAGS="-g -O0" - export FFLAGS="-g -O0" - export CUDAFLAGS="-g -O0" - else - export CFLAGS="-g -O3" - export CXXFLAGS="-g -O3" - export FFLAGS="-g -O3" - export CUDAFLAGS="-g -O3" - fi - -else - - COMPILER_ROOT="$(spack location -i "llvm@$compilerversion")" - export CC="${COMPILER_ROOT}/bin/clang" - export CXX="${COMPILER_ROOT}/bin/clang++" - - # optimization flags - if [ "$bldtype" == "dbg" ]; then - export CFLAGS="-g -O0" - export CXXFLAGS="-g -O0" - export CUDAFLAGS="-g -O0" - else - export CFLAGS="-g -O3" - export CXXFLAGS="-g -O3" - export CUDAFLAGS="-g -O3" - fi +export CC="$(which gcc)" +export CXX="$(which g++)" +export FC="$(which gfortran)" -fi +# disable optimization +export CFLAGS="-O0" +export CXXFLAGS="-O0" +export FFLAGS="-O0" +export CUDAFLAGS="-O0" # ------------------------------------------------------------------------------ # SUNDIALS Options @@ -180,12 +103,8 @@ export SUNDIALS_IDAS=ON export SUNDIALS_KINSOL=ON # Fortran interface status -if [ "$compilername" == "gcc" ]; then - if [[ ("$SUNDIALS_PRECISION" == "double") ]]; then - export SUNDIALS_FMOD_INTERFACE=ON - else - export SUNDIALS_FMOD_INTERFACE=OFF - fi +if [[ ("$SUNDIALS_PRECISION" == "double") ]]; then + export SUNDIALS_FMOD_INTERFACE=ON else export SUNDIALS_FMOD_INTERFACE=OFF fi @@ -238,7 +157,6 @@ export SUNDIALS_OPENMP_OFFLOAD=OFF if [ "$SUNDIALS_PRECISION" != "extended" ]; then export SUNDIALS_CUDA=ON - export CUDAARCHS=60 export SUNDIALS_FUSED_KERNELS=ON else export SUNDIALS_CUDA=OFF @@ -249,7 +167,7 @@ fi # MPI # --- -MPI_ROOT="$(spack location -i openmpi@4.1.3 % "$compiler")" +MPI_ROOT="$(spack location -i openmpi@5.0.5)" export SUNDIALS_MPI=ON export MPICC="${MPI_ROOT}/bin/mpicc" @@ -264,9 +182,9 @@ export MPIEXEC="${MPI_ROOT}/bin/mpirun" if [ "$SUNDIALS_PRECISION" != "extended" ]; then export SUNDIALS_LAPACK=ON if [ "$SUNDIALS_INDEX_SIZE" == "32" ]; then - LAPACK_ROOT="$(spack location -i openblas@0.3.20 ~ilp64 %"$compiler")" + LAPACK_ROOT="$(spack location -i openblas@0.3.27 ~ilp64)" else - LAPACK_ROOT="$(spack location -i openblas@0.3.20 +ilp64 %"$compiler")" + LAPACK_ROOT="$(spack location -i openblas@0.3.27 +ilp64)" fi export LAPACK_LIBRARIES="${LAPACK_ROOT}/lib/libopenblas.so" else @@ -281,9 +199,9 @@ fi if [ "$SUNDIALS_PRECISION" == "double" ]; then export SUNDIALS_KLU=ON if [ "$SUNDIALS_INDEX_SIZE" == "32" ]; then - SUITE_SPARSE_ROOT="$(spack location -i suite-sparse@5.10.1 ^openblas ~ilp64 %"$compiler")" + SUITE_SPARSE_ROOT="$(spack location -i suite-sparse@7.7.0 ^openblas ~ilp64)" else - SUITE_SPARSE_ROOT="$(spack location -i suite-sparse@5.10.1 ^openblas +ilp64 %"$compiler")" + SUITE_SPARSE_ROOT="$(spack location -i suite-sparse@7.7.0 ^openblas +ilp64)" fi export SUITE_SPARSE_INCLUDE_DIR="${SUITE_SPARSE_ROOT}/include" export SUITE_SPARSE_LIBRARY_DIR="${SUITE_SPARSE_ROOT}/lib" @@ -297,11 +215,10 @@ fi # ------ if [ "$SUNDIALS_PRECISION" != "extended" ]; then - # @develop install is GitHub hash 4c3320c9c4e116a2d5aedf9d042b36d1f327a217 if [ "$SUNDIALS_CUDA" == "ON" ]; then if [ "$SUNDIALS_INDEX_SIZE" == "32" ]; then export SUNDIALS_GINKGO=ON - export GINKGO_ROOT="$(spack location -i ginkgo@develop +cuda %"$compiler")" + export GINKGO_ROOT="$(spack location -i ginkgo@1.8.0 +cuda)" export GINKGO_BACKENDS="REF;OMP;CUDA" else export SUNDIALS_GINKGO=OFF @@ -310,7 +227,7 @@ if [ "$SUNDIALS_PRECISION" != "extended" ]; then fi else export SUNDIALS_GINKGO=ON - export GINKGO_ROOT="$(spack location -i ginkgo@develop ~cuda %"$compiler")" + export GINKGO_ROOT="$(spack location -i ginkgo@1.8.0 ~cuda)" export GINKGO_BACKENDS="REF;OMP" fi else @@ -319,15 +236,13 @@ else unset GINKGO_BACKENDS fi - # ------ # Kokkos # ------ -# @master install is 3.7.00 = 61d7db55fceac3318c987a291f77b844fd94c165 if [ "$SUNDIALS_PRECISION" == "double" ]; then export SUNDIALS_KOKKOS=ON - export KOKKOS_ROOT="$(spack location -i kokkos@master %"$compiler")" + export KOKKOS_ROOT="$(spack location -i kokkos@4.3.01 ~cuda)" else export SUNDIALS_KOKKOS=OFF unset KOKKOS_ROOT @@ -337,10 +252,9 @@ fi # Kokkos-Kernels # -------------- -# @master install is 3.7.00 = 04821ac3bb916b19fad6b3dabc1f4b9e1049aa0e if [ "$SUNDIALS_PRECISION" == "double" ]; then export SUNDIALS_KOKKOS_KERNELS=ON - export KOKKOS_KERNELS_ROOT="$(spack location -i kokkos-kernels@master %"$compiler")" + export KOKKOS_KERNELS_ROOT="$(spack location -i kokkos-kernels@4.3.01 ~cuda)" else export SUNDIALS_KOKKOS_KERNELS=OFF unset KOKKOS_KERNELS_ROOT @@ -354,9 +268,7 @@ if [ "$SUNDIALS_PRECISION" != "extended" ] && \ [ "$SUNDIALS_INDEX_SIZE" == "32" ] && \ [ "$SUNDIALS_CUDA" == "ON" ]; then export SUNDIALS_MAGMA=ON - # Bug in magma@2.6.2 causes tests to fail with certain system sizes - #export MAGMA_ROOT="$(spack location -i magma@2.6.2 +cuda %"$compiler")" - export MAGMA_ROOT="$(spack location -i magma@2.6.1 +cuda %"$compiler")" + export MAGMA_ROOT="$(spack location -i magma@2.8.0 +cuda)" export MAGMA_BACKENDS="CUDA" else export SUNDIALS_MAGMA=OFF @@ -370,10 +282,12 @@ fi if [ "$SUNDIALS_PRECISION" != "extended" ]; then export SUNDIALS_SUPERLU_MT=ON + # Using @master (sha 9e23fe72652afc28c97829e69e7c6966050541a7) as it + # additional fixes necessary for building with newer versions of GCC if [ "$SUNDIALS_INDEX_SIZE" == "32" ]; then - SUPERLU_MT_ROOT="$(spack location -i superlu-mt@3.1 ~int64 %"$compiler")" + SUPERLU_MT_ROOT="$(spack location -i superlu-mt@master ~int64)" else - SUPERLU_MT_ROOT="$(spack location -i superlu-mt@3.1 +int64 %"$compiler")" + SUPERLU_MT_ROOT="$(spack location -i superlu-mt@master +int64)" fi export SUPERLU_MT_INCLUDE_DIR="${SUPERLU_MT_ROOT}/include" export SUPERLU_MT_LIBRARY_DIR="${SUPERLU_MT_ROOT}/lib" @@ -395,9 +309,9 @@ fi if [ "$SUNDIALS_PRECISION" == "double" ]; then export SUNDIALS_SUPERLU_DIST=ON if [ "$SUNDIALS_INDEX_SIZE" == "32" ]; then - export SUPERLU_DIST_ROOT="$(spack location -i superlu-dist@7.2.0 ~int64 ~cuda %"$compiler")" + export SUPERLU_DIST_ROOT="$(spack location -i superlu-dist@8.2.1 ~int64 ~cuda)" else - export SUPERLU_DIST_ROOT="$(spack location -i superlu-dist@7.2.0 +int64 ~cuda ^parmetis+int64 ^metis+int64 ^openblas~ilp64 %"$compiler")" + export SUPERLU_DIST_ROOT="$(spack location -i superlu-dist@8.2.1 +int64 ~cuda)" fi export SUPERLU_DIST_OPENMP=OFF else @@ -413,9 +327,9 @@ fi if [ "$SUNDIALS_PRECISION" == "double" ]; then export SUNDIALS_HYPRE=ON if [ "$SUNDIALS_INDEX_SIZE" == "32" ]; then - HYPRE_ROOT="$(spack location -i hypre@2.24.0 ~int64 ~cuda %"$compiler")" + HYPRE_ROOT="$(spack location -i hypre@2.31.0 ~int64 ~cuda)" else - HYPRE_ROOT="$(spack location -i hypre@2.24.0 +int64 ~cuda %"$compiler")" + HYPRE_ROOT="$(spack location -i hypre@2.31.0 +int64 ~cuda)" fi export HYPRE_INCLUDE_DIR="${HYPRE_ROOT}/include" export HYPRE_LIBRARY_DIR="${HYPRE_ROOT}/lib" @@ -432,9 +346,9 @@ fi if [ "$SUNDIALS_PRECISION" == "double" ]; then export SUNDIALS_PETSC=ON if [ "$SUNDIALS_INDEX_SIZE" == "32" ]; then - PETSC_ROOT="$(spack location -i petsc@3.17.1 +double ~int64 ~cuda %"$compiler")" + PETSC_ROOT="$(spack location -i petsc@3.21.4 +double ~int64 ~cuda)" else - PETSC_ROOT="$(spack location -i petsc@3.17.1 +double +int64 ~cuda %"$compiler")" + PETSC_ROOT="$(spack location -i petsc@3.21.4 +double +int64 ~cuda)" fi export PETSC_ROOT else @@ -449,9 +363,9 @@ fi if [ "$SUNDIALS_PRECISION" == "double" ] && [ "$SUNDIALS_INDEX_SIZE" == "32" ]; then export SUNDIALS_TRILINOS=ON if [ "$SUNDIALS_INDEX_SIZE" == "32" ]; then - TRILINOS_ROOT="$(spack location -i trilinos@13.0.1 gotype=int ~cuda %"$compiler")" + TRILINOS_ROOT="$(spack location -i trilinos@16.0.0 gotype=int ~cuda)" else - TRILINOS_ROOT="$(spack location -i trilinos@13.0.1 gotype=long_long ~cuda %"$compiler")" + TRILINOS_ROOT="$(spack location -i trilinos@16.0.0 gotype=long_long ~cuda)" fi export TRILINOS_ROOT else @@ -465,10 +379,10 @@ fi if [ "$SUNDIALS_PRECISION" == "double" ]; then export SUNDIALS_RAJA=ON - export RAJA_ROOT="$(spack location -i raja@2022.03.1 ~openmp +cuda %"$compiler")" + export RAJA_ROOT="$(spack location -i raja@2024.02.2 +cuda)" export RAJA_BACKENDS="CUDA" # RAJA does not find camp on its own? - export camp_ROOT="$(spack location -i camp@2022.03.2 +cuda %"$compiler")" + export camp_ROOT="$(spack location -i camp@2024.02.1 +cuda)" else export SUNDIALS_RAJA=OFF unset RAJA_ROOT @@ -482,7 +396,7 @@ fi if [ "$SUNDIALS_PRECISION" == "double" ] && [ "$SUNDIALS_INDEX_SIZE" == "32" ]; then export SUNDIALS_XBRAID=ON - export XBRAID_ROOT="$(spack location -i xbraid@3.0.0 %"$compiler")" + export XBRAID_ROOT="$(spack location -i xbraid@3.0.0)" else export SUNDIALS_XBRAID=OFF unset XBRAID_ROOT diff --git a/test/env/docker.sh b/test/env/docker.sh index 3d235839ce..0645ccbfed 100644 --- a/test/env/docker.sh +++ b/test/env/docker.sh @@ -339,7 +339,7 @@ fi # -------- if [ "$SUNDIALS_PRECISION" == "double" ] && [ "$SUNDIALS_INDEX_SIZE" == "32" ]; then - export SUNDIALS_TRILINOS=ON + export SUNDIALS_TRILINOS=OFF export TRILINOS_ROOT=/opt/view else export SUNDIALS_TRILINOS=OFF diff --git a/test/jenkins/README.md b/test/jenkins/README.md index 5d51bc531a..ebefb998a9 100644 --- a/test/jenkins/README.md +++ b/test/jenkins/README.md @@ -127,8 +127,8 @@ and end of a collapsible section. enter/do the following: Section name: {1} - Section starts with: START TEST - Section ends with: (PASSED|FAILED) + Section starts with: TEST: (.*) + Section ends with: (PASSED|FAILED): (.*) Check the box next to "Collapse Sections by default" 7. To create a INSTALLING section, click on "Add Console Section" and diff --git a/test/unit_tests/arkode/C_serial/ark_test_reset.c b/test/unit_tests/arkode/C_serial/ark_test_reset.c index 529a3d62cf..537adbf978 100644 --- a/test/unit_tests/arkode/C_serial/ark_test_reset.c +++ b/test/unit_tests/arkode/C_serial/ark_test_reset.c @@ -498,8 +498,8 @@ static int check_ans(N_Vector y, sunrealtype t, sunrealtype rtol, sunrealtype at /* compute solution error */ ans = ytrue(t); - ewt = SUN_RCONST(1.0) / (rtol * fabs(ans) + atol); - err = ewt * fabs(NV_Ith_S(y, 0) - ans); + ewt = SUN_RCONST(1.0) / (rtol * SUNRabs(ans) + atol); + err = ewt * SUNRabs(NV_Ith_S(y, 0) - ans); /* is the solution within the tolerances? */ passfail = (err < SUN_RCONST(1.0)) ? 0 : 1; diff --git a/test/unit_tests/cvode/CXX_serial/cv_test_kpr.out b/test/unit_tests/cvode/CXX_serial/cv_test_kpr.out index c4664a2deb..cafa9f1252 100644 --- a/test/unit_tests/cvode/CXX_serial/cv_test_kpr.out +++ b/test/unit_tests/cvode/CXX_serial/cv_test_kpr.out @@ -2,32 +2,32 @@ ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00 1.127017686767897e+00 1.551821503613988e+00 7.858534767146708e-06 2.188323338225828e-05 - 2.000000000000000e+00 8.899103332792471e-01 1.154608370771088e+00 7.764608704996512e-06 2.535584849794326e-05 - 3.000000000000000e+00 7.106411292975151e-01 1.023536808224800e+00 4.969438071045218e-06 1.982273562739501e-05 - 4.000000000000000e+00 8.204838923453025e-01 1.374669642759487e+00 9.523721763993187e-06 3.778071025029028e-05 - 5.000000000000000e+00 1.068571738765126e+00 1.691858739922128e+00 6.769878529766515e-06 1.983734077248833e-05 - 6.000000000000000e+00 1.216596138753578e+00 1.677586205148419e+00 8.639506119845208e-06 3.412830354121432e-05 - 7.000000000000000e+00 1.173445555523058e+00 1.342501389353217e+00 9.947075942040584e-06 4.601728465791766e-05 - 8.000000000000000e+00 9.629437694992675e-01 1.012111079263365e+00 5.566344104868115e-06 9.141468324536106e-07 - 9.000000000000000e+00 7.378567118749449e-01 1.183847487150188e+00 1.586890923443995e-06 1.903021658944404e-05 - 1.000000000000000e+01 7.618782369340520e-01 1.577065913116525e+00 3.798201160920556e-06 1.609965484838938e-05 + 2.000000000000000e+00 8.899103332791866e-01 1.154608370768354e+00 7.764608644489357e-06 2.535584576346395e-05 + 3.000000000000000e+00 7.106410660756778e-01 1.023529279576880e+00 4.906216233724336e-06 1.229408770742069e-05 + 4.000000000000000e+00 8.204730617922310e-01 1.374621086116680e+00 1.306831307501533e-06 1.077593255716103e-05 + 5.000000000000000e+00 1.068564764620663e+00 1.691839212204075e+00 2.042659332790464e-07 3.096227194632206e-07 + 6.000000000000000e+00 1.216586539798704e+00 1.677542924381987e+00 9.594487537789576e-07 9.152462890238411e-06 + 7.000000000000000e+00 1.173434026092493e+00 1.342453786414837e+00 1.582354622442494e-06 1.585653721880576e-06 + 8.000000000000000e+00 9.629416122015924e-01 1.012142316337908e+00 3.409046429703189e-06 3.032292771099065e-05 + 9.000000000000000e+00 7.378651980553826e-01 1.183892379308912e+00 6.899289514250562e-06 2.586194213471948e-05 + 1.000000000000000e+01 7.618838841024592e-01 1.577079185839070e+00 1.848967246309563e-06 2.826932303578999e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00040955930806 -Steps = 1559 -Error test fails = 143 +Current time = 10.00136810102964 +Steps = 1577 +Error test fails = 147 NLS step fails = 0 Initial step size = 0.0001029860256095084 -Last step size = 0.006823439174537314 -Current step size = 0.006823439174537314 +Last step size = 0.006383607841908422 +Current step size = 0.006383607841908422 Last method order = 4 Current method order = 4 Stab. lim. order reductions = 0 -RHS fn evals = 2155 -NLS iters = 2152 +RHS fn evals = 2197 +NLS iters = 2194 NLS fails = 0 -NLS iters per step = 1.380372033354714 -LS setups = 266 -Jac fn evals = 28 +NLS iters per step = 1.391249207355739 +LS setups = 272 +Jac fn evals = 29 LS RHS fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.01301115241635688 +Jac evals per NLS iter = 0.01321786690975387 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--dgmax_jbad_1.0.out b/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--dgmax_jbad_1.0.out index c4664a2deb..cafa9f1252 100644 --- a/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--dgmax_jbad_1.0.out +++ b/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--dgmax_jbad_1.0.out @@ -2,32 +2,32 @@ ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00 1.127017686767897e+00 1.551821503613988e+00 7.858534767146708e-06 2.188323338225828e-05 - 2.000000000000000e+00 8.899103332792471e-01 1.154608370771088e+00 7.764608704996512e-06 2.535584849794326e-05 - 3.000000000000000e+00 7.106411292975151e-01 1.023536808224800e+00 4.969438071045218e-06 1.982273562739501e-05 - 4.000000000000000e+00 8.204838923453025e-01 1.374669642759487e+00 9.523721763993187e-06 3.778071025029028e-05 - 5.000000000000000e+00 1.068571738765126e+00 1.691858739922128e+00 6.769878529766515e-06 1.983734077248833e-05 - 6.000000000000000e+00 1.216596138753578e+00 1.677586205148419e+00 8.639506119845208e-06 3.412830354121432e-05 - 7.000000000000000e+00 1.173445555523058e+00 1.342501389353217e+00 9.947075942040584e-06 4.601728465791766e-05 - 8.000000000000000e+00 9.629437694992675e-01 1.012111079263365e+00 5.566344104868115e-06 9.141468324536106e-07 - 9.000000000000000e+00 7.378567118749449e-01 1.183847487150188e+00 1.586890923443995e-06 1.903021658944404e-05 - 1.000000000000000e+01 7.618782369340520e-01 1.577065913116525e+00 3.798201160920556e-06 1.609965484838938e-05 + 2.000000000000000e+00 8.899103332791866e-01 1.154608370768354e+00 7.764608644489357e-06 2.535584576346395e-05 + 3.000000000000000e+00 7.106410660756778e-01 1.023529279576880e+00 4.906216233724336e-06 1.229408770742069e-05 + 4.000000000000000e+00 8.204730617922310e-01 1.374621086116680e+00 1.306831307501533e-06 1.077593255716103e-05 + 5.000000000000000e+00 1.068564764620663e+00 1.691839212204075e+00 2.042659332790464e-07 3.096227194632206e-07 + 6.000000000000000e+00 1.216586539798704e+00 1.677542924381987e+00 9.594487537789576e-07 9.152462890238411e-06 + 7.000000000000000e+00 1.173434026092493e+00 1.342453786414837e+00 1.582354622442494e-06 1.585653721880576e-06 + 8.000000000000000e+00 9.629416122015924e-01 1.012142316337908e+00 3.409046429703189e-06 3.032292771099065e-05 + 9.000000000000000e+00 7.378651980553826e-01 1.183892379308912e+00 6.899289514250562e-06 2.586194213471948e-05 + 1.000000000000000e+01 7.618838841024592e-01 1.577079185839070e+00 1.848967246309563e-06 2.826932303578999e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00040955930806 -Steps = 1559 -Error test fails = 143 +Current time = 10.00136810102964 +Steps = 1577 +Error test fails = 147 NLS step fails = 0 Initial step size = 0.0001029860256095084 -Last step size = 0.006823439174537314 -Current step size = 0.006823439174537314 +Last step size = 0.006383607841908422 +Current step size = 0.006383607841908422 Last method order = 4 Current method order = 4 Stab. lim. order reductions = 0 -RHS fn evals = 2155 -NLS iters = 2152 +RHS fn evals = 2197 +NLS iters = 2194 NLS fails = 0 -NLS iters per step = 1.380372033354714 -LS setups = 266 -Jac fn evals = 28 +NLS iters per step = 1.391249207355739 +LS setups = 272 +Jac fn evals = 29 LS RHS fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.01301115241635688 +Jac evals per NLS iter = 0.01321786690975387 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--dgmax_lsetup_0.0.out b/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--dgmax_lsetup_0.0.out index c4664a2deb..cafa9f1252 100644 --- a/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--dgmax_lsetup_0.0.out +++ b/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--dgmax_lsetup_0.0.out @@ -2,32 +2,32 @@ ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00 1.127017686767897e+00 1.551821503613988e+00 7.858534767146708e-06 2.188323338225828e-05 - 2.000000000000000e+00 8.899103332792471e-01 1.154608370771088e+00 7.764608704996512e-06 2.535584849794326e-05 - 3.000000000000000e+00 7.106411292975151e-01 1.023536808224800e+00 4.969438071045218e-06 1.982273562739501e-05 - 4.000000000000000e+00 8.204838923453025e-01 1.374669642759487e+00 9.523721763993187e-06 3.778071025029028e-05 - 5.000000000000000e+00 1.068571738765126e+00 1.691858739922128e+00 6.769878529766515e-06 1.983734077248833e-05 - 6.000000000000000e+00 1.216596138753578e+00 1.677586205148419e+00 8.639506119845208e-06 3.412830354121432e-05 - 7.000000000000000e+00 1.173445555523058e+00 1.342501389353217e+00 9.947075942040584e-06 4.601728465791766e-05 - 8.000000000000000e+00 9.629437694992675e-01 1.012111079263365e+00 5.566344104868115e-06 9.141468324536106e-07 - 9.000000000000000e+00 7.378567118749449e-01 1.183847487150188e+00 1.586890923443995e-06 1.903021658944404e-05 - 1.000000000000000e+01 7.618782369340520e-01 1.577065913116525e+00 3.798201160920556e-06 1.609965484838938e-05 + 2.000000000000000e+00 8.899103332791866e-01 1.154608370768354e+00 7.764608644489357e-06 2.535584576346395e-05 + 3.000000000000000e+00 7.106410660756778e-01 1.023529279576880e+00 4.906216233724336e-06 1.229408770742069e-05 + 4.000000000000000e+00 8.204730617922310e-01 1.374621086116680e+00 1.306831307501533e-06 1.077593255716103e-05 + 5.000000000000000e+00 1.068564764620663e+00 1.691839212204075e+00 2.042659332790464e-07 3.096227194632206e-07 + 6.000000000000000e+00 1.216586539798704e+00 1.677542924381987e+00 9.594487537789576e-07 9.152462890238411e-06 + 7.000000000000000e+00 1.173434026092493e+00 1.342453786414837e+00 1.582354622442494e-06 1.585653721880576e-06 + 8.000000000000000e+00 9.629416122015924e-01 1.012142316337908e+00 3.409046429703189e-06 3.032292771099065e-05 + 9.000000000000000e+00 7.378651980553826e-01 1.183892379308912e+00 6.899289514250562e-06 2.586194213471948e-05 + 1.000000000000000e+01 7.618838841024592e-01 1.577079185839070e+00 1.848967246309563e-06 2.826932303578999e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00040955930806 -Steps = 1559 -Error test fails = 143 +Current time = 10.00136810102964 +Steps = 1577 +Error test fails = 147 NLS step fails = 0 Initial step size = 0.0001029860256095084 -Last step size = 0.006823439174537314 -Current step size = 0.006823439174537314 +Last step size = 0.006383607841908422 +Current step size = 0.006383607841908422 Last method order = 4 Current method order = 4 Stab. lim. order reductions = 0 -RHS fn evals = 2155 -NLS iters = 2152 +RHS fn evals = 2197 +NLS iters = 2194 NLS fails = 0 -NLS iters per step = 1.380372033354714 -LS setups = 266 -Jac fn evals = 28 +NLS iters per step = 1.391249207355739 +LS setups = 272 +Jac fn evals = 29 LS RHS fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.01301115241635688 +Jac evals per NLS iter = 0.01321786690975387 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_cf_0.5.out b/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_cf_0.5.out index c4664a2deb..cafa9f1252 100644 --- a/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_cf_0.5.out +++ b/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_cf_0.5.out @@ -2,32 +2,32 @@ ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00 1.127017686767897e+00 1.551821503613988e+00 7.858534767146708e-06 2.188323338225828e-05 - 2.000000000000000e+00 8.899103332792471e-01 1.154608370771088e+00 7.764608704996512e-06 2.535584849794326e-05 - 3.000000000000000e+00 7.106411292975151e-01 1.023536808224800e+00 4.969438071045218e-06 1.982273562739501e-05 - 4.000000000000000e+00 8.204838923453025e-01 1.374669642759487e+00 9.523721763993187e-06 3.778071025029028e-05 - 5.000000000000000e+00 1.068571738765126e+00 1.691858739922128e+00 6.769878529766515e-06 1.983734077248833e-05 - 6.000000000000000e+00 1.216596138753578e+00 1.677586205148419e+00 8.639506119845208e-06 3.412830354121432e-05 - 7.000000000000000e+00 1.173445555523058e+00 1.342501389353217e+00 9.947075942040584e-06 4.601728465791766e-05 - 8.000000000000000e+00 9.629437694992675e-01 1.012111079263365e+00 5.566344104868115e-06 9.141468324536106e-07 - 9.000000000000000e+00 7.378567118749449e-01 1.183847487150188e+00 1.586890923443995e-06 1.903021658944404e-05 - 1.000000000000000e+01 7.618782369340520e-01 1.577065913116525e+00 3.798201160920556e-06 1.609965484838938e-05 + 2.000000000000000e+00 8.899103332791866e-01 1.154608370768354e+00 7.764608644489357e-06 2.535584576346395e-05 + 3.000000000000000e+00 7.106410660756778e-01 1.023529279576880e+00 4.906216233724336e-06 1.229408770742069e-05 + 4.000000000000000e+00 8.204730617922310e-01 1.374621086116680e+00 1.306831307501533e-06 1.077593255716103e-05 + 5.000000000000000e+00 1.068564764620663e+00 1.691839212204075e+00 2.042659332790464e-07 3.096227194632206e-07 + 6.000000000000000e+00 1.216586539798704e+00 1.677542924381987e+00 9.594487537789576e-07 9.152462890238411e-06 + 7.000000000000000e+00 1.173434026092493e+00 1.342453786414837e+00 1.582354622442494e-06 1.585653721880576e-06 + 8.000000000000000e+00 9.629416122015924e-01 1.012142316337908e+00 3.409046429703189e-06 3.032292771099065e-05 + 9.000000000000000e+00 7.378651980553826e-01 1.183892379308912e+00 6.899289514250562e-06 2.586194213471948e-05 + 1.000000000000000e+01 7.618838841024592e-01 1.577079185839070e+00 1.848967246309563e-06 2.826932303578999e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00040955930806 -Steps = 1559 -Error test fails = 143 +Current time = 10.00136810102964 +Steps = 1577 +Error test fails = 147 NLS step fails = 0 Initial step size = 0.0001029860256095084 -Last step size = 0.006823439174537314 -Current step size = 0.006823439174537314 +Last step size = 0.006383607841908422 +Current step size = 0.006383607841908422 Last method order = 4 Current method order = 4 Stab. lim. order reductions = 0 -RHS fn evals = 2155 -NLS iters = 2152 +RHS fn evals = 2197 +NLS iters = 2194 NLS fails = 0 -NLS iters per step = 1.380372033354714 -LS setups = 266 -Jac fn evals = 28 +NLS iters per step = 1.391249207355739 +LS setups = 272 +Jac fn evals = 29 LS RHS fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.01301115241635688 +Jac evals per NLS iter = 0.01321786690975387 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_max_ef_0.1_--small_nef_1.out b/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_max_ef_0.1_--small_nef_1.out index 0a4e2b826b..0a14173f9d 100644 --- a/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_max_ef_0.1_--small_nef_1.out +++ b/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_max_ef_0.1_--small_nef_1.out @@ -2,32 +2,32 @@ ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00 1.127007526754027e+00 1.551798865570904e+00 2.301479103516968e-06 7.548097018528210e-07 - 2.000000000000000e+00 8.899039207780429e-01 1.154591213714133e+00 1.352107500851574e-06 8.198791543012618e-06 - 3.000000000000000e+00 7.106357482521893e-01 1.023517382507561e+00 4.116072547244443e-07 3.970183883872380e-07 - 4.000000000000000e+00 8.204798818139928e-01 1.374656498648397e+00 5.513190454276007e-06 2.463659915963312e-05 - 5.000000000000000e+00 1.068564963322506e+00 1.691834094334029e+00 5.564090299614577e-09 4.808247326515414e-06 - 6.000000000000000e+00 1.216591810654471e+00 1.677567596214340e+00 4.311407013402047e-06 1.551936946242449e-05 - 7.000000000000000e+00 1.173435748816172e+00 1.342473383443199e+00 1.403690566004201e-07 1.801137464019220e-05 - 8.000000000000000e+00 9.629391196580445e-01 1.012109414731435e+00 9.165028818092225e-07 2.578678761855357e-06 - 9.000000000000000e+00 7.378667583329571e-01 1.183902498984600e+00 8.459567088725528e-06 3.598161782281117e-05 - 1.000000000000000e+01 7.618881720180362e-01 1.577082165589996e+00 6.136882823248868e-06 1.528186226451567e-07 + 2.000000000000000e+00 8.899039207901290e-01 1.154591213259856e+00 1.352119586961464e-06 8.198337265508115e-06 + 3.000000000000000e+00 7.106357095240244e-01 1.023533553968366e+00 4.503354196216947e-07 1.656847919329074e-05 + 4.000000000000000e+00 8.204797090224738e-01 1.374674798175743e+00 5.340398935294033e-06 4.293612650640988e-05 + 5.000000000000000e+00 1.068568799206777e+00 1.691846388757366e+00 3.830320180586710e-06 7.486176010651491e-06 + 6.000000000000000e+00 1.216593431224251e+00 1.677563096846002e+00 5.931976793549509e-06 1.102000112496171e-05 + 7.000000000000000e+00 1.173436919049330e+00 1.342481412337947e+00 1.310602214310563e-06 2.604026938879400e-05 + 8.000000000000000e+00 9.629477831479546e-01 1.012160095609326e+00 9.579992791941550e-06 4.810219912920743e-05 + 9.000000000000000e+00 7.378633330120637e-01 1.183890879406442e+00 5.034246195356751e-06 2.436203966471595e-05 + 1.000000000000000e+01 7.618899385439418e-01 1.577125935900683e+00 7.903408728915373e-06 4.392312930967535e-05 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00451093359436 -Steps = 2207 -Error test fails = 185 +Current time = 10.00425372374186 +Steps = 2329 +Error test fails = 209 NLS step fails = 0 Initial step size = 0.0001029860256095084 -Last step size = 0.007683783711129318 -Current step size = 0.007683783711129318 +Last step size = 0.00604072055819684 +Current step size = 0.01119929556740219 Last method order = 4 -Current method order = 4 +Current method order = 5 Stab. lim. order reductions = 0 -RHS fn evals = 3004 -NLS iters = 3001 +RHS fn evals = 3188 +NLS iters = 3185 NLS fails = 0 -NLS iters per step = 1.359764386044404 -LS setups = 751 -Jac fn evals = 41 +NLS iters per step = 1.367539716616574 +LS setups = 823 +Jac fn evals = 43 LS RHS fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.01366211262912363 +Jac evals per NLS iter = 0.01350078492935636 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_max_fs_2.out b/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_max_fs_2.out index c4664a2deb..cafa9f1252 100644 --- a/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_max_fs_2.out +++ b/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_max_fs_2.out @@ -2,32 +2,32 @@ ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00 1.127017686767897e+00 1.551821503613988e+00 7.858534767146708e-06 2.188323338225828e-05 - 2.000000000000000e+00 8.899103332792471e-01 1.154608370771088e+00 7.764608704996512e-06 2.535584849794326e-05 - 3.000000000000000e+00 7.106411292975151e-01 1.023536808224800e+00 4.969438071045218e-06 1.982273562739501e-05 - 4.000000000000000e+00 8.204838923453025e-01 1.374669642759487e+00 9.523721763993187e-06 3.778071025029028e-05 - 5.000000000000000e+00 1.068571738765126e+00 1.691858739922128e+00 6.769878529766515e-06 1.983734077248833e-05 - 6.000000000000000e+00 1.216596138753578e+00 1.677586205148419e+00 8.639506119845208e-06 3.412830354121432e-05 - 7.000000000000000e+00 1.173445555523058e+00 1.342501389353217e+00 9.947075942040584e-06 4.601728465791766e-05 - 8.000000000000000e+00 9.629437694992675e-01 1.012111079263365e+00 5.566344104868115e-06 9.141468324536106e-07 - 9.000000000000000e+00 7.378567118749449e-01 1.183847487150188e+00 1.586890923443995e-06 1.903021658944404e-05 - 1.000000000000000e+01 7.618782369340520e-01 1.577065913116525e+00 3.798201160920556e-06 1.609965484838938e-05 + 2.000000000000000e+00 8.899103332791866e-01 1.154608370768354e+00 7.764608644489357e-06 2.535584576346395e-05 + 3.000000000000000e+00 7.106410660756778e-01 1.023529279576880e+00 4.906216233724336e-06 1.229408770742069e-05 + 4.000000000000000e+00 8.204730617922310e-01 1.374621086116680e+00 1.306831307501533e-06 1.077593255716103e-05 + 5.000000000000000e+00 1.068564764620663e+00 1.691839212204075e+00 2.042659332790464e-07 3.096227194632206e-07 + 6.000000000000000e+00 1.216586539798704e+00 1.677542924381987e+00 9.594487537789576e-07 9.152462890238411e-06 + 7.000000000000000e+00 1.173434026092493e+00 1.342453786414837e+00 1.582354622442494e-06 1.585653721880576e-06 + 8.000000000000000e+00 9.629416122015924e-01 1.012142316337908e+00 3.409046429703189e-06 3.032292771099065e-05 + 9.000000000000000e+00 7.378651980553826e-01 1.183892379308912e+00 6.899289514250562e-06 2.586194213471948e-05 + 1.000000000000000e+01 7.618838841024592e-01 1.577079185839070e+00 1.848967246309563e-06 2.826932303578999e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00040955930806 -Steps = 1559 -Error test fails = 143 +Current time = 10.00136810102964 +Steps = 1577 +Error test fails = 147 NLS step fails = 0 Initial step size = 0.0001029860256095084 -Last step size = 0.006823439174537314 -Current step size = 0.006823439174537314 +Last step size = 0.006383607841908422 +Current step size = 0.006383607841908422 Last method order = 4 Current method order = 4 Stab. lim. order reductions = 0 -RHS fn evals = 2155 -NLS iters = 2152 +RHS fn evals = 2197 +NLS iters = 2194 NLS fails = 0 -NLS iters per step = 1.380372033354714 -LS setups = 266 -Jac fn evals = 28 +NLS iters per step = 1.391249207355739 +LS setups = 272 +Jac fn evals = 29 LS RHS fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.01301115241635688 +Jac evals per NLS iter = 0.01321786690975387 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_min_ef_0.5.out b/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_min_ef_0.5.out index cc2f56d0f9..8d72a04472 100644 --- a/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_min_ef_0.5.out +++ b/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_min_ef_0.5.out @@ -1,32 +1,32 @@ t u v u err v err ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 - 1.000000000000000e+00 1.127015798965803e+00 1.551817101165368e+00 5.970732673166168e-06 1.748078476238035e-05 - 2.000000000000000e+00 8.899077623052392e-01 1.154605790521889e+00 5.193634697087113e-06 2.277559929919626e-05 - 3.000000000000000e+00 7.106404517217246e-01 1.023538681494556e+00 4.291862280569880e-06 2.169600538337590e-05 - 4.000000000000000e+00 8.204753960502632e-01 1.374635909783589e+00 1.027426724697911e-06 4.047734351475540e-06 - 5.000000000000000e+00 1.068564502769698e+00 1.691818039836895e+00 4.661168988562281e-07 2.086274445978198e-05 - 6.000000000000000e+00 1.216587851997169e+00 1.677546347146822e+00 3.527497114408362e-07 5.729698055789711e-06 - 7.000000000000000e+00 1.173437871476192e+00 1.342487857991437e+00 2.263029076576828e-06 3.248592287796725e-05 - 8.000000000000000e+00 9.629429628371622e-01 1.012128557748354e+00 4.759681999533250e-06 1.656433815688807e-05 - 9.000000000000000e+00 7.378705116374682e-01 1.183937587786273e+00 1.221287159980378e-05 7.107041949527826e-05 - 1.000000000000000e+01 7.618905380496568e-01 1.577089346437596e+00 8.502914443875298e-06 7.333666222963942e-06 + 1.000000000000000e+00 1.127015798965806e+00 1.551817101164785e+00 5.970732675608659e-06 1.748078417929122e-05 + 2.000000000000000e+00 8.899077623050877e-01 1.154605790521226e+00 5.193634545652692e-06 2.277559863617107e-05 + 3.000000000000000e+00 7.106404517183447e-01 1.023538680954640e+00 4.291858900606904e-06 2.169546546704204e-05 + 4.000000000000000e+00 8.204753489673684e-01 1.374635326513250e+00 9.803438298927603e-07 3.464464013003266e-06 + 5.000000000000000e+00 1.068564576357820e+00 1.691828549227964e+00 3.925287770378816e-07 1.035335339105714e-05 + 6.000000000000000e+00 1.216590045030178e+00 1.677572323554410e+00 2.545782720186907e-06 2.024670953293395e-05 + 7.000000000000000e+00 1.173440258251221e+00 1.342486064374871e+00 4.649804105305577e-06 3.069230631269626e-05 + 8.000000000000000e+00 9.629458547609638e-01 1.012157904944172e+00 7.651605801184402e-06 4.591153397504044e-05 + 9.000000000000000e+00 7.378719831470653e-01 1.183933689447477e+00 1.368438119686566e-05 6.717208069995095e-05 + 1.000000000000000e+01 7.618916076913168e-01 1.577104660749360e+00 9.572556103898400e-06 2.264797798678941e-05 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00477688331602 -Steps = 1587 -Error test fails = 141 +Current time = 10.00203638578589 +Steps = 1593 +Error test fails = 152 NLS step fails = 0 Initial step size = 0.0001029860256095084 -Last step size = 0.005751532513273557 -Current step size = 0.01173715213294061 +Last step size = 0.006712297137966068 +Current step size = 0.006712297137966068 Last method order = 5 Current method order = 5 Stab. lim. order reductions = 0 -RHS fn evals = 2189 -NLS iters = 2186 -NLS fails = 1 -NLS iters per step = 1.377441713925646 -LS setups = 270 +RHS fn evals = 2225 +NLS iters = 2222 +NLS fails = 0 +NLS iters per step = 1.394852479598242 +LS setups = 283 Jac fn evals = 29 LS RHS fn evals = 0 Prec setup evals = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.01326623970722781 +Jac evals per NLS iter = 0.01305130513051305 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_min_es_2_--small_nst_5.out b/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_min_es_2_--small_nst_5.out index c4664a2deb..cafa9f1252 100644 --- a/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_min_es_2_--small_nst_5.out +++ b/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_min_es_2_--small_nst_5.out @@ -2,32 +2,32 @@ ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00 1.127017686767897e+00 1.551821503613988e+00 7.858534767146708e-06 2.188323338225828e-05 - 2.000000000000000e+00 8.899103332792471e-01 1.154608370771088e+00 7.764608704996512e-06 2.535584849794326e-05 - 3.000000000000000e+00 7.106411292975151e-01 1.023536808224800e+00 4.969438071045218e-06 1.982273562739501e-05 - 4.000000000000000e+00 8.204838923453025e-01 1.374669642759487e+00 9.523721763993187e-06 3.778071025029028e-05 - 5.000000000000000e+00 1.068571738765126e+00 1.691858739922128e+00 6.769878529766515e-06 1.983734077248833e-05 - 6.000000000000000e+00 1.216596138753578e+00 1.677586205148419e+00 8.639506119845208e-06 3.412830354121432e-05 - 7.000000000000000e+00 1.173445555523058e+00 1.342501389353217e+00 9.947075942040584e-06 4.601728465791766e-05 - 8.000000000000000e+00 9.629437694992675e-01 1.012111079263365e+00 5.566344104868115e-06 9.141468324536106e-07 - 9.000000000000000e+00 7.378567118749449e-01 1.183847487150188e+00 1.586890923443995e-06 1.903021658944404e-05 - 1.000000000000000e+01 7.618782369340520e-01 1.577065913116525e+00 3.798201160920556e-06 1.609965484838938e-05 + 2.000000000000000e+00 8.899103332791866e-01 1.154608370768354e+00 7.764608644489357e-06 2.535584576346395e-05 + 3.000000000000000e+00 7.106410660756778e-01 1.023529279576880e+00 4.906216233724336e-06 1.229408770742069e-05 + 4.000000000000000e+00 8.204730617922310e-01 1.374621086116680e+00 1.306831307501533e-06 1.077593255716103e-05 + 5.000000000000000e+00 1.068564764620663e+00 1.691839212204075e+00 2.042659332790464e-07 3.096227194632206e-07 + 6.000000000000000e+00 1.216586539798704e+00 1.677542924381987e+00 9.594487537789576e-07 9.152462890238411e-06 + 7.000000000000000e+00 1.173434026092493e+00 1.342453786414837e+00 1.582354622442494e-06 1.585653721880576e-06 + 8.000000000000000e+00 9.629416122015924e-01 1.012142316337908e+00 3.409046429703189e-06 3.032292771099065e-05 + 9.000000000000000e+00 7.378651980553826e-01 1.183892379308912e+00 6.899289514250562e-06 2.586194213471948e-05 + 1.000000000000000e+01 7.618838841024592e-01 1.577079185839070e+00 1.848967246309563e-06 2.826932303578999e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00040955930806 -Steps = 1559 -Error test fails = 143 +Current time = 10.00136810102964 +Steps = 1577 +Error test fails = 147 NLS step fails = 0 Initial step size = 0.0001029860256095084 -Last step size = 0.006823439174537314 -Current step size = 0.006823439174537314 +Last step size = 0.006383607841908422 +Current step size = 0.006383607841908422 Last method order = 4 Current method order = 4 Stab. lim. order reductions = 0 -RHS fn evals = 2155 -NLS iters = 2152 +RHS fn evals = 2197 +NLS iters = 2194 NLS fails = 0 -NLS iters per step = 1.380372033354714 -LS setups = 266 -Jac fn evals = 28 +NLS iters per step = 1.391249207355739 +LS setups = 272 +Jac fn evals = 29 LS RHS fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.01301115241635688 +Jac evals per NLS iter = 0.01321786690975387 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_min_fx_1.0_--eta_max_fx_2.0.out b/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_min_fx_1.0_--eta_max_fx_2.0.out index ec141c1925..d6cbb37abc 100644 --- a/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_min_fx_1.0_--eta_max_fx_2.0.out +++ b/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_min_fx_1.0_--eta_max_fx_2.0.out @@ -1,33 +1,33 @@ t u v u err v err ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 - 1.000000000000000e+00 1.127010231169071e+00 1.551807554033271e+00 4.029359408352917e-07 7.933652665048641e-06 - 2.000000000000000e+00 8.899061205561563e-01 1.154606179589197e+00 3.551885614183625e-06 2.316466660645666e-05 - 3.000000000000000e+00 7.106424210639757e-01 1.023549409701108e+00 6.261204531621267e-06 3.242421193494494e-05 - 4.000000000000000e+00 8.204814601813510e-01 1.374657421210761e+00 7.091557812533011e-06 2.555916152413573e-05 - 5.000000000000000e+00 1.068572372339015e+00 1.691864172592888e+00 7.403452418897061e-06 2.527001153240782e-05 - 6.000000000000000e+00 1.216592470265054e+00 1.677579961463762e+00 4.971017596444582e-06 2.788461888481031e-05 - 7.000000000000000e+00 1.173447050388805e+00 1.342528207391852e+00 1.144194168967161e-05 7.283532329349640e-05 - 8.000000000000000e+00 9.629518083856625e-01 1.012162097171965e+00 1.360523049986906e-05 5.010376176772802e-05 - 9.000000000000000e+00 7.378729059558163e-01 1.183922375566823e+00 1.460718994794608e-05 5.585820004605502e-05 - 1.000000000000000e+01 7.618958276795634e-01 1.577122317502578e+00 1.379254435052157e-05 4.030473120475442e-05 + 1.000000000000000e+00 1.127010231169071e+00 1.551807554033266e+00 4.029359408352917e-07 7.933652660385704e-06 + 2.000000000000000e+00 8.899061205559413e-01 1.154606179579956e+00 3.551885399244448e-06 2.316465736562634e-05 + 3.000000000000000e+00 7.106424212341577e-01 1.023549411912243e+00 6.261374713600887e-06 3.242642307044186e-05 + 4.000000000000000e+00 8.204814571358759e-01 1.374657408976591e+00 7.088512337438679e-06 2.554692735379227e-05 + 5.000000000000000e+00 1.068572364198821e+00 1.691864129787617e+00 7.395312224378614e-06 2.522720626196850e-05 + 6.000000000000000e+00 1.216592227118846e+00 1.677571467388444e+00 4.727871388388039e-06 1.939054356636660e-05 + 7.000000000000000e+00 1.173443618841214e+00 1.342493467296904e+00 8.010394098256768e-06 3.809522834541390e-05 + 8.000000000000000e+00 9.629424396388875e-01 1.012121124268885e+00 4.236483724828766e-06 9.130858687589338e-06 + 9.000000000000000e+00 7.378604981968989e-01 1.183872079873866e+00 2.199431030525112e-06 5.562507089162949e-06 + 1.000000000000000e+01 7.618819895397966e-01 1.577086853397597e+00 4.559541633142317e-08 4.840626223412414e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00714850788732 -Steps = 1502 -Error test fails = 92 +Current time = 10.00417454325856 +Steps = 1575 +Error test fails = 96 NLS step fails = 0 Initial step size = 0.0001029860256095084 -Last step size = 0.009862197222912128 -Current step size = 0.009862197222912128 +Last step size = 0.01182372679957014 +Current step size = 0.01182372679957014 Last method order = 5 Current method order = 5 Stab. lim. order reductions = 0 -RHS fn evals = 1897 -NLS iters = 1894 -NLS fails = 1 -NLS iters per step = 1.26098535286285 -LS setups = 166 -Jac fn evals = 27 +RHS fn evals = 2002 +NLS iters = 1999 +NLS fails = 0 +NLS iters per step = 1.269206349206349 +LS setups = 178 +Jac fn evals = 28 LS RHS fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.01425554382259768 +Jac evals per NLS iter = 0.01400700350175088 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_min_fx_1.0_--eta_min_0.5.out b/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_min_fx_1.0_--eta_min_0.5.out index c4664a2deb..cafa9f1252 100644 --- a/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_min_fx_1.0_--eta_min_0.5.out +++ b/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_min_fx_1.0_--eta_min_0.5.out @@ -2,32 +2,32 @@ ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00 1.127017686767897e+00 1.551821503613988e+00 7.858534767146708e-06 2.188323338225828e-05 - 2.000000000000000e+00 8.899103332792471e-01 1.154608370771088e+00 7.764608704996512e-06 2.535584849794326e-05 - 3.000000000000000e+00 7.106411292975151e-01 1.023536808224800e+00 4.969438071045218e-06 1.982273562739501e-05 - 4.000000000000000e+00 8.204838923453025e-01 1.374669642759487e+00 9.523721763993187e-06 3.778071025029028e-05 - 5.000000000000000e+00 1.068571738765126e+00 1.691858739922128e+00 6.769878529766515e-06 1.983734077248833e-05 - 6.000000000000000e+00 1.216596138753578e+00 1.677586205148419e+00 8.639506119845208e-06 3.412830354121432e-05 - 7.000000000000000e+00 1.173445555523058e+00 1.342501389353217e+00 9.947075942040584e-06 4.601728465791766e-05 - 8.000000000000000e+00 9.629437694992675e-01 1.012111079263365e+00 5.566344104868115e-06 9.141468324536106e-07 - 9.000000000000000e+00 7.378567118749449e-01 1.183847487150188e+00 1.586890923443995e-06 1.903021658944404e-05 - 1.000000000000000e+01 7.618782369340520e-01 1.577065913116525e+00 3.798201160920556e-06 1.609965484838938e-05 + 2.000000000000000e+00 8.899103332791866e-01 1.154608370768354e+00 7.764608644489357e-06 2.535584576346395e-05 + 3.000000000000000e+00 7.106410660756778e-01 1.023529279576880e+00 4.906216233724336e-06 1.229408770742069e-05 + 4.000000000000000e+00 8.204730617922310e-01 1.374621086116680e+00 1.306831307501533e-06 1.077593255716103e-05 + 5.000000000000000e+00 1.068564764620663e+00 1.691839212204075e+00 2.042659332790464e-07 3.096227194632206e-07 + 6.000000000000000e+00 1.216586539798704e+00 1.677542924381987e+00 9.594487537789576e-07 9.152462890238411e-06 + 7.000000000000000e+00 1.173434026092493e+00 1.342453786414837e+00 1.582354622442494e-06 1.585653721880576e-06 + 8.000000000000000e+00 9.629416122015924e-01 1.012142316337908e+00 3.409046429703189e-06 3.032292771099065e-05 + 9.000000000000000e+00 7.378651980553826e-01 1.183892379308912e+00 6.899289514250562e-06 2.586194213471948e-05 + 1.000000000000000e+01 7.618838841024592e-01 1.577079185839070e+00 1.848967246309563e-06 2.826932303578999e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00040955930806 -Steps = 1559 -Error test fails = 143 +Current time = 10.00136810102964 +Steps = 1577 +Error test fails = 147 NLS step fails = 0 Initial step size = 0.0001029860256095084 -Last step size = 0.006823439174537314 -Current step size = 0.006823439174537314 +Last step size = 0.006383607841908422 +Current step size = 0.006383607841908422 Last method order = 4 Current method order = 4 Stab. lim. order reductions = 0 -RHS fn evals = 2155 -NLS iters = 2152 +RHS fn evals = 2197 +NLS iters = 2194 NLS fails = 0 -NLS iters per step = 1.380372033354714 -LS setups = 266 -Jac fn evals = 28 +NLS iters per step = 1.391249207355739 +LS setups = 272 +Jac fn evals = 29 LS RHS fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.01301115241635688 +Jac evals per NLS iter = 0.01321786690975387 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_min_gs_2.out b/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_min_gs_2.out index c4664a2deb..cafa9f1252 100644 --- a/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_min_gs_2.out +++ b/test/unit_tests/cvode/CXX_serial/cv_test_kpr_--eta_min_gs_2.out @@ -2,32 +2,32 @@ ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00 1.127017686767897e+00 1.551821503613988e+00 7.858534767146708e-06 2.188323338225828e-05 - 2.000000000000000e+00 8.899103332792471e-01 1.154608370771088e+00 7.764608704996512e-06 2.535584849794326e-05 - 3.000000000000000e+00 7.106411292975151e-01 1.023536808224800e+00 4.969438071045218e-06 1.982273562739501e-05 - 4.000000000000000e+00 8.204838923453025e-01 1.374669642759487e+00 9.523721763993187e-06 3.778071025029028e-05 - 5.000000000000000e+00 1.068571738765126e+00 1.691858739922128e+00 6.769878529766515e-06 1.983734077248833e-05 - 6.000000000000000e+00 1.216596138753578e+00 1.677586205148419e+00 8.639506119845208e-06 3.412830354121432e-05 - 7.000000000000000e+00 1.173445555523058e+00 1.342501389353217e+00 9.947075942040584e-06 4.601728465791766e-05 - 8.000000000000000e+00 9.629437694992675e-01 1.012111079263365e+00 5.566344104868115e-06 9.141468324536106e-07 - 9.000000000000000e+00 7.378567118749449e-01 1.183847487150188e+00 1.586890923443995e-06 1.903021658944404e-05 - 1.000000000000000e+01 7.618782369340520e-01 1.577065913116525e+00 3.798201160920556e-06 1.609965484838938e-05 + 2.000000000000000e+00 8.899103332791866e-01 1.154608370768354e+00 7.764608644489357e-06 2.535584576346395e-05 + 3.000000000000000e+00 7.106410660756778e-01 1.023529279576880e+00 4.906216233724336e-06 1.229408770742069e-05 + 4.000000000000000e+00 8.204730617922310e-01 1.374621086116680e+00 1.306831307501533e-06 1.077593255716103e-05 + 5.000000000000000e+00 1.068564764620663e+00 1.691839212204075e+00 2.042659332790464e-07 3.096227194632206e-07 + 6.000000000000000e+00 1.216586539798704e+00 1.677542924381987e+00 9.594487537789576e-07 9.152462890238411e-06 + 7.000000000000000e+00 1.173434026092493e+00 1.342453786414837e+00 1.582354622442494e-06 1.585653721880576e-06 + 8.000000000000000e+00 9.629416122015924e-01 1.012142316337908e+00 3.409046429703189e-06 3.032292771099065e-05 + 9.000000000000000e+00 7.378651980553826e-01 1.183892379308912e+00 6.899289514250562e-06 2.586194213471948e-05 + 1.000000000000000e+01 7.618838841024592e-01 1.577079185839070e+00 1.848967246309563e-06 2.826932303578999e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00040955930806 -Steps = 1559 -Error test fails = 143 +Current time = 10.00136810102964 +Steps = 1577 +Error test fails = 147 NLS step fails = 0 Initial step size = 0.0001029860256095084 -Last step size = 0.006823439174537314 -Current step size = 0.006823439174537314 +Last step size = 0.006383607841908422 +Current step size = 0.006383607841908422 Last method order = 4 Current method order = 4 Stab. lim. order reductions = 0 -RHS fn evals = 2155 -NLS iters = 2152 +RHS fn evals = 2197 +NLS iters = 2194 NLS fails = 0 -NLS iters per step = 1.380372033354714 -LS setups = 266 -Jac fn evals = 28 +NLS iters per step = 1.391249207355739 +LS setups = 272 +Jac fn evals = 29 LS RHS fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.01301115241635688 +Jac evals per NLS iter = 0.01321786690975387 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr.out b/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr.out index c4664a2deb..cafa9f1252 100644 --- a/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr.out +++ b/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr.out @@ -2,32 +2,32 @@ ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00 1.127017686767897e+00 1.551821503613988e+00 7.858534767146708e-06 2.188323338225828e-05 - 2.000000000000000e+00 8.899103332792471e-01 1.154608370771088e+00 7.764608704996512e-06 2.535584849794326e-05 - 3.000000000000000e+00 7.106411292975151e-01 1.023536808224800e+00 4.969438071045218e-06 1.982273562739501e-05 - 4.000000000000000e+00 8.204838923453025e-01 1.374669642759487e+00 9.523721763993187e-06 3.778071025029028e-05 - 5.000000000000000e+00 1.068571738765126e+00 1.691858739922128e+00 6.769878529766515e-06 1.983734077248833e-05 - 6.000000000000000e+00 1.216596138753578e+00 1.677586205148419e+00 8.639506119845208e-06 3.412830354121432e-05 - 7.000000000000000e+00 1.173445555523058e+00 1.342501389353217e+00 9.947075942040584e-06 4.601728465791766e-05 - 8.000000000000000e+00 9.629437694992675e-01 1.012111079263365e+00 5.566344104868115e-06 9.141468324536106e-07 - 9.000000000000000e+00 7.378567118749449e-01 1.183847487150188e+00 1.586890923443995e-06 1.903021658944404e-05 - 1.000000000000000e+01 7.618782369340520e-01 1.577065913116525e+00 3.798201160920556e-06 1.609965484838938e-05 + 2.000000000000000e+00 8.899103332791866e-01 1.154608370768354e+00 7.764608644489357e-06 2.535584576346395e-05 + 3.000000000000000e+00 7.106410660756778e-01 1.023529279576880e+00 4.906216233724336e-06 1.229408770742069e-05 + 4.000000000000000e+00 8.204730617922310e-01 1.374621086116680e+00 1.306831307501533e-06 1.077593255716103e-05 + 5.000000000000000e+00 1.068564764620663e+00 1.691839212204075e+00 2.042659332790464e-07 3.096227194632206e-07 + 6.000000000000000e+00 1.216586539798704e+00 1.677542924381987e+00 9.594487537789576e-07 9.152462890238411e-06 + 7.000000000000000e+00 1.173434026092493e+00 1.342453786414837e+00 1.582354622442494e-06 1.585653721880576e-06 + 8.000000000000000e+00 9.629416122015924e-01 1.012142316337908e+00 3.409046429703189e-06 3.032292771099065e-05 + 9.000000000000000e+00 7.378651980553826e-01 1.183892379308912e+00 6.899289514250562e-06 2.586194213471948e-05 + 1.000000000000000e+01 7.618838841024592e-01 1.577079185839070e+00 1.848967246309563e-06 2.826932303578999e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00040955930806 -Steps = 1559 -Error test fails = 143 +Current time = 10.00136810102964 +Steps = 1577 +Error test fails = 147 NLS step fails = 0 Initial step size = 0.0001029860256095084 -Last step size = 0.006823439174537314 -Current step size = 0.006823439174537314 +Last step size = 0.006383607841908422 +Current step size = 0.006383607841908422 Last method order = 4 Current method order = 4 Stab. lim. order reductions = 0 -RHS fn evals = 2155 -NLS iters = 2152 +RHS fn evals = 2197 +NLS iters = 2194 NLS fails = 0 -NLS iters per step = 1.380372033354714 -LS setups = 266 -Jac fn evals = 28 +NLS iters per step = 1.391249207355739 +LS setups = 272 +Jac fn evals = 29 LS RHS fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.01301115241635688 +Jac evals per NLS iter = 0.01321786690975387 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--dgmax_jbad_1.0.out b/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--dgmax_jbad_1.0.out index c4664a2deb..cafa9f1252 100644 --- a/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--dgmax_jbad_1.0.out +++ b/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--dgmax_jbad_1.0.out @@ -2,32 +2,32 @@ ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00 1.127017686767897e+00 1.551821503613988e+00 7.858534767146708e-06 2.188323338225828e-05 - 2.000000000000000e+00 8.899103332792471e-01 1.154608370771088e+00 7.764608704996512e-06 2.535584849794326e-05 - 3.000000000000000e+00 7.106411292975151e-01 1.023536808224800e+00 4.969438071045218e-06 1.982273562739501e-05 - 4.000000000000000e+00 8.204838923453025e-01 1.374669642759487e+00 9.523721763993187e-06 3.778071025029028e-05 - 5.000000000000000e+00 1.068571738765126e+00 1.691858739922128e+00 6.769878529766515e-06 1.983734077248833e-05 - 6.000000000000000e+00 1.216596138753578e+00 1.677586205148419e+00 8.639506119845208e-06 3.412830354121432e-05 - 7.000000000000000e+00 1.173445555523058e+00 1.342501389353217e+00 9.947075942040584e-06 4.601728465791766e-05 - 8.000000000000000e+00 9.629437694992675e-01 1.012111079263365e+00 5.566344104868115e-06 9.141468324536106e-07 - 9.000000000000000e+00 7.378567118749449e-01 1.183847487150188e+00 1.586890923443995e-06 1.903021658944404e-05 - 1.000000000000000e+01 7.618782369340520e-01 1.577065913116525e+00 3.798201160920556e-06 1.609965484838938e-05 + 2.000000000000000e+00 8.899103332791866e-01 1.154608370768354e+00 7.764608644489357e-06 2.535584576346395e-05 + 3.000000000000000e+00 7.106410660756778e-01 1.023529279576880e+00 4.906216233724336e-06 1.229408770742069e-05 + 4.000000000000000e+00 8.204730617922310e-01 1.374621086116680e+00 1.306831307501533e-06 1.077593255716103e-05 + 5.000000000000000e+00 1.068564764620663e+00 1.691839212204075e+00 2.042659332790464e-07 3.096227194632206e-07 + 6.000000000000000e+00 1.216586539798704e+00 1.677542924381987e+00 9.594487537789576e-07 9.152462890238411e-06 + 7.000000000000000e+00 1.173434026092493e+00 1.342453786414837e+00 1.582354622442494e-06 1.585653721880576e-06 + 8.000000000000000e+00 9.629416122015924e-01 1.012142316337908e+00 3.409046429703189e-06 3.032292771099065e-05 + 9.000000000000000e+00 7.378651980553826e-01 1.183892379308912e+00 6.899289514250562e-06 2.586194213471948e-05 + 1.000000000000000e+01 7.618838841024592e-01 1.577079185839070e+00 1.848967246309563e-06 2.826932303578999e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00040955930806 -Steps = 1559 -Error test fails = 143 +Current time = 10.00136810102964 +Steps = 1577 +Error test fails = 147 NLS step fails = 0 Initial step size = 0.0001029860256095084 -Last step size = 0.006823439174537314 -Current step size = 0.006823439174537314 +Last step size = 0.006383607841908422 +Current step size = 0.006383607841908422 Last method order = 4 Current method order = 4 Stab. lim. order reductions = 0 -RHS fn evals = 2155 -NLS iters = 2152 +RHS fn evals = 2197 +NLS iters = 2194 NLS fails = 0 -NLS iters per step = 1.380372033354714 -LS setups = 266 -Jac fn evals = 28 +NLS iters per step = 1.391249207355739 +LS setups = 272 +Jac fn evals = 29 LS RHS fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.01301115241635688 +Jac evals per NLS iter = 0.01321786690975387 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--dgmax_lsetup_0.0.out b/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--dgmax_lsetup_0.0.out index c4664a2deb..cafa9f1252 100644 --- a/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--dgmax_lsetup_0.0.out +++ b/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--dgmax_lsetup_0.0.out @@ -2,32 +2,32 @@ ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00 1.127017686767897e+00 1.551821503613988e+00 7.858534767146708e-06 2.188323338225828e-05 - 2.000000000000000e+00 8.899103332792471e-01 1.154608370771088e+00 7.764608704996512e-06 2.535584849794326e-05 - 3.000000000000000e+00 7.106411292975151e-01 1.023536808224800e+00 4.969438071045218e-06 1.982273562739501e-05 - 4.000000000000000e+00 8.204838923453025e-01 1.374669642759487e+00 9.523721763993187e-06 3.778071025029028e-05 - 5.000000000000000e+00 1.068571738765126e+00 1.691858739922128e+00 6.769878529766515e-06 1.983734077248833e-05 - 6.000000000000000e+00 1.216596138753578e+00 1.677586205148419e+00 8.639506119845208e-06 3.412830354121432e-05 - 7.000000000000000e+00 1.173445555523058e+00 1.342501389353217e+00 9.947075942040584e-06 4.601728465791766e-05 - 8.000000000000000e+00 9.629437694992675e-01 1.012111079263365e+00 5.566344104868115e-06 9.141468324536106e-07 - 9.000000000000000e+00 7.378567118749449e-01 1.183847487150188e+00 1.586890923443995e-06 1.903021658944404e-05 - 1.000000000000000e+01 7.618782369340520e-01 1.577065913116525e+00 3.798201160920556e-06 1.609965484838938e-05 + 2.000000000000000e+00 8.899103332791866e-01 1.154608370768354e+00 7.764608644489357e-06 2.535584576346395e-05 + 3.000000000000000e+00 7.106410660756778e-01 1.023529279576880e+00 4.906216233724336e-06 1.229408770742069e-05 + 4.000000000000000e+00 8.204730617922310e-01 1.374621086116680e+00 1.306831307501533e-06 1.077593255716103e-05 + 5.000000000000000e+00 1.068564764620663e+00 1.691839212204075e+00 2.042659332790464e-07 3.096227194632206e-07 + 6.000000000000000e+00 1.216586539798704e+00 1.677542924381987e+00 9.594487537789576e-07 9.152462890238411e-06 + 7.000000000000000e+00 1.173434026092493e+00 1.342453786414837e+00 1.582354622442494e-06 1.585653721880576e-06 + 8.000000000000000e+00 9.629416122015924e-01 1.012142316337908e+00 3.409046429703189e-06 3.032292771099065e-05 + 9.000000000000000e+00 7.378651980553826e-01 1.183892379308912e+00 6.899289514250562e-06 2.586194213471948e-05 + 1.000000000000000e+01 7.618838841024592e-01 1.577079185839070e+00 1.848967246309563e-06 2.826932303578999e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00040955930806 -Steps = 1559 -Error test fails = 143 +Current time = 10.00136810102964 +Steps = 1577 +Error test fails = 147 NLS step fails = 0 Initial step size = 0.0001029860256095084 -Last step size = 0.006823439174537314 -Current step size = 0.006823439174537314 +Last step size = 0.006383607841908422 +Current step size = 0.006383607841908422 Last method order = 4 Current method order = 4 Stab. lim. order reductions = 0 -RHS fn evals = 2155 -NLS iters = 2152 +RHS fn evals = 2197 +NLS iters = 2194 NLS fails = 0 -NLS iters per step = 1.380372033354714 -LS setups = 266 -Jac fn evals = 28 +NLS iters per step = 1.391249207355739 +LS setups = 272 +Jac fn evals = 29 LS RHS fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.01301115241635688 +Jac evals per NLS iter = 0.01321786690975387 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_cf_0.5.out b/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_cf_0.5.out index c4664a2deb..cafa9f1252 100644 --- a/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_cf_0.5.out +++ b/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_cf_0.5.out @@ -2,32 +2,32 @@ ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00 1.127017686767897e+00 1.551821503613988e+00 7.858534767146708e-06 2.188323338225828e-05 - 2.000000000000000e+00 8.899103332792471e-01 1.154608370771088e+00 7.764608704996512e-06 2.535584849794326e-05 - 3.000000000000000e+00 7.106411292975151e-01 1.023536808224800e+00 4.969438071045218e-06 1.982273562739501e-05 - 4.000000000000000e+00 8.204838923453025e-01 1.374669642759487e+00 9.523721763993187e-06 3.778071025029028e-05 - 5.000000000000000e+00 1.068571738765126e+00 1.691858739922128e+00 6.769878529766515e-06 1.983734077248833e-05 - 6.000000000000000e+00 1.216596138753578e+00 1.677586205148419e+00 8.639506119845208e-06 3.412830354121432e-05 - 7.000000000000000e+00 1.173445555523058e+00 1.342501389353217e+00 9.947075942040584e-06 4.601728465791766e-05 - 8.000000000000000e+00 9.629437694992675e-01 1.012111079263365e+00 5.566344104868115e-06 9.141468324536106e-07 - 9.000000000000000e+00 7.378567118749449e-01 1.183847487150188e+00 1.586890923443995e-06 1.903021658944404e-05 - 1.000000000000000e+01 7.618782369340520e-01 1.577065913116525e+00 3.798201160920556e-06 1.609965484838938e-05 + 2.000000000000000e+00 8.899103332791866e-01 1.154608370768354e+00 7.764608644489357e-06 2.535584576346395e-05 + 3.000000000000000e+00 7.106410660756778e-01 1.023529279576880e+00 4.906216233724336e-06 1.229408770742069e-05 + 4.000000000000000e+00 8.204730617922310e-01 1.374621086116680e+00 1.306831307501533e-06 1.077593255716103e-05 + 5.000000000000000e+00 1.068564764620663e+00 1.691839212204075e+00 2.042659332790464e-07 3.096227194632206e-07 + 6.000000000000000e+00 1.216586539798704e+00 1.677542924381987e+00 9.594487537789576e-07 9.152462890238411e-06 + 7.000000000000000e+00 1.173434026092493e+00 1.342453786414837e+00 1.582354622442494e-06 1.585653721880576e-06 + 8.000000000000000e+00 9.629416122015924e-01 1.012142316337908e+00 3.409046429703189e-06 3.032292771099065e-05 + 9.000000000000000e+00 7.378651980553826e-01 1.183892379308912e+00 6.899289514250562e-06 2.586194213471948e-05 + 1.000000000000000e+01 7.618838841024592e-01 1.577079185839070e+00 1.848967246309563e-06 2.826932303578999e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00040955930806 -Steps = 1559 -Error test fails = 143 +Current time = 10.00136810102964 +Steps = 1577 +Error test fails = 147 NLS step fails = 0 Initial step size = 0.0001029860256095084 -Last step size = 0.006823439174537314 -Current step size = 0.006823439174537314 +Last step size = 0.006383607841908422 +Current step size = 0.006383607841908422 Last method order = 4 Current method order = 4 Stab. lim. order reductions = 0 -RHS fn evals = 2155 -NLS iters = 2152 +RHS fn evals = 2197 +NLS iters = 2194 NLS fails = 0 -NLS iters per step = 1.380372033354714 -LS setups = 266 -Jac fn evals = 28 +NLS iters per step = 1.391249207355739 +LS setups = 272 +Jac fn evals = 29 LS RHS fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.01301115241635688 +Jac evals per NLS iter = 0.01321786690975387 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_max_ef_0.1_--small_nef_1.out b/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_max_ef_0.1_--small_nef_1.out index 0a4e2b826b..0a14173f9d 100644 --- a/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_max_ef_0.1_--small_nef_1.out +++ b/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_max_ef_0.1_--small_nef_1.out @@ -2,32 +2,32 @@ ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00 1.127007526754027e+00 1.551798865570904e+00 2.301479103516968e-06 7.548097018528210e-07 - 2.000000000000000e+00 8.899039207780429e-01 1.154591213714133e+00 1.352107500851574e-06 8.198791543012618e-06 - 3.000000000000000e+00 7.106357482521893e-01 1.023517382507561e+00 4.116072547244443e-07 3.970183883872380e-07 - 4.000000000000000e+00 8.204798818139928e-01 1.374656498648397e+00 5.513190454276007e-06 2.463659915963312e-05 - 5.000000000000000e+00 1.068564963322506e+00 1.691834094334029e+00 5.564090299614577e-09 4.808247326515414e-06 - 6.000000000000000e+00 1.216591810654471e+00 1.677567596214340e+00 4.311407013402047e-06 1.551936946242449e-05 - 7.000000000000000e+00 1.173435748816172e+00 1.342473383443199e+00 1.403690566004201e-07 1.801137464019220e-05 - 8.000000000000000e+00 9.629391196580445e-01 1.012109414731435e+00 9.165028818092225e-07 2.578678761855357e-06 - 9.000000000000000e+00 7.378667583329571e-01 1.183902498984600e+00 8.459567088725528e-06 3.598161782281117e-05 - 1.000000000000000e+01 7.618881720180362e-01 1.577082165589996e+00 6.136882823248868e-06 1.528186226451567e-07 + 2.000000000000000e+00 8.899039207901290e-01 1.154591213259856e+00 1.352119586961464e-06 8.198337265508115e-06 + 3.000000000000000e+00 7.106357095240244e-01 1.023533553968366e+00 4.503354196216947e-07 1.656847919329074e-05 + 4.000000000000000e+00 8.204797090224738e-01 1.374674798175743e+00 5.340398935294033e-06 4.293612650640988e-05 + 5.000000000000000e+00 1.068568799206777e+00 1.691846388757366e+00 3.830320180586710e-06 7.486176010651491e-06 + 6.000000000000000e+00 1.216593431224251e+00 1.677563096846002e+00 5.931976793549509e-06 1.102000112496171e-05 + 7.000000000000000e+00 1.173436919049330e+00 1.342481412337947e+00 1.310602214310563e-06 2.604026938879400e-05 + 8.000000000000000e+00 9.629477831479546e-01 1.012160095609326e+00 9.579992791941550e-06 4.810219912920743e-05 + 9.000000000000000e+00 7.378633330120637e-01 1.183890879406442e+00 5.034246195356751e-06 2.436203966471595e-05 + 1.000000000000000e+01 7.618899385439418e-01 1.577125935900683e+00 7.903408728915373e-06 4.392312930967535e-05 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00451093359436 -Steps = 2207 -Error test fails = 185 +Current time = 10.00425372374186 +Steps = 2329 +Error test fails = 209 NLS step fails = 0 Initial step size = 0.0001029860256095084 -Last step size = 0.007683783711129318 -Current step size = 0.007683783711129318 +Last step size = 0.00604072055819684 +Current step size = 0.01119929556740219 Last method order = 4 -Current method order = 4 +Current method order = 5 Stab. lim. order reductions = 0 -RHS fn evals = 3004 -NLS iters = 3001 +RHS fn evals = 3188 +NLS iters = 3185 NLS fails = 0 -NLS iters per step = 1.359764386044404 -LS setups = 751 -Jac fn evals = 41 +NLS iters per step = 1.367539716616574 +LS setups = 823 +Jac fn evals = 43 LS RHS fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.01366211262912363 +Jac evals per NLS iter = 0.01350078492935636 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_max_fs_2.out b/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_max_fs_2.out index c4664a2deb..cafa9f1252 100644 --- a/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_max_fs_2.out +++ b/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_max_fs_2.out @@ -2,32 +2,32 @@ ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00 1.127017686767897e+00 1.551821503613988e+00 7.858534767146708e-06 2.188323338225828e-05 - 2.000000000000000e+00 8.899103332792471e-01 1.154608370771088e+00 7.764608704996512e-06 2.535584849794326e-05 - 3.000000000000000e+00 7.106411292975151e-01 1.023536808224800e+00 4.969438071045218e-06 1.982273562739501e-05 - 4.000000000000000e+00 8.204838923453025e-01 1.374669642759487e+00 9.523721763993187e-06 3.778071025029028e-05 - 5.000000000000000e+00 1.068571738765126e+00 1.691858739922128e+00 6.769878529766515e-06 1.983734077248833e-05 - 6.000000000000000e+00 1.216596138753578e+00 1.677586205148419e+00 8.639506119845208e-06 3.412830354121432e-05 - 7.000000000000000e+00 1.173445555523058e+00 1.342501389353217e+00 9.947075942040584e-06 4.601728465791766e-05 - 8.000000000000000e+00 9.629437694992675e-01 1.012111079263365e+00 5.566344104868115e-06 9.141468324536106e-07 - 9.000000000000000e+00 7.378567118749449e-01 1.183847487150188e+00 1.586890923443995e-06 1.903021658944404e-05 - 1.000000000000000e+01 7.618782369340520e-01 1.577065913116525e+00 3.798201160920556e-06 1.609965484838938e-05 + 2.000000000000000e+00 8.899103332791866e-01 1.154608370768354e+00 7.764608644489357e-06 2.535584576346395e-05 + 3.000000000000000e+00 7.106410660756778e-01 1.023529279576880e+00 4.906216233724336e-06 1.229408770742069e-05 + 4.000000000000000e+00 8.204730617922310e-01 1.374621086116680e+00 1.306831307501533e-06 1.077593255716103e-05 + 5.000000000000000e+00 1.068564764620663e+00 1.691839212204075e+00 2.042659332790464e-07 3.096227194632206e-07 + 6.000000000000000e+00 1.216586539798704e+00 1.677542924381987e+00 9.594487537789576e-07 9.152462890238411e-06 + 7.000000000000000e+00 1.173434026092493e+00 1.342453786414837e+00 1.582354622442494e-06 1.585653721880576e-06 + 8.000000000000000e+00 9.629416122015924e-01 1.012142316337908e+00 3.409046429703189e-06 3.032292771099065e-05 + 9.000000000000000e+00 7.378651980553826e-01 1.183892379308912e+00 6.899289514250562e-06 2.586194213471948e-05 + 1.000000000000000e+01 7.618838841024592e-01 1.577079185839070e+00 1.848967246309563e-06 2.826932303578999e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00040955930806 -Steps = 1559 -Error test fails = 143 +Current time = 10.00136810102964 +Steps = 1577 +Error test fails = 147 NLS step fails = 0 Initial step size = 0.0001029860256095084 -Last step size = 0.006823439174537314 -Current step size = 0.006823439174537314 +Last step size = 0.006383607841908422 +Current step size = 0.006383607841908422 Last method order = 4 Current method order = 4 Stab. lim. order reductions = 0 -RHS fn evals = 2155 -NLS iters = 2152 +RHS fn evals = 2197 +NLS iters = 2194 NLS fails = 0 -NLS iters per step = 1.380372033354714 -LS setups = 266 -Jac fn evals = 28 +NLS iters per step = 1.391249207355739 +LS setups = 272 +Jac fn evals = 29 LS RHS fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.01301115241635688 +Jac evals per NLS iter = 0.01321786690975387 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_min_ef_0.5.out b/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_min_ef_0.5.out index cc2f56d0f9..8d72a04472 100644 --- a/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_min_ef_0.5.out +++ b/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_min_ef_0.5.out @@ -1,32 +1,32 @@ t u v u err v err ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 - 1.000000000000000e+00 1.127015798965803e+00 1.551817101165368e+00 5.970732673166168e-06 1.748078476238035e-05 - 2.000000000000000e+00 8.899077623052392e-01 1.154605790521889e+00 5.193634697087113e-06 2.277559929919626e-05 - 3.000000000000000e+00 7.106404517217246e-01 1.023538681494556e+00 4.291862280569880e-06 2.169600538337590e-05 - 4.000000000000000e+00 8.204753960502632e-01 1.374635909783589e+00 1.027426724697911e-06 4.047734351475540e-06 - 5.000000000000000e+00 1.068564502769698e+00 1.691818039836895e+00 4.661168988562281e-07 2.086274445978198e-05 - 6.000000000000000e+00 1.216587851997169e+00 1.677546347146822e+00 3.527497114408362e-07 5.729698055789711e-06 - 7.000000000000000e+00 1.173437871476192e+00 1.342487857991437e+00 2.263029076576828e-06 3.248592287796725e-05 - 8.000000000000000e+00 9.629429628371622e-01 1.012128557748354e+00 4.759681999533250e-06 1.656433815688807e-05 - 9.000000000000000e+00 7.378705116374682e-01 1.183937587786273e+00 1.221287159980378e-05 7.107041949527826e-05 - 1.000000000000000e+01 7.618905380496568e-01 1.577089346437596e+00 8.502914443875298e-06 7.333666222963942e-06 + 1.000000000000000e+00 1.127015798965806e+00 1.551817101164785e+00 5.970732675608659e-06 1.748078417929122e-05 + 2.000000000000000e+00 8.899077623050877e-01 1.154605790521226e+00 5.193634545652692e-06 2.277559863617107e-05 + 3.000000000000000e+00 7.106404517183447e-01 1.023538680954640e+00 4.291858900606904e-06 2.169546546704204e-05 + 4.000000000000000e+00 8.204753489673684e-01 1.374635326513250e+00 9.803438298927603e-07 3.464464013003266e-06 + 5.000000000000000e+00 1.068564576357820e+00 1.691828549227964e+00 3.925287770378816e-07 1.035335339105714e-05 + 6.000000000000000e+00 1.216590045030178e+00 1.677572323554410e+00 2.545782720186907e-06 2.024670953293395e-05 + 7.000000000000000e+00 1.173440258251221e+00 1.342486064374871e+00 4.649804105305577e-06 3.069230631269626e-05 + 8.000000000000000e+00 9.629458547609638e-01 1.012157904944172e+00 7.651605801184402e-06 4.591153397504044e-05 + 9.000000000000000e+00 7.378719831470653e-01 1.183933689447477e+00 1.368438119686566e-05 6.717208069995095e-05 + 1.000000000000000e+01 7.618916076913168e-01 1.577104660749360e+00 9.572556103898400e-06 2.264797798678941e-05 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00477688331602 -Steps = 1587 -Error test fails = 141 +Current time = 10.00203638578589 +Steps = 1593 +Error test fails = 152 NLS step fails = 0 Initial step size = 0.0001029860256095084 -Last step size = 0.005751532513273557 -Current step size = 0.01173715213294061 +Last step size = 0.006712297137966068 +Current step size = 0.006712297137966068 Last method order = 5 Current method order = 5 Stab. lim. order reductions = 0 -RHS fn evals = 2189 -NLS iters = 2186 -NLS fails = 1 -NLS iters per step = 1.377441713925646 -LS setups = 270 +RHS fn evals = 2225 +NLS iters = 2222 +NLS fails = 0 +NLS iters per step = 1.394852479598242 +LS setups = 283 Jac fn evals = 29 LS RHS fn evals = 0 Prec setup evals = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.01326623970722781 +Jac evals per NLS iter = 0.01305130513051305 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_min_es_2_--small_nst_5.out b/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_min_es_2_--small_nst_5.out index c4664a2deb..cafa9f1252 100644 --- a/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_min_es_2_--small_nst_5.out +++ b/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_min_es_2_--small_nst_5.out @@ -2,32 +2,32 @@ ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00 1.127017686767897e+00 1.551821503613988e+00 7.858534767146708e-06 2.188323338225828e-05 - 2.000000000000000e+00 8.899103332792471e-01 1.154608370771088e+00 7.764608704996512e-06 2.535584849794326e-05 - 3.000000000000000e+00 7.106411292975151e-01 1.023536808224800e+00 4.969438071045218e-06 1.982273562739501e-05 - 4.000000000000000e+00 8.204838923453025e-01 1.374669642759487e+00 9.523721763993187e-06 3.778071025029028e-05 - 5.000000000000000e+00 1.068571738765126e+00 1.691858739922128e+00 6.769878529766515e-06 1.983734077248833e-05 - 6.000000000000000e+00 1.216596138753578e+00 1.677586205148419e+00 8.639506119845208e-06 3.412830354121432e-05 - 7.000000000000000e+00 1.173445555523058e+00 1.342501389353217e+00 9.947075942040584e-06 4.601728465791766e-05 - 8.000000000000000e+00 9.629437694992675e-01 1.012111079263365e+00 5.566344104868115e-06 9.141468324536106e-07 - 9.000000000000000e+00 7.378567118749449e-01 1.183847487150188e+00 1.586890923443995e-06 1.903021658944404e-05 - 1.000000000000000e+01 7.618782369340520e-01 1.577065913116525e+00 3.798201160920556e-06 1.609965484838938e-05 + 2.000000000000000e+00 8.899103332791866e-01 1.154608370768354e+00 7.764608644489357e-06 2.535584576346395e-05 + 3.000000000000000e+00 7.106410660756778e-01 1.023529279576880e+00 4.906216233724336e-06 1.229408770742069e-05 + 4.000000000000000e+00 8.204730617922310e-01 1.374621086116680e+00 1.306831307501533e-06 1.077593255716103e-05 + 5.000000000000000e+00 1.068564764620663e+00 1.691839212204075e+00 2.042659332790464e-07 3.096227194632206e-07 + 6.000000000000000e+00 1.216586539798704e+00 1.677542924381987e+00 9.594487537789576e-07 9.152462890238411e-06 + 7.000000000000000e+00 1.173434026092493e+00 1.342453786414837e+00 1.582354622442494e-06 1.585653721880576e-06 + 8.000000000000000e+00 9.629416122015924e-01 1.012142316337908e+00 3.409046429703189e-06 3.032292771099065e-05 + 9.000000000000000e+00 7.378651980553826e-01 1.183892379308912e+00 6.899289514250562e-06 2.586194213471948e-05 + 1.000000000000000e+01 7.618838841024592e-01 1.577079185839070e+00 1.848967246309563e-06 2.826932303578999e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00040955930806 -Steps = 1559 -Error test fails = 143 +Current time = 10.00136810102964 +Steps = 1577 +Error test fails = 147 NLS step fails = 0 Initial step size = 0.0001029860256095084 -Last step size = 0.006823439174537314 -Current step size = 0.006823439174537314 +Last step size = 0.006383607841908422 +Current step size = 0.006383607841908422 Last method order = 4 Current method order = 4 Stab. lim. order reductions = 0 -RHS fn evals = 2155 -NLS iters = 2152 +RHS fn evals = 2197 +NLS iters = 2194 NLS fails = 0 -NLS iters per step = 1.380372033354714 -LS setups = 266 -Jac fn evals = 28 +NLS iters per step = 1.391249207355739 +LS setups = 272 +Jac fn evals = 29 LS RHS fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.01301115241635688 +Jac evals per NLS iter = 0.01321786690975387 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_min_fx_1.0_--eta_max_fx_2.0.out b/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_min_fx_1.0_--eta_max_fx_2.0.out index ec141c1925..d6cbb37abc 100644 --- a/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_min_fx_1.0_--eta_max_fx_2.0.out +++ b/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_min_fx_1.0_--eta_max_fx_2.0.out @@ -1,33 +1,33 @@ t u v u err v err ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 - 1.000000000000000e+00 1.127010231169071e+00 1.551807554033271e+00 4.029359408352917e-07 7.933652665048641e-06 - 2.000000000000000e+00 8.899061205561563e-01 1.154606179589197e+00 3.551885614183625e-06 2.316466660645666e-05 - 3.000000000000000e+00 7.106424210639757e-01 1.023549409701108e+00 6.261204531621267e-06 3.242421193494494e-05 - 4.000000000000000e+00 8.204814601813510e-01 1.374657421210761e+00 7.091557812533011e-06 2.555916152413573e-05 - 5.000000000000000e+00 1.068572372339015e+00 1.691864172592888e+00 7.403452418897061e-06 2.527001153240782e-05 - 6.000000000000000e+00 1.216592470265054e+00 1.677579961463762e+00 4.971017596444582e-06 2.788461888481031e-05 - 7.000000000000000e+00 1.173447050388805e+00 1.342528207391852e+00 1.144194168967161e-05 7.283532329349640e-05 - 8.000000000000000e+00 9.629518083856625e-01 1.012162097171965e+00 1.360523049986906e-05 5.010376176772802e-05 - 9.000000000000000e+00 7.378729059558163e-01 1.183922375566823e+00 1.460718994794608e-05 5.585820004605502e-05 - 1.000000000000000e+01 7.618958276795634e-01 1.577122317502578e+00 1.379254435052157e-05 4.030473120475442e-05 + 1.000000000000000e+00 1.127010231169071e+00 1.551807554033266e+00 4.029359408352917e-07 7.933652660385704e-06 + 2.000000000000000e+00 8.899061205559413e-01 1.154606179579956e+00 3.551885399244448e-06 2.316465736562634e-05 + 3.000000000000000e+00 7.106424212341577e-01 1.023549411912243e+00 6.261374713600887e-06 3.242642307044186e-05 + 4.000000000000000e+00 8.204814571358759e-01 1.374657408976591e+00 7.088512337438679e-06 2.554692735379227e-05 + 5.000000000000000e+00 1.068572364198821e+00 1.691864129787617e+00 7.395312224378614e-06 2.522720626196850e-05 + 6.000000000000000e+00 1.216592227118846e+00 1.677571467388444e+00 4.727871388388039e-06 1.939054356636660e-05 + 7.000000000000000e+00 1.173443618841214e+00 1.342493467296904e+00 8.010394098256768e-06 3.809522834541390e-05 + 8.000000000000000e+00 9.629424396388875e-01 1.012121124268885e+00 4.236483724828766e-06 9.130858687589338e-06 + 9.000000000000000e+00 7.378604981968989e-01 1.183872079873866e+00 2.199431030525112e-06 5.562507089162949e-06 + 1.000000000000000e+01 7.618819895397966e-01 1.577086853397597e+00 4.559541633142317e-08 4.840626223412414e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00714850788732 -Steps = 1502 -Error test fails = 92 +Current time = 10.00417454325856 +Steps = 1575 +Error test fails = 96 NLS step fails = 0 Initial step size = 0.0001029860256095084 -Last step size = 0.009862197222912128 -Current step size = 0.009862197222912128 +Last step size = 0.01182372679957014 +Current step size = 0.01182372679957014 Last method order = 5 Current method order = 5 Stab. lim. order reductions = 0 -RHS fn evals = 1897 -NLS iters = 1894 -NLS fails = 1 -NLS iters per step = 1.26098535286285 -LS setups = 166 -Jac fn evals = 27 +RHS fn evals = 2002 +NLS iters = 1999 +NLS fails = 0 +NLS iters per step = 1.269206349206349 +LS setups = 178 +Jac fn evals = 28 LS RHS fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.01425554382259768 +Jac evals per NLS iter = 0.01400700350175088 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_min_fx_1.0_--eta_min_0.5.out b/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_min_fx_1.0_--eta_min_0.5.out index c4664a2deb..cafa9f1252 100644 --- a/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_min_fx_1.0_--eta_min_0.5.out +++ b/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_min_fx_1.0_--eta_min_0.5.out @@ -2,32 +2,32 @@ ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00 1.127017686767897e+00 1.551821503613988e+00 7.858534767146708e-06 2.188323338225828e-05 - 2.000000000000000e+00 8.899103332792471e-01 1.154608370771088e+00 7.764608704996512e-06 2.535584849794326e-05 - 3.000000000000000e+00 7.106411292975151e-01 1.023536808224800e+00 4.969438071045218e-06 1.982273562739501e-05 - 4.000000000000000e+00 8.204838923453025e-01 1.374669642759487e+00 9.523721763993187e-06 3.778071025029028e-05 - 5.000000000000000e+00 1.068571738765126e+00 1.691858739922128e+00 6.769878529766515e-06 1.983734077248833e-05 - 6.000000000000000e+00 1.216596138753578e+00 1.677586205148419e+00 8.639506119845208e-06 3.412830354121432e-05 - 7.000000000000000e+00 1.173445555523058e+00 1.342501389353217e+00 9.947075942040584e-06 4.601728465791766e-05 - 8.000000000000000e+00 9.629437694992675e-01 1.012111079263365e+00 5.566344104868115e-06 9.141468324536106e-07 - 9.000000000000000e+00 7.378567118749449e-01 1.183847487150188e+00 1.586890923443995e-06 1.903021658944404e-05 - 1.000000000000000e+01 7.618782369340520e-01 1.577065913116525e+00 3.798201160920556e-06 1.609965484838938e-05 + 2.000000000000000e+00 8.899103332791866e-01 1.154608370768354e+00 7.764608644489357e-06 2.535584576346395e-05 + 3.000000000000000e+00 7.106410660756778e-01 1.023529279576880e+00 4.906216233724336e-06 1.229408770742069e-05 + 4.000000000000000e+00 8.204730617922310e-01 1.374621086116680e+00 1.306831307501533e-06 1.077593255716103e-05 + 5.000000000000000e+00 1.068564764620663e+00 1.691839212204075e+00 2.042659332790464e-07 3.096227194632206e-07 + 6.000000000000000e+00 1.216586539798704e+00 1.677542924381987e+00 9.594487537789576e-07 9.152462890238411e-06 + 7.000000000000000e+00 1.173434026092493e+00 1.342453786414837e+00 1.582354622442494e-06 1.585653721880576e-06 + 8.000000000000000e+00 9.629416122015924e-01 1.012142316337908e+00 3.409046429703189e-06 3.032292771099065e-05 + 9.000000000000000e+00 7.378651980553826e-01 1.183892379308912e+00 6.899289514250562e-06 2.586194213471948e-05 + 1.000000000000000e+01 7.618838841024592e-01 1.577079185839070e+00 1.848967246309563e-06 2.826932303578999e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00040955930806 -Steps = 1559 -Error test fails = 143 +Current time = 10.00136810102964 +Steps = 1577 +Error test fails = 147 NLS step fails = 0 Initial step size = 0.0001029860256095084 -Last step size = 0.006823439174537314 -Current step size = 0.006823439174537314 +Last step size = 0.006383607841908422 +Current step size = 0.006383607841908422 Last method order = 4 Current method order = 4 Stab. lim. order reductions = 0 -RHS fn evals = 2155 -NLS iters = 2152 +RHS fn evals = 2197 +NLS iters = 2194 NLS fails = 0 -NLS iters per step = 1.380372033354714 -LS setups = 266 -Jac fn evals = 28 +NLS iters per step = 1.391249207355739 +LS setups = 272 +Jac fn evals = 29 LS RHS fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.01301115241635688 +Jac evals per NLS iter = 0.01321786690975387 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_min_gs_2.out b/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_min_gs_2.out index c4664a2deb..cafa9f1252 100644 --- a/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_min_gs_2.out +++ b/test/unit_tests/cvodes/CXX_serial/cvs_test_kpr_--eta_min_gs_2.out @@ -2,32 +2,32 @@ ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 1.000000000000000e+00 1.127017686767897e+00 1.551821503613988e+00 7.858534767146708e-06 2.188323338225828e-05 - 2.000000000000000e+00 8.899103332792471e-01 1.154608370771088e+00 7.764608704996512e-06 2.535584849794326e-05 - 3.000000000000000e+00 7.106411292975151e-01 1.023536808224800e+00 4.969438071045218e-06 1.982273562739501e-05 - 4.000000000000000e+00 8.204838923453025e-01 1.374669642759487e+00 9.523721763993187e-06 3.778071025029028e-05 - 5.000000000000000e+00 1.068571738765126e+00 1.691858739922128e+00 6.769878529766515e-06 1.983734077248833e-05 - 6.000000000000000e+00 1.216596138753578e+00 1.677586205148419e+00 8.639506119845208e-06 3.412830354121432e-05 - 7.000000000000000e+00 1.173445555523058e+00 1.342501389353217e+00 9.947075942040584e-06 4.601728465791766e-05 - 8.000000000000000e+00 9.629437694992675e-01 1.012111079263365e+00 5.566344104868115e-06 9.141468324536106e-07 - 9.000000000000000e+00 7.378567118749449e-01 1.183847487150188e+00 1.586890923443995e-06 1.903021658944404e-05 - 1.000000000000000e+01 7.618782369340520e-01 1.577065913116525e+00 3.798201160920556e-06 1.609965484838938e-05 + 2.000000000000000e+00 8.899103332791866e-01 1.154608370768354e+00 7.764608644489357e-06 2.535584576346395e-05 + 3.000000000000000e+00 7.106410660756778e-01 1.023529279576880e+00 4.906216233724336e-06 1.229408770742069e-05 + 4.000000000000000e+00 8.204730617922310e-01 1.374621086116680e+00 1.306831307501533e-06 1.077593255716103e-05 + 5.000000000000000e+00 1.068564764620663e+00 1.691839212204075e+00 2.042659332790464e-07 3.096227194632206e-07 + 6.000000000000000e+00 1.216586539798704e+00 1.677542924381987e+00 9.594487537789576e-07 9.152462890238411e-06 + 7.000000000000000e+00 1.173434026092493e+00 1.342453786414837e+00 1.582354622442494e-06 1.585653721880576e-06 + 8.000000000000000e+00 9.629416122015924e-01 1.012142316337908e+00 3.409046429703189e-06 3.032292771099065e-05 + 9.000000000000000e+00 7.378651980553826e-01 1.183892379308912e+00 6.899289514250562e-06 2.586194213471948e-05 + 1.000000000000000e+01 7.618838841024592e-01 1.577079185839070e+00 1.848967246309563e-06 2.826932303578999e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00040955930806 -Steps = 1559 -Error test fails = 143 +Current time = 10.00136810102964 +Steps = 1577 +Error test fails = 147 NLS step fails = 0 Initial step size = 0.0001029860256095084 -Last step size = 0.006823439174537314 -Current step size = 0.006823439174537314 +Last step size = 0.006383607841908422 +Current step size = 0.006383607841908422 Last method order = 4 Current method order = 4 Stab. lim. order reductions = 0 -RHS fn evals = 2155 -NLS iters = 2152 +RHS fn evals = 2197 +NLS iters = 2194 NLS fails = 0 -NLS iters per step = 1.380372033354714 -LS setups = 266 -Jac fn evals = 28 +NLS iters per step = 1.391249207355739 +LS setups = 272 +Jac fn evals = 29 LS RHS fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.01301115241635688 +Jac evals per NLS iter = 0.01321786690975387 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/ida/CXX_serial/ida_test_kpr.out b/test/unit_tests/ida/CXX_serial/ida_test_kpr.out index af4992fa58..c6a5d6971f 100644 --- a/test/unit_tests/ida/CXX_serial/ida_test_kpr.out +++ b/test/unit_tests/ida/CXX_serial/ida_test_kpr.out @@ -1,33 +1,33 @@ t u v u err v err ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 - 1.000000000000000e+00 1.127008886931081e+00 1.551800624068247e+00 9.413020496396030e-07 1.003687641665252e-06 - 2.000000000000000e+00 8.899033257012232e-01 1.154581589731097e+00 7.570306811421901e-07 1.425191492820943e-06 - 3.000000000000000e+00 7.106359156304887e-01 1.023509838887233e+00 2.442289553927779e-07 7.146601939345132e-06 - 4.000000000000000e+00 8.204744562446226e-01 1.374632991052660e+00 8.762108405502289e-08 1.129003422972730e-06 - 5.000000000000000e+00 1.068567367706359e+00 1.691845610743153e+00 2.398819762383653e-06 6.708161797819301e-06 - 6.000000000000000e+00 1.216589366856727e+00 1.677560644996338e+00 1.867609269012860e-06 8.568151460774942e-06 - 7.000000000000000e+00 1.173439187063617e+00 1.342474213911926e+00 3.578616501576093e-06 1.884184336709005e-05 - 8.000000000000000e+00 9.629417174589088e-01 1.012119988627952e+00 3.514303746121605e-06 7.995217754963591e-06 - 9.000000000000000e+00 7.378606025350759e-01 1.183877114777252e+00 2.303769207512296e-06 1.059741047493290e-05 - 1.000000000000000e+01 7.618838737365803e-01 1.577084968262613e+00 1.838601367376569e-06 2.955491239520214e-06 + 1.000000000000000e+00 1.127008886931081e+00 1.551800624068248e+00 9.413020487514245e-07 1.003687642553430e-06 + 2.000000000000000e+00 8.899033257012224e-01 1.154581589731098e+00 7.570306803650340e-07 1.425191492376854e-06 + 3.000000000000000e+00 7.106359156305051e-01 1.023509838887361e+00 2.442289389614771e-07 7.146601811891529e-06 + 4.000000000000000e+00 8.204744562446277e-01 1.374632991052715e+00 8.762108916204880e-08 1.129003477817747e-06 + 5.000000000000000e+00 1.068567367706273e+00 1.691845610742846e+00 2.398819676674435e-06 6.708161490731612e-06 + 6.000000000000000e+00 1.216589366856521e+00 1.677560644963124e+00 1.867609063621600e-06 8.568118246898848e-06 + 7.000000000000000e+00 1.173439187151612e+00 1.342474213415192e+00 3.578704496520757e-06 1.884134663332482e-05 + 8.000000000000000e+00 9.629416032539853e-01 1.012115556387471e+00 3.400098822603503e-06 3.562977273663392e-06 + 9.000000000000000e+00 7.378627045323199e-01 1.183882592399333e+00 4.405766451553994e-06 1.607503255574017e-05 + 1.000000000000000e+01 7.618850249117836e-01 1.577090524690380e+00 2.989776570649916e-06 8.511919006970459e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00592015471712 -Steps = 1841 +Current time = 10.00070463206685 +Steps = 1851 Error test fails = 79 NLS step fails = 0 Initial step size = 0.001 -Last step size = 0.006029980790852448 -Current step size = 0.006029980790852448 -Last method order = 4 -Current method order = 4 -Residual fn evals = 2397 +Last step size = 0.008223200209206106 +Current step size = 0.008223200209206106 +Last method order = 5 +Current method order = 5 +Residual fn evals = 2458 IC linesearch backtrack ops = 0 -NLS iters = 2397 +NLS iters = 2458 NLS fails = 0 -NLS iters per step = 1.302009777294948 -LS setups = 85 -Jac fn evals = 85 +NLS iters per step = 1.327930848190167 +LS setups = 84 +Jac fn evals = 84 LS residual fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.03546099290780142 +Jac evals per NLS iter = 0.03417412530512612 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/ida/CXX_serial/ida_test_kpr_--dcj_0.9.out b/test/unit_tests/ida/CXX_serial/ida_test_kpr_--dcj_0.9.out index a5157bd5b6..23fee605c1 100644 --- a/test/unit_tests/ida/CXX_serial/ida_test_kpr_--dcj_0.9.out +++ b/test/unit_tests/ida/CXX_serial/ida_test_kpr_--dcj_0.9.out @@ -1,31 +1,31 @@ t u v u err v err ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 - 1.000000000000000e+00 1.127008796560332e+00 1.551802384449904e+00 1.031672798301742e-06 2.764069298111238e-06 - 2.000000000000000e+00 8.899024587137806e-01 1.154584099853341e+00 1.099567614737396e-07 1.084930751238389e-06 - 3.000000000000000e+00 7.106360858945575e-01 1.023513423631075e+00 7.396488654887179e-08 3.561858098244386e-06 - 4.000000000000000e+00 8.204739309480567e-01 1.374628697376117e+00 4.376754818569140e-07 3.164673120226169e-06 - 5.000000000000000e+00 1.068565080910622e+00 1.691836445942001e+00 1.120240256113902e-07 2.456639354164736e-06 - 6.000000000000000e+00 1.216588606994998e+00 1.677547963528577e+00 1.107747540585180e-06 4.113316300902170e-06 - 7.000000000000000e+00 1.173435937501828e+00 1.342464725916630e+00 3.290547128109722e-07 9.353848071658177e-06 - 8.000000000000000e+00 9.629398000974635e-01 1.012112901634551e+00 1.596942300841064e-06 9.082243537239520e-07 - 9.000000000000000e+00 7.378589522466482e-01 1.183873325967590e+00 6.534807798219688e-07 6.808600812702181e-06 - 1.000000000000000e+01 7.618820715520634e-01 1.577083311348172e+00 3.641685053512589e-08 1.298576798980378e-06 + 1.000000000000000e+00 1.127008796560090e+00 1.551802384450390e+00 1.031673040552405e-06 2.764069783944834e-06 + 2.000000000000000e+00 8.899024587061005e-01 1.154584099829441e+00 1.099644415525347e-07 1.084906850579159e-06 + 3.000000000000000e+00 7.106341381245095e-01 1.023516125817520e+00 2.021734934576358e-06 8.596716523090464e-07 + 4.000000000000000e+00 8.204761103543468e-01 1.374623695480249e+00 1.741730808246800e-06 8.166568988166034e-06 + 5.000000000000000e+00 1.068566455849070e+00 1.691836406184612e+00 1.486962473151721e-06 2.496396743323359e-06 + 6.000000000000000e+00 1.216587396276122e+00 1.677549862786460e+00 1.029713361244688e-07 2.214058417271403e-06 + 7.000000000000000e+00 1.173432831494270e+00 1.342453586052060e+00 2.776952845673364e-06 1.786016498472875e-06 + 8.000000000000000e+00 9.629368111847777e-01 1.012117431854594e+00 1.391970384956309e-06 5.438444397487530e-06 + 9.000000000000000e+00 7.378576386596475e-01 1.183859435812292e+00 6.601062209066200e-07 7.081554485699471e-06 + 1.000000000000000e+01 7.618809862203583e-01 1.577081905588531e+00 1.048914854639982e-06 1.071828417131826e-07 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00260922004195 -Steps = 2294 -Error test fails = 35 +Current time = 10.00297949228985 +Steps = 2246 +Error test fails = 38 NLS step fails = 0 Initial step size = 0.001 -Last step size = 0.004118302466636572 -Current step size = 0.004118302466636572 +Last step size = 0.004072547150731173 +Current step size = 0.004072547150731173 Last method order = 5 Current method order = 5 -Residual fn evals = 4368 +Residual fn evals = 4297 IC linesearch backtrack ops = 0 -NLS iters = 4368 +NLS iters = 4297 NLS fails = 1 -NLS iters per step = 1.90409764603313 +NLS iters per step = 1.913178984861977 LS setups = 5 Jac fn evals = 5 LS residual fn evals = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.001144688644688645 +Jac evals per NLS iter = 0.001163602513381429 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/ida/CXX_serial/ida_test_kpr_--eta_cf_0.5.out b/test/unit_tests/ida/CXX_serial/ida_test_kpr_--eta_cf_0.5.out index af4992fa58..c6a5d6971f 100644 --- a/test/unit_tests/ida/CXX_serial/ida_test_kpr_--eta_cf_0.5.out +++ b/test/unit_tests/ida/CXX_serial/ida_test_kpr_--eta_cf_0.5.out @@ -1,33 +1,33 @@ t u v u err v err ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 - 1.000000000000000e+00 1.127008886931081e+00 1.551800624068247e+00 9.413020496396030e-07 1.003687641665252e-06 - 2.000000000000000e+00 8.899033257012232e-01 1.154581589731097e+00 7.570306811421901e-07 1.425191492820943e-06 - 3.000000000000000e+00 7.106359156304887e-01 1.023509838887233e+00 2.442289553927779e-07 7.146601939345132e-06 - 4.000000000000000e+00 8.204744562446226e-01 1.374632991052660e+00 8.762108405502289e-08 1.129003422972730e-06 - 5.000000000000000e+00 1.068567367706359e+00 1.691845610743153e+00 2.398819762383653e-06 6.708161797819301e-06 - 6.000000000000000e+00 1.216589366856727e+00 1.677560644996338e+00 1.867609269012860e-06 8.568151460774942e-06 - 7.000000000000000e+00 1.173439187063617e+00 1.342474213911926e+00 3.578616501576093e-06 1.884184336709005e-05 - 8.000000000000000e+00 9.629417174589088e-01 1.012119988627952e+00 3.514303746121605e-06 7.995217754963591e-06 - 9.000000000000000e+00 7.378606025350759e-01 1.183877114777252e+00 2.303769207512296e-06 1.059741047493290e-05 - 1.000000000000000e+01 7.618838737365803e-01 1.577084968262613e+00 1.838601367376569e-06 2.955491239520214e-06 + 1.000000000000000e+00 1.127008886931081e+00 1.551800624068248e+00 9.413020487514245e-07 1.003687642553430e-06 + 2.000000000000000e+00 8.899033257012224e-01 1.154581589731098e+00 7.570306803650340e-07 1.425191492376854e-06 + 3.000000000000000e+00 7.106359156305051e-01 1.023509838887361e+00 2.442289389614771e-07 7.146601811891529e-06 + 4.000000000000000e+00 8.204744562446277e-01 1.374632991052715e+00 8.762108916204880e-08 1.129003477817747e-06 + 5.000000000000000e+00 1.068567367706273e+00 1.691845610742846e+00 2.398819676674435e-06 6.708161490731612e-06 + 6.000000000000000e+00 1.216589366856521e+00 1.677560644963124e+00 1.867609063621600e-06 8.568118246898848e-06 + 7.000000000000000e+00 1.173439187151612e+00 1.342474213415192e+00 3.578704496520757e-06 1.884134663332482e-05 + 8.000000000000000e+00 9.629416032539853e-01 1.012115556387471e+00 3.400098822603503e-06 3.562977273663392e-06 + 9.000000000000000e+00 7.378627045323199e-01 1.183882592399333e+00 4.405766451553994e-06 1.607503255574017e-05 + 1.000000000000000e+01 7.618850249117836e-01 1.577090524690380e+00 2.989776570649916e-06 8.511919006970459e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00592015471712 -Steps = 1841 +Current time = 10.00070463206685 +Steps = 1851 Error test fails = 79 NLS step fails = 0 Initial step size = 0.001 -Last step size = 0.006029980790852448 -Current step size = 0.006029980790852448 -Last method order = 4 -Current method order = 4 -Residual fn evals = 2397 +Last step size = 0.008223200209206106 +Current step size = 0.008223200209206106 +Last method order = 5 +Current method order = 5 +Residual fn evals = 2458 IC linesearch backtrack ops = 0 -NLS iters = 2397 +NLS iters = 2458 NLS fails = 0 -NLS iters per step = 1.302009777294948 -LS setups = 85 -Jac fn evals = 85 +NLS iters per step = 1.327930848190167 +LS setups = 84 +Jac fn evals = 84 LS residual fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.03546099290780142 +Jac evals per NLS iter = 0.03417412530512612 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/ida/CXX_serial/ida_test_kpr_--eta_max_fs_2.out b/test/unit_tests/ida/CXX_serial/ida_test_kpr_--eta_max_fs_2.out index af4992fa58..c6a5d6971f 100644 --- a/test/unit_tests/ida/CXX_serial/ida_test_kpr_--eta_max_fs_2.out +++ b/test/unit_tests/ida/CXX_serial/ida_test_kpr_--eta_max_fs_2.out @@ -1,33 +1,33 @@ t u v u err v err ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 - 1.000000000000000e+00 1.127008886931081e+00 1.551800624068247e+00 9.413020496396030e-07 1.003687641665252e-06 - 2.000000000000000e+00 8.899033257012232e-01 1.154581589731097e+00 7.570306811421901e-07 1.425191492820943e-06 - 3.000000000000000e+00 7.106359156304887e-01 1.023509838887233e+00 2.442289553927779e-07 7.146601939345132e-06 - 4.000000000000000e+00 8.204744562446226e-01 1.374632991052660e+00 8.762108405502289e-08 1.129003422972730e-06 - 5.000000000000000e+00 1.068567367706359e+00 1.691845610743153e+00 2.398819762383653e-06 6.708161797819301e-06 - 6.000000000000000e+00 1.216589366856727e+00 1.677560644996338e+00 1.867609269012860e-06 8.568151460774942e-06 - 7.000000000000000e+00 1.173439187063617e+00 1.342474213911926e+00 3.578616501576093e-06 1.884184336709005e-05 - 8.000000000000000e+00 9.629417174589088e-01 1.012119988627952e+00 3.514303746121605e-06 7.995217754963591e-06 - 9.000000000000000e+00 7.378606025350759e-01 1.183877114777252e+00 2.303769207512296e-06 1.059741047493290e-05 - 1.000000000000000e+01 7.618838737365803e-01 1.577084968262613e+00 1.838601367376569e-06 2.955491239520214e-06 + 1.000000000000000e+00 1.127008886931081e+00 1.551800624068248e+00 9.413020487514245e-07 1.003687642553430e-06 + 2.000000000000000e+00 8.899033257012224e-01 1.154581589731098e+00 7.570306803650340e-07 1.425191492376854e-06 + 3.000000000000000e+00 7.106359156305051e-01 1.023509838887361e+00 2.442289389614771e-07 7.146601811891529e-06 + 4.000000000000000e+00 8.204744562446277e-01 1.374632991052715e+00 8.762108916204880e-08 1.129003477817747e-06 + 5.000000000000000e+00 1.068567367706273e+00 1.691845610742846e+00 2.398819676674435e-06 6.708161490731612e-06 + 6.000000000000000e+00 1.216589366856521e+00 1.677560644963124e+00 1.867609063621600e-06 8.568118246898848e-06 + 7.000000000000000e+00 1.173439187151612e+00 1.342474213415192e+00 3.578704496520757e-06 1.884134663332482e-05 + 8.000000000000000e+00 9.629416032539853e-01 1.012115556387471e+00 3.400098822603503e-06 3.562977273663392e-06 + 9.000000000000000e+00 7.378627045323199e-01 1.183882592399333e+00 4.405766451553994e-06 1.607503255574017e-05 + 1.000000000000000e+01 7.618850249117836e-01 1.577090524690380e+00 2.989776570649916e-06 8.511919006970459e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00592015471712 -Steps = 1841 +Current time = 10.00070463206685 +Steps = 1851 Error test fails = 79 NLS step fails = 0 Initial step size = 0.001 -Last step size = 0.006029980790852448 -Current step size = 0.006029980790852448 -Last method order = 4 -Current method order = 4 -Residual fn evals = 2397 +Last step size = 0.008223200209206106 +Current step size = 0.008223200209206106 +Last method order = 5 +Current method order = 5 +Residual fn evals = 2458 IC linesearch backtrack ops = 0 -NLS iters = 2397 +NLS iters = 2458 NLS fails = 0 -NLS iters per step = 1.302009777294948 -LS setups = 85 -Jac fn evals = 85 +NLS iters per step = 1.327930848190167 +LS setups = 84 +Jac fn evals = 84 LS residual fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.03546099290780142 +Jac evals per NLS iter = 0.03417412530512612 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/ida/CXX_serial/ida_test_kpr_--eta_min_2.out b/test/unit_tests/ida/CXX_serial/ida_test_kpr_--eta_min_2.out index af4992fa58..c6a5d6971f 100644 --- a/test/unit_tests/ida/CXX_serial/ida_test_kpr_--eta_min_2.out +++ b/test/unit_tests/ida/CXX_serial/ida_test_kpr_--eta_min_2.out @@ -1,33 +1,33 @@ t u v u err v err ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 - 1.000000000000000e+00 1.127008886931081e+00 1.551800624068247e+00 9.413020496396030e-07 1.003687641665252e-06 - 2.000000000000000e+00 8.899033257012232e-01 1.154581589731097e+00 7.570306811421901e-07 1.425191492820943e-06 - 3.000000000000000e+00 7.106359156304887e-01 1.023509838887233e+00 2.442289553927779e-07 7.146601939345132e-06 - 4.000000000000000e+00 8.204744562446226e-01 1.374632991052660e+00 8.762108405502289e-08 1.129003422972730e-06 - 5.000000000000000e+00 1.068567367706359e+00 1.691845610743153e+00 2.398819762383653e-06 6.708161797819301e-06 - 6.000000000000000e+00 1.216589366856727e+00 1.677560644996338e+00 1.867609269012860e-06 8.568151460774942e-06 - 7.000000000000000e+00 1.173439187063617e+00 1.342474213911926e+00 3.578616501576093e-06 1.884184336709005e-05 - 8.000000000000000e+00 9.629417174589088e-01 1.012119988627952e+00 3.514303746121605e-06 7.995217754963591e-06 - 9.000000000000000e+00 7.378606025350759e-01 1.183877114777252e+00 2.303769207512296e-06 1.059741047493290e-05 - 1.000000000000000e+01 7.618838737365803e-01 1.577084968262613e+00 1.838601367376569e-06 2.955491239520214e-06 + 1.000000000000000e+00 1.127008886931081e+00 1.551800624068248e+00 9.413020487514245e-07 1.003687642553430e-06 + 2.000000000000000e+00 8.899033257012224e-01 1.154581589731098e+00 7.570306803650340e-07 1.425191492376854e-06 + 3.000000000000000e+00 7.106359156305051e-01 1.023509838887361e+00 2.442289389614771e-07 7.146601811891529e-06 + 4.000000000000000e+00 8.204744562446277e-01 1.374632991052715e+00 8.762108916204880e-08 1.129003477817747e-06 + 5.000000000000000e+00 1.068567367706273e+00 1.691845610742846e+00 2.398819676674435e-06 6.708161490731612e-06 + 6.000000000000000e+00 1.216589366856521e+00 1.677560644963124e+00 1.867609063621600e-06 8.568118246898848e-06 + 7.000000000000000e+00 1.173439187151612e+00 1.342474213415192e+00 3.578704496520757e-06 1.884134663332482e-05 + 8.000000000000000e+00 9.629416032539853e-01 1.012115556387471e+00 3.400098822603503e-06 3.562977273663392e-06 + 9.000000000000000e+00 7.378627045323199e-01 1.183882592399333e+00 4.405766451553994e-06 1.607503255574017e-05 + 1.000000000000000e+01 7.618850249117836e-01 1.577090524690380e+00 2.989776570649916e-06 8.511919006970459e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00592015471712 -Steps = 1841 +Current time = 10.00070463206685 +Steps = 1851 Error test fails = 79 NLS step fails = 0 Initial step size = 0.001 -Last step size = 0.006029980790852448 -Current step size = 0.006029980790852448 -Last method order = 4 -Current method order = 4 -Residual fn evals = 2397 +Last step size = 0.008223200209206106 +Current step size = 0.008223200209206106 +Last method order = 5 +Current method order = 5 +Residual fn evals = 2458 IC linesearch backtrack ops = 0 -NLS iters = 2397 +NLS iters = 2458 NLS fails = 0 -NLS iters per step = 1.302009777294948 -LS setups = 85 -Jac fn evals = 85 +NLS iters per step = 1.327930848190167 +LS setups = 84 +Jac fn evals = 84 LS residual fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.03546099290780142 +Jac evals per NLS iter = 0.03417412530512612 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/ida/CXX_serial/ida_test_kpr_--eta_min_ef_0.5.out b/test/unit_tests/ida/CXX_serial/ida_test_kpr_--eta_min_ef_0.5.out index 94f08efdce..bd783e9155 100644 --- a/test/unit_tests/ida/CXX_serial/ida_test_kpr_--eta_min_ef_0.5.out +++ b/test/unit_tests/ida/CXX_serial/ida_test_kpr_--eta_min_ef_0.5.out @@ -1,33 +1,33 @@ t u v u err v err ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 - 1.000000000000000e+00 1.127010934815940e+00 1.551804577771051e+00 1.106582809606849e-06 4.957390445259335e-06 - 2.000000000000000e+00 8.899037379529532e-01 1.154587457548306e+00 1.169282411117578e-06 4.442625715528337e-06 - 3.000000000000000e+00 7.106373258289668e-01 1.023525952783798e+00 1.165969522709531e-06 8.967294625517042e-06 - 4.000000000000000e+00 8.204767070144955e-01 1.374642569697146e+00 2.338390956979630e-06 1.070764790855883e-05 - 5.000000000000000e+00 1.068568876973751e+00 1.691849793088502e+00 3.908087154114170e-06 1.089050714697670e-05 - 6.000000000000000e+00 1.216589706020479e+00 1.677562428308899e+00 2.206773020985153e-06 1.035146402172948e-05 - 7.000000000000000e+00 1.173438010775863e+00 1.342468911009537e+00 2.402328747042048e-06 1.353894097877451e-05 - 8.000000000000000e+00 9.629425468345103e-01 1.012129827732488e+00 4.343679347651452e-06 1.783432229074400e-05 - 9.000000000000000e+00 7.378627353947157e-01 1.183886759184423e+00 4.436628847304114e-06 2.024181764559430e-05 - 1.000000000000000e+01 7.618854790077282e-01 1.577091323024696e+00 3.443872515274116e-06 9.310253322958317e-06 + 1.000000000000000e+00 1.127010934815940e+00 1.551804577771052e+00 1.106582809828893e-06 4.957390446369558e-06 + 2.000000000000000e+00 8.899037379529640e-01 1.154587457548333e+00 1.169282421886741e-06 4.442625742839823e-06 + 3.000000000000000e+00 7.106373258289136e-01 1.023525952781695e+00 1.165969469529848e-06 8.967292522532588e-06 + 4.000000000000000e+00 8.204767070163577e-01 1.374642569717103e+00 2.338392819156709e-06 1.070766786548383e-05 + 5.000000000000000e+00 1.068568876973022e+00 1.691849793032933e+00 3.908086425807866e-06 1.089045157764978e-05 + 6.000000000000000e+00 1.216589705164396e+00 1.677562428336776e+00 2.205916938669006e-06 1.035149189809736e-05 + 7.000000000000000e+00 1.173438426040947e+00 1.342476942416445e+00 2.817593831361265e-06 2.157034788607959e-05 + 8.000000000000000e+00 9.629412087571725e-01 1.012125432139581e+00 3.005602009831243e-06 1.343872938441848e-05 + 9.000000000000000e+00 7.378620211826220e-01 1.183879667396247e+00 3.722416753615398e-06 1.315002946999932e-05 + 1.000000000000000e+01 7.618816820118458e-01 1.577075168231631e+00 3.531233671028033e-07 6.844539742090205e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00034658755718 -Steps = 1858 -Error test fails = 78 +Current time = 10.00007889792687 +Steps = 1893 +Error test fails = 74 NLS step fails = 0 Initial step size = 0.001 -Last step size = 0.007155339774580808 -Current step size = 0.007155339774580808 +Last step size = 0.004133870052408764 +Current step size = 0.004133870052408764 Last method order = 5 Current method order = 5 -Residual fn evals = 2480 +Residual fn evals = 2517 IC linesearch backtrack ops = 0 -NLS iters = 2480 +NLS iters = 2517 NLS fails = 0 -NLS iters per step = 1.334768568353068 -LS setups = 76 -Jac fn evals = 76 +NLS iters per step = 1.329635499207607 +LS setups = 75 +Jac fn evals = 75 LS residual fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.03064516129032258 +Jac evals per NLS iter = 0.0297973778307509 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/ida/CXX_serial/ida_test_kpr_--eta_min_fx_1.0_--eta_max_fx_2.0.out b/test/unit_tests/ida/CXX_serial/ida_test_kpr_--eta_min_fx_1.0_--eta_max_fx_2.0.out index af4992fa58..c6a5d6971f 100644 --- a/test/unit_tests/ida/CXX_serial/ida_test_kpr_--eta_min_fx_1.0_--eta_max_fx_2.0.out +++ b/test/unit_tests/ida/CXX_serial/ida_test_kpr_--eta_min_fx_1.0_--eta_max_fx_2.0.out @@ -1,33 +1,33 @@ t u v u err v err ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 - 1.000000000000000e+00 1.127008886931081e+00 1.551800624068247e+00 9.413020496396030e-07 1.003687641665252e-06 - 2.000000000000000e+00 8.899033257012232e-01 1.154581589731097e+00 7.570306811421901e-07 1.425191492820943e-06 - 3.000000000000000e+00 7.106359156304887e-01 1.023509838887233e+00 2.442289553927779e-07 7.146601939345132e-06 - 4.000000000000000e+00 8.204744562446226e-01 1.374632991052660e+00 8.762108405502289e-08 1.129003422972730e-06 - 5.000000000000000e+00 1.068567367706359e+00 1.691845610743153e+00 2.398819762383653e-06 6.708161797819301e-06 - 6.000000000000000e+00 1.216589366856727e+00 1.677560644996338e+00 1.867609269012860e-06 8.568151460774942e-06 - 7.000000000000000e+00 1.173439187063617e+00 1.342474213911926e+00 3.578616501576093e-06 1.884184336709005e-05 - 8.000000000000000e+00 9.629417174589088e-01 1.012119988627952e+00 3.514303746121605e-06 7.995217754963591e-06 - 9.000000000000000e+00 7.378606025350759e-01 1.183877114777252e+00 2.303769207512296e-06 1.059741047493290e-05 - 1.000000000000000e+01 7.618838737365803e-01 1.577084968262613e+00 1.838601367376569e-06 2.955491239520214e-06 + 1.000000000000000e+00 1.127008886931081e+00 1.551800624068248e+00 9.413020487514245e-07 1.003687642553430e-06 + 2.000000000000000e+00 8.899033257012224e-01 1.154581589731098e+00 7.570306803650340e-07 1.425191492376854e-06 + 3.000000000000000e+00 7.106359156305051e-01 1.023509838887361e+00 2.442289389614771e-07 7.146601811891529e-06 + 4.000000000000000e+00 8.204744562446277e-01 1.374632991052715e+00 8.762108916204880e-08 1.129003477817747e-06 + 5.000000000000000e+00 1.068567367706273e+00 1.691845610742846e+00 2.398819676674435e-06 6.708161490731612e-06 + 6.000000000000000e+00 1.216589366856521e+00 1.677560644963124e+00 1.867609063621600e-06 8.568118246898848e-06 + 7.000000000000000e+00 1.173439187151612e+00 1.342474213415192e+00 3.578704496520757e-06 1.884134663332482e-05 + 8.000000000000000e+00 9.629416032539853e-01 1.012115556387471e+00 3.400098822603503e-06 3.562977273663392e-06 + 9.000000000000000e+00 7.378627045323199e-01 1.183882592399333e+00 4.405766451553994e-06 1.607503255574017e-05 + 1.000000000000000e+01 7.618850249117836e-01 1.577090524690380e+00 2.989776570649916e-06 8.511919006970459e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00592015471712 -Steps = 1841 +Current time = 10.00070463206685 +Steps = 1851 Error test fails = 79 NLS step fails = 0 Initial step size = 0.001 -Last step size = 0.006029980790852448 -Current step size = 0.006029980790852448 -Last method order = 4 -Current method order = 4 -Residual fn evals = 2397 +Last step size = 0.008223200209206106 +Current step size = 0.008223200209206106 +Last method order = 5 +Current method order = 5 +Residual fn evals = 2458 IC linesearch backtrack ops = 0 -NLS iters = 2397 +NLS iters = 2458 NLS fails = 0 -NLS iters per step = 1.302009777294948 -LS setups = 85 -Jac fn evals = 85 +NLS iters per step = 1.327930848190167 +LS setups = 84 +Jac fn evals = 84 LS residual fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.03546099290780142 +Jac evals per NLS iter = 0.03417412530512612 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/ida/CXX_serial/ida_test_kpr_--eta_min_fx_1.0_--eta_min_0.5.out b/test/unit_tests/ida/CXX_serial/ida_test_kpr_--eta_min_fx_1.0_--eta_min_0.5.out index af4992fa58..c6a5d6971f 100644 --- a/test/unit_tests/ida/CXX_serial/ida_test_kpr_--eta_min_fx_1.0_--eta_min_0.5.out +++ b/test/unit_tests/ida/CXX_serial/ida_test_kpr_--eta_min_fx_1.0_--eta_min_0.5.out @@ -1,33 +1,33 @@ t u v u err v err ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 - 1.000000000000000e+00 1.127008886931081e+00 1.551800624068247e+00 9.413020496396030e-07 1.003687641665252e-06 - 2.000000000000000e+00 8.899033257012232e-01 1.154581589731097e+00 7.570306811421901e-07 1.425191492820943e-06 - 3.000000000000000e+00 7.106359156304887e-01 1.023509838887233e+00 2.442289553927779e-07 7.146601939345132e-06 - 4.000000000000000e+00 8.204744562446226e-01 1.374632991052660e+00 8.762108405502289e-08 1.129003422972730e-06 - 5.000000000000000e+00 1.068567367706359e+00 1.691845610743153e+00 2.398819762383653e-06 6.708161797819301e-06 - 6.000000000000000e+00 1.216589366856727e+00 1.677560644996338e+00 1.867609269012860e-06 8.568151460774942e-06 - 7.000000000000000e+00 1.173439187063617e+00 1.342474213911926e+00 3.578616501576093e-06 1.884184336709005e-05 - 8.000000000000000e+00 9.629417174589088e-01 1.012119988627952e+00 3.514303746121605e-06 7.995217754963591e-06 - 9.000000000000000e+00 7.378606025350759e-01 1.183877114777252e+00 2.303769207512296e-06 1.059741047493290e-05 - 1.000000000000000e+01 7.618838737365803e-01 1.577084968262613e+00 1.838601367376569e-06 2.955491239520214e-06 + 1.000000000000000e+00 1.127008886931081e+00 1.551800624068248e+00 9.413020487514245e-07 1.003687642553430e-06 + 2.000000000000000e+00 8.899033257012224e-01 1.154581589731098e+00 7.570306803650340e-07 1.425191492376854e-06 + 3.000000000000000e+00 7.106359156305051e-01 1.023509838887361e+00 2.442289389614771e-07 7.146601811891529e-06 + 4.000000000000000e+00 8.204744562446277e-01 1.374632991052715e+00 8.762108916204880e-08 1.129003477817747e-06 + 5.000000000000000e+00 1.068567367706273e+00 1.691845610742846e+00 2.398819676674435e-06 6.708161490731612e-06 + 6.000000000000000e+00 1.216589366856521e+00 1.677560644963124e+00 1.867609063621600e-06 8.568118246898848e-06 + 7.000000000000000e+00 1.173439187151612e+00 1.342474213415192e+00 3.578704496520757e-06 1.884134663332482e-05 + 8.000000000000000e+00 9.629416032539853e-01 1.012115556387471e+00 3.400098822603503e-06 3.562977273663392e-06 + 9.000000000000000e+00 7.378627045323199e-01 1.183882592399333e+00 4.405766451553994e-06 1.607503255574017e-05 + 1.000000000000000e+01 7.618850249117836e-01 1.577090524690380e+00 2.989776570649916e-06 8.511919006970459e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00592015471712 -Steps = 1841 +Current time = 10.00070463206685 +Steps = 1851 Error test fails = 79 NLS step fails = 0 Initial step size = 0.001 -Last step size = 0.006029980790852448 -Current step size = 0.006029980790852448 -Last method order = 4 -Current method order = 4 -Residual fn evals = 2397 +Last step size = 0.008223200209206106 +Current step size = 0.008223200209206106 +Last method order = 5 +Current method order = 5 +Residual fn evals = 2458 IC linesearch backtrack ops = 0 -NLS iters = 2397 +NLS iters = 2458 NLS fails = 0 -NLS iters per step = 1.302009777294948 -LS setups = 85 -Jac fn evals = 85 +NLS iters per step = 1.327930848190167 +LS setups = 84 +Jac fn evals = 84 LS residual fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.03546099290780142 +Jac evals per NLS iter = 0.03417412530512612 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/idas/CXX_serial/idas_test_kpr.out b/test/unit_tests/idas/CXX_serial/idas_test_kpr.out index af4992fa58..c6a5d6971f 100644 --- a/test/unit_tests/idas/CXX_serial/idas_test_kpr.out +++ b/test/unit_tests/idas/CXX_serial/idas_test_kpr.out @@ -1,33 +1,33 @@ t u v u err v err ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 - 1.000000000000000e+00 1.127008886931081e+00 1.551800624068247e+00 9.413020496396030e-07 1.003687641665252e-06 - 2.000000000000000e+00 8.899033257012232e-01 1.154581589731097e+00 7.570306811421901e-07 1.425191492820943e-06 - 3.000000000000000e+00 7.106359156304887e-01 1.023509838887233e+00 2.442289553927779e-07 7.146601939345132e-06 - 4.000000000000000e+00 8.204744562446226e-01 1.374632991052660e+00 8.762108405502289e-08 1.129003422972730e-06 - 5.000000000000000e+00 1.068567367706359e+00 1.691845610743153e+00 2.398819762383653e-06 6.708161797819301e-06 - 6.000000000000000e+00 1.216589366856727e+00 1.677560644996338e+00 1.867609269012860e-06 8.568151460774942e-06 - 7.000000000000000e+00 1.173439187063617e+00 1.342474213911926e+00 3.578616501576093e-06 1.884184336709005e-05 - 8.000000000000000e+00 9.629417174589088e-01 1.012119988627952e+00 3.514303746121605e-06 7.995217754963591e-06 - 9.000000000000000e+00 7.378606025350759e-01 1.183877114777252e+00 2.303769207512296e-06 1.059741047493290e-05 - 1.000000000000000e+01 7.618838737365803e-01 1.577084968262613e+00 1.838601367376569e-06 2.955491239520214e-06 + 1.000000000000000e+00 1.127008886931081e+00 1.551800624068248e+00 9.413020487514245e-07 1.003687642553430e-06 + 2.000000000000000e+00 8.899033257012224e-01 1.154581589731098e+00 7.570306803650340e-07 1.425191492376854e-06 + 3.000000000000000e+00 7.106359156305051e-01 1.023509838887361e+00 2.442289389614771e-07 7.146601811891529e-06 + 4.000000000000000e+00 8.204744562446277e-01 1.374632991052715e+00 8.762108916204880e-08 1.129003477817747e-06 + 5.000000000000000e+00 1.068567367706273e+00 1.691845610742846e+00 2.398819676674435e-06 6.708161490731612e-06 + 6.000000000000000e+00 1.216589366856521e+00 1.677560644963124e+00 1.867609063621600e-06 8.568118246898848e-06 + 7.000000000000000e+00 1.173439187151612e+00 1.342474213415192e+00 3.578704496520757e-06 1.884134663332482e-05 + 8.000000000000000e+00 9.629416032539853e-01 1.012115556387471e+00 3.400098822603503e-06 3.562977273663392e-06 + 9.000000000000000e+00 7.378627045323199e-01 1.183882592399333e+00 4.405766451553994e-06 1.607503255574017e-05 + 1.000000000000000e+01 7.618850249117836e-01 1.577090524690380e+00 2.989776570649916e-06 8.511919006970459e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00592015471712 -Steps = 1841 +Current time = 10.00070463206685 +Steps = 1851 Error test fails = 79 NLS step fails = 0 Initial step size = 0.001 -Last step size = 0.006029980790852448 -Current step size = 0.006029980790852448 -Last method order = 4 -Current method order = 4 -Residual fn evals = 2397 +Last step size = 0.008223200209206106 +Current step size = 0.008223200209206106 +Last method order = 5 +Current method order = 5 +Residual fn evals = 2458 IC linesearch backtrack ops = 0 -NLS iters = 2397 +NLS iters = 2458 NLS fails = 0 -NLS iters per step = 1.302009777294948 -LS setups = 85 -Jac fn evals = 85 +NLS iters per step = 1.327930848190167 +LS setups = 84 +Jac fn evals = 84 LS residual fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.03546099290780142 +Jac evals per NLS iter = 0.03417412530512612 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/idas/CXX_serial/idas_test_kpr_--dcj_0.9.out b/test/unit_tests/idas/CXX_serial/idas_test_kpr_--dcj_0.9.out index a5157bd5b6..23fee605c1 100644 --- a/test/unit_tests/idas/CXX_serial/idas_test_kpr_--dcj_0.9.out +++ b/test/unit_tests/idas/CXX_serial/idas_test_kpr_--dcj_0.9.out @@ -1,31 +1,31 @@ t u v u err v err ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 - 1.000000000000000e+00 1.127008796560332e+00 1.551802384449904e+00 1.031672798301742e-06 2.764069298111238e-06 - 2.000000000000000e+00 8.899024587137806e-01 1.154584099853341e+00 1.099567614737396e-07 1.084930751238389e-06 - 3.000000000000000e+00 7.106360858945575e-01 1.023513423631075e+00 7.396488654887179e-08 3.561858098244386e-06 - 4.000000000000000e+00 8.204739309480567e-01 1.374628697376117e+00 4.376754818569140e-07 3.164673120226169e-06 - 5.000000000000000e+00 1.068565080910622e+00 1.691836445942001e+00 1.120240256113902e-07 2.456639354164736e-06 - 6.000000000000000e+00 1.216588606994998e+00 1.677547963528577e+00 1.107747540585180e-06 4.113316300902170e-06 - 7.000000000000000e+00 1.173435937501828e+00 1.342464725916630e+00 3.290547128109722e-07 9.353848071658177e-06 - 8.000000000000000e+00 9.629398000974635e-01 1.012112901634551e+00 1.596942300841064e-06 9.082243537239520e-07 - 9.000000000000000e+00 7.378589522466482e-01 1.183873325967590e+00 6.534807798219688e-07 6.808600812702181e-06 - 1.000000000000000e+01 7.618820715520634e-01 1.577083311348172e+00 3.641685053512589e-08 1.298576798980378e-06 + 1.000000000000000e+00 1.127008796560090e+00 1.551802384450390e+00 1.031673040552405e-06 2.764069783944834e-06 + 2.000000000000000e+00 8.899024587061005e-01 1.154584099829441e+00 1.099644415525347e-07 1.084906850579159e-06 + 3.000000000000000e+00 7.106341381245095e-01 1.023516125817520e+00 2.021734934576358e-06 8.596716523090464e-07 + 4.000000000000000e+00 8.204761103543468e-01 1.374623695480249e+00 1.741730808246800e-06 8.166568988166034e-06 + 5.000000000000000e+00 1.068566455849070e+00 1.691836406184612e+00 1.486962473151721e-06 2.496396743323359e-06 + 6.000000000000000e+00 1.216587396276122e+00 1.677549862786460e+00 1.029713361244688e-07 2.214058417271403e-06 + 7.000000000000000e+00 1.173432831494270e+00 1.342453586052060e+00 2.776952845673364e-06 1.786016498472875e-06 + 8.000000000000000e+00 9.629368111847777e-01 1.012117431854594e+00 1.391970384956309e-06 5.438444397487530e-06 + 9.000000000000000e+00 7.378576386596475e-01 1.183859435812292e+00 6.601062209066200e-07 7.081554485699471e-06 + 1.000000000000000e+01 7.618809862203583e-01 1.577081905588531e+00 1.048914854639982e-06 1.071828417131826e-07 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00260922004195 -Steps = 2294 -Error test fails = 35 +Current time = 10.00297949228985 +Steps = 2246 +Error test fails = 38 NLS step fails = 0 Initial step size = 0.001 -Last step size = 0.004118302466636572 -Current step size = 0.004118302466636572 +Last step size = 0.004072547150731173 +Current step size = 0.004072547150731173 Last method order = 5 Current method order = 5 -Residual fn evals = 4368 +Residual fn evals = 4297 IC linesearch backtrack ops = 0 -NLS iters = 4368 +NLS iters = 4297 NLS fails = 1 -NLS iters per step = 1.90409764603313 +NLS iters per step = 1.913178984861977 LS setups = 5 Jac fn evals = 5 LS residual fn evals = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.001144688644688645 +Jac evals per NLS iter = 0.001163602513381429 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/idas/CXX_serial/idas_test_kpr_--eta_cf_0.5.out b/test/unit_tests/idas/CXX_serial/idas_test_kpr_--eta_cf_0.5.out index af4992fa58..c6a5d6971f 100644 --- a/test/unit_tests/idas/CXX_serial/idas_test_kpr_--eta_cf_0.5.out +++ b/test/unit_tests/idas/CXX_serial/idas_test_kpr_--eta_cf_0.5.out @@ -1,33 +1,33 @@ t u v u err v err ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 - 1.000000000000000e+00 1.127008886931081e+00 1.551800624068247e+00 9.413020496396030e-07 1.003687641665252e-06 - 2.000000000000000e+00 8.899033257012232e-01 1.154581589731097e+00 7.570306811421901e-07 1.425191492820943e-06 - 3.000000000000000e+00 7.106359156304887e-01 1.023509838887233e+00 2.442289553927779e-07 7.146601939345132e-06 - 4.000000000000000e+00 8.204744562446226e-01 1.374632991052660e+00 8.762108405502289e-08 1.129003422972730e-06 - 5.000000000000000e+00 1.068567367706359e+00 1.691845610743153e+00 2.398819762383653e-06 6.708161797819301e-06 - 6.000000000000000e+00 1.216589366856727e+00 1.677560644996338e+00 1.867609269012860e-06 8.568151460774942e-06 - 7.000000000000000e+00 1.173439187063617e+00 1.342474213911926e+00 3.578616501576093e-06 1.884184336709005e-05 - 8.000000000000000e+00 9.629417174589088e-01 1.012119988627952e+00 3.514303746121605e-06 7.995217754963591e-06 - 9.000000000000000e+00 7.378606025350759e-01 1.183877114777252e+00 2.303769207512296e-06 1.059741047493290e-05 - 1.000000000000000e+01 7.618838737365803e-01 1.577084968262613e+00 1.838601367376569e-06 2.955491239520214e-06 + 1.000000000000000e+00 1.127008886931081e+00 1.551800624068248e+00 9.413020487514245e-07 1.003687642553430e-06 + 2.000000000000000e+00 8.899033257012224e-01 1.154581589731098e+00 7.570306803650340e-07 1.425191492376854e-06 + 3.000000000000000e+00 7.106359156305051e-01 1.023509838887361e+00 2.442289389614771e-07 7.146601811891529e-06 + 4.000000000000000e+00 8.204744562446277e-01 1.374632991052715e+00 8.762108916204880e-08 1.129003477817747e-06 + 5.000000000000000e+00 1.068567367706273e+00 1.691845610742846e+00 2.398819676674435e-06 6.708161490731612e-06 + 6.000000000000000e+00 1.216589366856521e+00 1.677560644963124e+00 1.867609063621600e-06 8.568118246898848e-06 + 7.000000000000000e+00 1.173439187151612e+00 1.342474213415192e+00 3.578704496520757e-06 1.884134663332482e-05 + 8.000000000000000e+00 9.629416032539853e-01 1.012115556387471e+00 3.400098822603503e-06 3.562977273663392e-06 + 9.000000000000000e+00 7.378627045323199e-01 1.183882592399333e+00 4.405766451553994e-06 1.607503255574017e-05 + 1.000000000000000e+01 7.618850249117836e-01 1.577090524690380e+00 2.989776570649916e-06 8.511919006970459e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00592015471712 -Steps = 1841 +Current time = 10.00070463206685 +Steps = 1851 Error test fails = 79 NLS step fails = 0 Initial step size = 0.001 -Last step size = 0.006029980790852448 -Current step size = 0.006029980790852448 -Last method order = 4 -Current method order = 4 -Residual fn evals = 2397 +Last step size = 0.008223200209206106 +Current step size = 0.008223200209206106 +Last method order = 5 +Current method order = 5 +Residual fn evals = 2458 IC linesearch backtrack ops = 0 -NLS iters = 2397 +NLS iters = 2458 NLS fails = 0 -NLS iters per step = 1.302009777294948 -LS setups = 85 -Jac fn evals = 85 +NLS iters per step = 1.327930848190167 +LS setups = 84 +Jac fn evals = 84 LS residual fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.03546099290780142 +Jac evals per NLS iter = 0.03417412530512612 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/idas/CXX_serial/idas_test_kpr_--eta_min_2.out b/test/unit_tests/idas/CXX_serial/idas_test_kpr_--eta_min_2.out index af4992fa58..c6a5d6971f 100644 --- a/test/unit_tests/idas/CXX_serial/idas_test_kpr_--eta_min_2.out +++ b/test/unit_tests/idas/CXX_serial/idas_test_kpr_--eta_min_2.out @@ -1,33 +1,33 @@ t u v u err v err ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 - 1.000000000000000e+00 1.127008886931081e+00 1.551800624068247e+00 9.413020496396030e-07 1.003687641665252e-06 - 2.000000000000000e+00 8.899033257012232e-01 1.154581589731097e+00 7.570306811421901e-07 1.425191492820943e-06 - 3.000000000000000e+00 7.106359156304887e-01 1.023509838887233e+00 2.442289553927779e-07 7.146601939345132e-06 - 4.000000000000000e+00 8.204744562446226e-01 1.374632991052660e+00 8.762108405502289e-08 1.129003422972730e-06 - 5.000000000000000e+00 1.068567367706359e+00 1.691845610743153e+00 2.398819762383653e-06 6.708161797819301e-06 - 6.000000000000000e+00 1.216589366856727e+00 1.677560644996338e+00 1.867609269012860e-06 8.568151460774942e-06 - 7.000000000000000e+00 1.173439187063617e+00 1.342474213911926e+00 3.578616501576093e-06 1.884184336709005e-05 - 8.000000000000000e+00 9.629417174589088e-01 1.012119988627952e+00 3.514303746121605e-06 7.995217754963591e-06 - 9.000000000000000e+00 7.378606025350759e-01 1.183877114777252e+00 2.303769207512296e-06 1.059741047493290e-05 - 1.000000000000000e+01 7.618838737365803e-01 1.577084968262613e+00 1.838601367376569e-06 2.955491239520214e-06 + 1.000000000000000e+00 1.127008886931081e+00 1.551800624068248e+00 9.413020487514245e-07 1.003687642553430e-06 + 2.000000000000000e+00 8.899033257012224e-01 1.154581589731098e+00 7.570306803650340e-07 1.425191492376854e-06 + 3.000000000000000e+00 7.106359156305051e-01 1.023509838887361e+00 2.442289389614771e-07 7.146601811891529e-06 + 4.000000000000000e+00 8.204744562446277e-01 1.374632991052715e+00 8.762108916204880e-08 1.129003477817747e-06 + 5.000000000000000e+00 1.068567367706273e+00 1.691845610742846e+00 2.398819676674435e-06 6.708161490731612e-06 + 6.000000000000000e+00 1.216589366856521e+00 1.677560644963124e+00 1.867609063621600e-06 8.568118246898848e-06 + 7.000000000000000e+00 1.173439187151612e+00 1.342474213415192e+00 3.578704496520757e-06 1.884134663332482e-05 + 8.000000000000000e+00 9.629416032539853e-01 1.012115556387471e+00 3.400098822603503e-06 3.562977273663392e-06 + 9.000000000000000e+00 7.378627045323199e-01 1.183882592399333e+00 4.405766451553994e-06 1.607503255574017e-05 + 1.000000000000000e+01 7.618850249117836e-01 1.577090524690380e+00 2.989776570649916e-06 8.511919006970459e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00592015471712 -Steps = 1841 +Current time = 10.00070463206685 +Steps = 1851 Error test fails = 79 NLS step fails = 0 Initial step size = 0.001 -Last step size = 0.006029980790852448 -Current step size = 0.006029980790852448 -Last method order = 4 -Current method order = 4 -Residual fn evals = 2397 +Last step size = 0.008223200209206106 +Current step size = 0.008223200209206106 +Last method order = 5 +Current method order = 5 +Residual fn evals = 2458 IC linesearch backtrack ops = 0 -NLS iters = 2397 +NLS iters = 2458 NLS fails = 0 -NLS iters per step = 1.302009777294948 -LS setups = 85 -Jac fn evals = 85 +NLS iters per step = 1.327930848190167 +LS setups = 84 +Jac fn evals = 84 LS residual fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.03546099290780142 +Jac evals per NLS iter = 0.03417412530512612 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/idas/CXX_serial/idas_test_kpr_--eta_min_ef_0.5.out b/test/unit_tests/idas/CXX_serial/idas_test_kpr_--eta_min_ef_0.5.out index 94f08efdce..bd783e9155 100644 --- a/test/unit_tests/idas/CXX_serial/idas_test_kpr_--eta_min_ef_0.5.out +++ b/test/unit_tests/idas/CXX_serial/idas_test_kpr_--eta_min_ef_0.5.out @@ -1,33 +1,33 @@ t u v u err v err ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 - 1.000000000000000e+00 1.127010934815940e+00 1.551804577771051e+00 1.106582809606849e-06 4.957390445259335e-06 - 2.000000000000000e+00 8.899037379529532e-01 1.154587457548306e+00 1.169282411117578e-06 4.442625715528337e-06 - 3.000000000000000e+00 7.106373258289668e-01 1.023525952783798e+00 1.165969522709531e-06 8.967294625517042e-06 - 4.000000000000000e+00 8.204767070144955e-01 1.374642569697146e+00 2.338390956979630e-06 1.070764790855883e-05 - 5.000000000000000e+00 1.068568876973751e+00 1.691849793088502e+00 3.908087154114170e-06 1.089050714697670e-05 - 6.000000000000000e+00 1.216589706020479e+00 1.677562428308899e+00 2.206773020985153e-06 1.035146402172948e-05 - 7.000000000000000e+00 1.173438010775863e+00 1.342468911009537e+00 2.402328747042048e-06 1.353894097877451e-05 - 8.000000000000000e+00 9.629425468345103e-01 1.012129827732488e+00 4.343679347651452e-06 1.783432229074400e-05 - 9.000000000000000e+00 7.378627353947157e-01 1.183886759184423e+00 4.436628847304114e-06 2.024181764559430e-05 - 1.000000000000000e+01 7.618854790077282e-01 1.577091323024696e+00 3.443872515274116e-06 9.310253322958317e-06 + 1.000000000000000e+00 1.127010934815940e+00 1.551804577771052e+00 1.106582809828893e-06 4.957390446369558e-06 + 2.000000000000000e+00 8.899037379529640e-01 1.154587457548333e+00 1.169282421886741e-06 4.442625742839823e-06 + 3.000000000000000e+00 7.106373258289136e-01 1.023525952781695e+00 1.165969469529848e-06 8.967292522532588e-06 + 4.000000000000000e+00 8.204767070163577e-01 1.374642569717103e+00 2.338392819156709e-06 1.070766786548383e-05 + 5.000000000000000e+00 1.068568876973022e+00 1.691849793032933e+00 3.908086425807866e-06 1.089045157764978e-05 + 6.000000000000000e+00 1.216589705164396e+00 1.677562428336776e+00 2.205916938669006e-06 1.035149189809736e-05 + 7.000000000000000e+00 1.173438426040947e+00 1.342476942416445e+00 2.817593831361265e-06 2.157034788607959e-05 + 8.000000000000000e+00 9.629412087571725e-01 1.012125432139581e+00 3.005602009831243e-06 1.343872938441848e-05 + 9.000000000000000e+00 7.378620211826220e-01 1.183879667396247e+00 3.722416753615398e-06 1.315002946999932e-05 + 1.000000000000000e+01 7.618816820118458e-01 1.577075168231631e+00 3.531233671028033e-07 6.844539742090205e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00034658755718 -Steps = 1858 -Error test fails = 78 +Current time = 10.00007889792687 +Steps = 1893 +Error test fails = 74 NLS step fails = 0 Initial step size = 0.001 -Last step size = 0.007155339774580808 -Current step size = 0.007155339774580808 +Last step size = 0.004133870052408764 +Current step size = 0.004133870052408764 Last method order = 5 Current method order = 5 -Residual fn evals = 2480 +Residual fn evals = 2517 IC linesearch backtrack ops = 0 -NLS iters = 2480 +NLS iters = 2517 NLS fails = 0 -NLS iters per step = 1.334768568353068 -LS setups = 76 -Jac fn evals = 76 +NLS iters per step = 1.329635499207607 +LS setups = 75 +Jac fn evals = 75 LS residual fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.03064516129032258 +Jac evals per NLS iter = 0.0297973778307509 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/idas/CXX_serial/idas_test_kpr_--eta_min_fx_1.0_--eta_max_fx_2.0.out b/test/unit_tests/idas/CXX_serial/idas_test_kpr_--eta_min_fx_1.0_--eta_max_fx_2.0.out index af4992fa58..c6a5d6971f 100644 --- a/test/unit_tests/idas/CXX_serial/idas_test_kpr_--eta_min_fx_1.0_--eta_max_fx_2.0.out +++ b/test/unit_tests/idas/CXX_serial/idas_test_kpr_--eta_min_fx_1.0_--eta_max_fx_2.0.out @@ -1,33 +1,33 @@ t u v u err v err ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 - 1.000000000000000e+00 1.127008886931081e+00 1.551800624068247e+00 9.413020496396030e-07 1.003687641665252e-06 - 2.000000000000000e+00 8.899033257012232e-01 1.154581589731097e+00 7.570306811421901e-07 1.425191492820943e-06 - 3.000000000000000e+00 7.106359156304887e-01 1.023509838887233e+00 2.442289553927779e-07 7.146601939345132e-06 - 4.000000000000000e+00 8.204744562446226e-01 1.374632991052660e+00 8.762108405502289e-08 1.129003422972730e-06 - 5.000000000000000e+00 1.068567367706359e+00 1.691845610743153e+00 2.398819762383653e-06 6.708161797819301e-06 - 6.000000000000000e+00 1.216589366856727e+00 1.677560644996338e+00 1.867609269012860e-06 8.568151460774942e-06 - 7.000000000000000e+00 1.173439187063617e+00 1.342474213911926e+00 3.578616501576093e-06 1.884184336709005e-05 - 8.000000000000000e+00 9.629417174589088e-01 1.012119988627952e+00 3.514303746121605e-06 7.995217754963591e-06 - 9.000000000000000e+00 7.378606025350759e-01 1.183877114777252e+00 2.303769207512296e-06 1.059741047493290e-05 - 1.000000000000000e+01 7.618838737365803e-01 1.577084968262613e+00 1.838601367376569e-06 2.955491239520214e-06 + 1.000000000000000e+00 1.127008886931081e+00 1.551800624068248e+00 9.413020487514245e-07 1.003687642553430e-06 + 2.000000000000000e+00 8.899033257012224e-01 1.154581589731098e+00 7.570306803650340e-07 1.425191492376854e-06 + 3.000000000000000e+00 7.106359156305051e-01 1.023509838887361e+00 2.442289389614771e-07 7.146601811891529e-06 + 4.000000000000000e+00 8.204744562446277e-01 1.374632991052715e+00 8.762108916204880e-08 1.129003477817747e-06 + 5.000000000000000e+00 1.068567367706273e+00 1.691845610742846e+00 2.398819676674435e-06 6.708161490731612e-06 + 6.000000000000000e+00 1.216589366856521e+00 1.677560644963124e+00 1.867609063621600e-06 8.568118246898848e-06 + 7.000000000000000e+00 1.173439187151612e+00 1.342474213415192e+00 3.578704496520757e-06 1.884134663332482e-05 + 8.000000000000000e+00 9.629416032539853e-01 1.012115556387471e+00 3.400098822603503e-06 3.562977273663392e-06 + 9.000000000000000e+00 7.378627045323199e-01 1.183882592399333e+00 4.405766451553994e-06 1.607503255574017e-05 + 1.000000000000000e+01 7.618850249117836e-01 1.577090524690380e+00 2.989776570649916e-06 8.511919006970459e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00592015471712 -Steps = 1841 +Current time = 10.00070463206685 +Steps = 1851 Error test fails = 79 NLS step fails = 0 Initial step size = 0.001 -Last step size = 0.006029980790852448 -Current step size = 0.006029980790852448 -Last method order = 4 -Current method order = 4 -Residual fn evals = 2397 +Last step size = 0.008223200209206106 +Current step size = 0.008223200209206106 +Last method order = 5 +Current method order = 5 +Residual fn evals = 2458 IC linesearch backtrack ops = 0 -NLS iters = 2397 +NLS iters = 2458 NLS fails = 0 -NLS iters per step = 1.302009777294948 -LS setups = 85 -Jac fn evals = 85 +NLS iters per step = 1.327930848190167 +LS setups = 84 +Jac fn evals = 84 LS residual fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.03546099290780142 +Jac evals per NLS iter = 0.03417412530512612 Prec evals per NLS iter = 0 Root fn evals = 0 diff --git a/test/unit_tests/idas/CXX_serial/idas_test_kpr_--eta_min_fx_1.0_--eta_min_0.5.out b/test/unit_tests/idas/CXX_serial/idas_test_kpr_--eta_min_fx_1.0_--eta_min_0.5.out index af4992fa58..c6a5d6971f 100644 --- a/test/unit_tests/idas/CXX_serial/idas_test_kpr_--eta_min_fx_1.0_--eta_min_0.5.out +++ b/test/unit_tests/idas/CXX_serial/idas_test_kpr_--eta_min_fx_1.0_--eta_min_0.5.out @@ -1,33 +1,33 @@ t u v u err v err ------------------------------------------------------------------------------------------------------------------------------ 0.000000000000000e+00 1.224744871391589e+00 1.732050807568877e+00 0.000000000000000e+00 0.000000000000000e+00 - 1.000000000000000e+00 1.127008886931081e+00 1.551800624068247e+00 9.413020496396030e-07 1.003687641665252e-06 - 2.000000000000000e+00 8.899033257012232e-01 1.154581589731097e+00 7.570306811421901e-07 1.425191492820943e-06 - 3.000000000000000e+00 7.106359156304887e-01 1.023509838887233e+00 2.442289553927779e-07 7.146601939345132e-06 - 4.000000000000000e+00 8.204744562446226e-01 1.374632991052660e+00 8.762108405502289e-08 1.129003422972730e-06 - 5.000000000000000e+00 1.068567367706359e+00 1.691845610743153e+00 2.398819762383653e-06 6.708161797819301e-06 - 6.000000000000000e+00 1.216589366856727e+00 1.677560644996338e+00 1.867609269012860e-06 8.568151460774942e-06 - 7.000000000000000e+00 1.173439187063617e+00 1.342474213911926e+00 3.578616501576093e-06 1.884184336709005e-05 - 8.000000000000000e+00 9.629417174589088e-01 1.012119988627952e+00 3.514303746121605e-06 7.995217754963591e-06 - 9.000000000000000e+00 7.378606025350759e-01 1.183877114777252e+00 2.303769207512296e-06 1.059741047493290e-05 - 1.000000000000000e+01 7.618838737365803e-01 1.577084968262613e+00 1.838601367376569e-06 2.955491239520214e-06 + 1.000000000000000e+00 1.127008886931081e+00 1.551800624068248e+00 9.413020487514245e-07 1.003687642553430e-06 + 2.000000000000000e+00 8.899033257012224e-01 1.154581589731098e+00 7.570306803650340e-07 1.425191492376854e-06 + 3.000000000000000e+00 7.106359156305051e-01 1.023509838887361e+00 2.442289389614771e-07 7.146601811891529e-06 + 4.000000000000000e+00 8.204744562446277e-01 1.374632991052715e+00 8.762108916204880e-08 1.129003477817747e-06 + 5.000000000000000e+00 1.068567367706273e+00 1.691845610742846e+00 2.398819676674435e-06 6.708161490731612e-06 + 6.000000000000000e+00 1.216589366856521e+00 1.677560644963124e+00 1.867609063621600e-06 8.568118246898848e-06 + 7.000000000000000e+00 1.173439187151612e+00 1.342474213415192e+00 3.578704496520757e-06 1.884134663332482e-05 + 8.000000000000000e+00 9.629416032539853e-01 1.012115556387471e+00 3.400098822603503e-06 3.562977273663392e-06 + 9.000000000000000e+00 7.378627045323199e-01 1.183882592399333e+00 4.405766451553994e-06 1.607503255574017e-05 + 1.000000000000000e+01 7.618850249117836e-01 1.577090524690380e+00 2.989776570649916e-06 8.511919006970459e-06 ------------------------------------------------------------------------------------------------------------------------------ -Current time = 10.00592015471712 -Steps = 1841 +Current time = 10.00070463206685 +Steps = 1851 Error test fails = 79 NLS step fails = 0 Initial step size = 0.001 -Last step size = 0.006029980790852448 -Current step size = 0.006029980790852448 -Last method order = 4 -Current method order = 4 -Residual fn evals = 2397 +Last step size = 0.008223200209206106 +Current step size = 0.008223200209206106 +Last method order = 5 +Current method order = 5 +Residual fn evals = 2458 IC linesearch backtrack ops = 0 -NLS iters = 2397 +NLS iters = 2458 NLS fails = 0 -NLS iters per step = 1.302009777294948 -LS setups = 85 -Jac fn evals = 85 +NLS iters per step = 1.327930848190167 +LS setups = 84 +Jac fn evals = 84 LS residual fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -36,6 +36,6 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.03546099290780142 +Jac evals per NLS iter = 0.03417412530512612 Prec evals per NLS iter = 0 Root fn evals = 0